双重预防项目-国泰新华二开定制版
16639036659
2023-09-06 ef1fe7f67a9d7d4c94933c0a993e2d9639620239
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -615,10 +615,12 @@
                        CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间
                    }
                    CJDangerInfo.setCost(String.valueOf(0));//初始值给0
                    if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){
                        User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName());
                        //整改人信息
                        CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人
                        CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金
                    }
                    if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){
@@ -678,12 +680,11 @@
                    }
                    CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());//隐患描述
                    CJDangerInfo.setDangerReason(dangerManage.getDangerReason());//隐患产生原因
                    CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金
                    CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());//治理期限
                    if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){
                        CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态
                    }
                    CJDangerInfo.setHazardDangerType(hiddenDanger.getHazardDangerType().toString());//隐患类型
                    CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());// todo 隐患类型
                    CJDangerInfo.setDangerManagerId(dangerManage.getId());
                    //封装数据
                    CJDangerInfoLists.add(CJDangerInfo);