优化处理

heheng

3 天以前 ac8870aae3ec2b5ec5315cc668b482858195cfa4

 src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java

@@ -186,6 +186,21 @@
                    export.setAcceptOpinion(hcp.getAcceptOpinion());
                }

                //上报时间。判定人、核查人
                if (ObjectUtils.isNotEmpty(hcp.getRegisterCreateTime())){
                    export.setRegisterCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd", hcp.getRegisterCreateTime()));
                }
                if (ObjectUtils.isNotEmpty(hcp.getJudgeUserName())){
                    export.setJudgeUserName1(hcp.getJudgeUserName());
                }
                if (ObjectUtils.isNotEmpty(hcp.getExamineUserName())){
                    export.setExamineUserName(hcp.getExamineUserName());
                }

                export.setRegisterUserName(hcp.getRegisterUserName());
                if (ObjectUtils.isNotEmpty(hcp.getRegisterCreateTime())){
                    export.setRegisterCreateTime1(DateUtils.parseDateToStr("yyyy-MM-dd", hcp.getRegisterCreateTime()));
                }
            }
            exportList.add(export);
        }
@@ -236,7 +251,7 @@
//                //隐患名称
//                export.setDangerName(hcp.getDangerName());
//
//                //隐患描述   todo
//                //隐患描述
//                export.setDangerDescription(hcp.getDangerDescription());
//
//                //隐患级别
@@ -434,7 +449,7 @@
        }

        startPage();
        List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint);
        List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointListNewCount(hiddenDangerCheckPoint);
        for (HiddenDangerCheckPoint dangerCheckPoint : list) {
            PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoByDangerCheckPointId(dangerCheckPoint.getId());
            if (ObjectUtils.isNotEmpty(dangerInfo)){