修改仓吉和准东数据传入字段缺失数据问题

heheng

2026-06-17 435a67d82b91c3a17c99e137aaba0ecb9a0d8ac5

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

@@ -727,24 +727,40 @@
                        CJDangerInfo.setCheckAcceptTime(hiddenDanger.getAcceptCreateTime());//验收时间
                    }

                    //如果排查任务正常存在，封装任务相关数据
//                    if (Integer.parseInt(hiddenDanger.getDangerSources()) != 2){
                    //如果排查任务正常存在，封装任务相关数据  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());
//                        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);
//                    }

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

                        //找排查点，然后查措施
                        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);
@@ -819,6 +835,8 @@
        }




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