优化问题

heheng

6 days ago 7ee844962f050cfc548e5dd661a586a4993cbf89

 src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java

@@ -639,17 +639,12 @@

            if (CJRecordFromTaskLists.size() > 0) {
                log.info("【双重预防】排查任务记录CJ：数据处理...");
                log.info("【双重预防】排查任务记录CJ：数据处理开始taskIds..." + JSONObject.toJSONString(taskIds));


                //设置原始数据状态
                int taskUpdateResult = preventRiskDangerCheckLogService.updateTaskReportStatusByList(taskIds);
                if (taskUpdateResult < taskIds.size()) {
                    log.error("【双重预防】排查任务记录CJ：数据处理开始taskIds...排查任务记录原始数据更新失败, 取消操作");
                    throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录原始数据更新失败, 取消操作");
                }

                log.info("【双重预防】排查任务记录CJ：数据处理开始CJRecordFromTaskLists..." + JSONObject.toJSONString(CJRecordFromTaskLists));
                int result = CJTaskRecordService.insertRecordList(CJRecordFromTaskLists);
                if (result < CJRecordFromTaskLists.size()) {
                    log.error("【双重预防】排查任务记录CJ：数据处理开始taskIds...排查任务记录插入失败, 取消操作");
@@ -732,24 +727,43 @@
                        CJDangerInfo.setCheckAcceptTime(hiddenDanger.getAcceptCreateTime());//验收时间
                    }

                    //如果排查任务正常存在，封装任务相关数据
//                    if (Integer.parseInt(hiddenDanger.getDangerSources()) != 2){
//                        HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());
//
//                        PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());
//                        CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid
//                        //找排查点，然后查措施
//                        PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());
//                        //查管控措施
//                        PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());
//                        CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid
//                        CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施
//                    }else {
//                        CJDangerInfo.setCheckRecordId(null);
//                        CJDangerInfo.setRiskMeasureId(null);
//                    }
                    CJDangerInfo.setCheckRecordId(null);
                    CJDangerInfo.setRiskMeasureId(null);//默认无任务
                    //如果排查任务正常存在，封装任务相关数据  2026-06-17开启
                    if (StringUtils.isNotEmpty(hiddenDanger.getDangerSources())  && StringUtils.isNumeric(hiddenDanger.getDangerSources()) && Integer.parseInt(hiddenDanger.getDangerSources()) != 2){
                        //20260617未用到注释
                        //HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());

                        PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());
                        if (null != dangerCheckLogByCheckId) {
                            CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid
                        }else {
                            CJDangerInfo.setCheckRecordId(null);
                        }

                        //找排查点，然后查措施
                        if (hiddenDanger.getCheckPointId() == null){
                            CJDangerInfo.setRiskMeasureId( null);
                        }else {
                            PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());
                            if (null != unit){
                                //查管控措施
                                PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());
                                if (null != controlMeasureById){
                                    CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid
                                    CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施
                                }else {
                                    CJDangerInfo.setRiskMeasureId(null);
                                }

                            }else {
                                CJDangerInfo.setRiskMeasureId(null);
                            }
                        }
                    }else {
                        CJDangerInfo.setCheckRecordId(null);
                        CJDangerInfo.setRiskMeasureId(null);
                    }
//                    CJDangerInfo.setCheckRecordId(null);
//                    CJDangerInfo.setRiskMeasureId(null);//默认无任务
                    CJDangerInfo.setDeleted("0");
                    CJDangerInfo.setId(dangerManage.getUuid());
                    CJDangerInfo.setCompanyCode(companyCode);
@@ -824,6 +838,8 @@
        }




//        /**
//         * 7、检索检修记录数据
//         * */