双重预防项目-国泰新华二开定制版
16639036659
2023-11-30 54843d459f3fe623e6cf2956f192141e9a99b878
临时提交
已修改9个文件
760 ■■■■■ 文件已修改
src/main/java/com/ruoyi/project/mobile/service/ApiDangerReportService.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/mobile/service/ApiService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java 306 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java 346 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/mobile/service/ApiDangerReportService.java
@@ -18,6 +18,7 @@
import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +26,7 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.lang.reflect.AnnotatedType;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -137,7 +139,12 @@
        try {
            HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
            HiddenDangerCheck hdc = new HiddenDangerCheck();
            if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){
                throw new RuntimeException("检查人不能为空");
            }
            if (ObjectUtils.isEmpty(hdcp.getFindTime())){
                throw new RuntimeException("发现时间不能为空");
            }
            hdc.setCreateBy(header.loginName);//创建者
            hdc.setCreateTime(DateUtils.getNowDate());//获取创建时间
            hdc.setDangerDeptId(hdcp.getDangerDeptId());
@@ -160,7 +167,7 @@
            hdcp.setRegisterSubmitTime(DateUtils.getNowDate());//设置隐患上报提交时间
            hdcp.setCompanyId(user.getCompanyId());
            hdcpService.insertHiddenDangerCheckPoint(hdcp);
            int result = hdcpService.insertHiddenDangerCheckPoint(hdcp);
            hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
@@ -20,12 +20,12 @@
import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.HashMap;
@@ -209,6 +209,12 @@
        }
        try {
            HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
            if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){
                throw new RuntimeException("检查人不能为空");
            }
            if (ObjectUtils.isEmpty(hdcp.getFindTime())){
                throw new RuntimeException("发现时间不能为空");
            }
            hdcp.setUpdateBy(header.loginName);
            hdcp.setUpdateTime(DateUtils.getNowDate());
            hdcp.setRegisterCreateTime(DateUtils.getNowDate());//设置隐患登记上报创建时间
@@ -225,6 +231,8 @@
            queryExist.setWhetherDanger(TrHiddenDangerCheckConstants.WHETHER_DANGER_YES);//是否为隐患(是隐患)
            queryExist.setCheckPointId(hdcp.getCheckPointId());
            queryExist.setCheckId(hdcp.getCheckId());
            hdcp.setReportStatus("0");
            /**
             * 本次查询结果 :如果未上报过隐患,必定为空
@@ -243,15 +251,15 @@
                hdcp.setCompanyId(user.getCompanyId());
                i = hdcpService.insertHiddenDangerCheckPoint(hdcp);
                if (i< 1){
                    throw new RuntimeException("添加隐患附属信息失败");
                    throw new RuntimeException("添加隐患信息失败");
                }
                //获取Id返回值
                hdcp.getId();
                int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
                if (result< 1){
                    throw new RuntimeException("添加隐患附属信息失败");
                }
//                hdcp.getId();
//                int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
//                if (result< 1){
//                    throw new RuntimeException("添加隐患附属信息失败");
//                }
//                PreventRiskDangerCheckAndMeasure dangerCheckPointInfo = preventRiskDangerCheckAndMeasureService.getByDangerCheckPointId(hdcp.getId());
//                riskService.updateCheckLog(dangerCheckPointInfo.getCheckId(), hdcp);
@@ -266,10 +274,10 @@
//                if (result < 1){
//                    throw new RuntimeException("修改失败");
//                }
                int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
                if (result< 1){
                    throw new RuntimeException("添加隐患附属信息失败");
                }
//                int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
//                if (result< 1){
//                    throw new RuntimeException("添加隐患附属信息失败");
//                }
                PreventRiskDangerCheckAndMeasure dangerCheckPointInfo = preventRiskDangerCheckAndMeasureService.getByDangerCheckPointId(hdcp.getId());
                riskService.updateCheckLog(dangerCheckPointInfo.getCheckId(), hdcp);
src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
@@ -414,6 +414,12 @@
        }
        try {
            HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
            if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){
                throw new RuntimeException("检查人不能为空");
            }
            if (ObjectUtils.isEmpty(hdcp.getFindTime())){
                throw new RuntimeException("发现时间不能为空");
            }
            hdcp.setRegisterCreateTime(DateUtils.getNowDate());//设置隐患登记上报创建时间
            hdcp.setRegisterUserId(Long.valueOf(header.userId));//设置隐患登记上报创建人ID
            User user = userService.selectUserById(Long.valueOf(header.userId));
src/main/java/com/ruoyi/project/mobile/service/ApiService.java
@@ -87,7 +87,7 @@
        return hiddenDangerCheckService.editDangerRectifySave(str, header);
    }
    //隐患整改--延期 todo
    //隐患整改--延期
    public ApiResult rectifyTimeOutSave(String str, ApiRequestHeader header) {
        return hiddenDangerCheckService.rectifyTimeOutSave(str, header);
    }
@@ -194,7 +194,7 @@
    }
    //定时任务--隐患登记
    //定时任务--隐患登记 todo
    public ApiResult editPointScheduleDangerRegisterSave(String str, ApiRequestHeader header) {
        return dangerScheduleService.editPointScheduleDangerRegisterSave(str, header);
    }
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
@@ -131,145 +131,205 @@
            HiddenDangerCheckPointExport export = new HiddenDangerCheckPointExport();
            export.setIndex(String.valueOf(i + 1));
            if (hcp != null) {
                //排查方式
                if ("2".equals(hcp.getDangerSources())) {
                    export.setCheckType("隐患上报");
                } else {
                    if ("1".equals(hcp.getCheckType())) {
                        export.setCheckType("基础清单排查");
                    } else if ("2".equals(hcp.getCheckType())) {
                        export.setCheckType("风险单元清单排查");
                    } else {
                        export.setCheckType("风险单元清单排查");
                if (ObjectUtils.isNotEmpty(hcp.getDangerDescription())){
                    export.setDangerDescription(hcp.getDangerDescription());
                }
                if (ObjectUtils.isNotEmpty(hcp.getCheckPerson())){
                    export.setCheckPerson(hcp.getCheckPerson());
                }
                if (ObjectUtils.isNotEmpty(hcp.getFindTime())){
                    export.setFindTime(DateUtils.parseDateToStr("yyyy-MM-dd", hcp.getFindTime()));
                }
                if (ObjectUtils.isNotEmpty(hcp.getDangerLevel())){
                    if (hcp.getDangerLevel().equals("0")){
                        export.setDangerLevel("一般隐患");
                    }else if (hcp.getDangerLevel().equals("1")){
                        export.setDangerLevel("重大隐患");
                    }else if (hcp.getDangerLevel().equals("2")){
                        export.setDangerLevel("不是隐患");
                    }
                }
                //基础清单名称
                if ("1".equals(hcp.getCheckType()) && !StringUtils.isEmpty(hcp.getRiskName())) {
                    export.setBaseRiskName(hcp.getRiskName());
                } else {
                    export.setBaseRiskName("-");
                }
                //风险单元
                if ((!("1".equals(hcp.getCheckType()))) && !StringUtils.isEmpty(hcp.getRiskName())) {
                    export.setRiskPointName(hcp.getRiskName());
                } else {
                    export.setRiskPointName("-");
                }
                //风险单元类型
                if ("1".equals(hcp.getRiskType())) {
                    export.setRiskPointType("设备设施清单");
                } else if ("2".equals(hcp.getRiskType())) {
                    export.setRiskPointType("作业活动清单");
                } else if ("3".equals(hcp.getRiskType())) {
                    export.setRiskPointType("工艺节点清单");
                }
                // 隐患责任部门
                export.setDangerDep(hcp.getRectifyDeptName());
                //隐患名称
                export.setDangerName(hcp.getDangerName());
                //隐患描述   todo
                export.setDangerDescription(hcp.getDangerDescription());
                //隐患级别
                if ("0".equals(hcp.getDangerLevel())) {
                    export.setDangerLevel("一般隐患");
                } else if ("1".equals(hcp.getDangerLevel())) {
                    export.setDangerLevel("重大隐患");
                } else if ("2".equals(hcp.getDangerLevel())) {
                    export.setDangerLevel("不是隐患");
                } else {
                    export.setDangerLevel("");
                }
                //隐患来源
                if ("1".equals(hcp.getDangerSources())) {
                    export.setDangerSources("隐患排查计划");
                } else if ("2".equals(hcp.getDangerSources())) {
                    export.setDangerSources("隐患上报");
                } else if ("3".equals(hcp.getDangerSources())) {
                    export.setDangerSources("定时隐患排查");
                } else {
                    export.setDangerSources("");
                }
                //整改完成期限
                if(ObjectUtils.isNotEmpty(hcp.getRectifyDeadlineTime())){
                    export.setRectifyDeadlineTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getRectifyDeadlineTime()));
                    export.setRectifyDeadlineTime(DateUtils.parseDateToStr("yyyy-MM-dd", hcp.getRectifyDeadlineTime()));
                }
                //整改完成时间
                if(ObjectUtils.isNotEmpty(hcp.getRectifyCompleteTime())){
                    export.setRectifyCompleteTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getRectifyCompleteTime()));
                if (ObjectUtils.isNotEmpty(hcp.getJudgeUserName())){
                    export.setJudgeUserName(hcp.getJudgeUserName());
                }
                //整改状态
                if (!StringUtils.isEmpty(hcp.getStage())) {
                    if ("3".equals(hcp.getStage())) {
                        if (!StringUtils.isEmpty(hcp.getExamineStatus())) {
                            if ("0".equals(hcp.getExamineStatus())) {
                                export.setRectifyStatus("待核查");
                            } else if ("1".equals(hcp.getExamineStatus())) {
                                export.setRectifyStatus("已核查");
                            }
                        }
                    } else if ("4".equals(hcp.getStage())) {
                        if (!StringUtils.isEmpty(hcp.getRectifyStatus())) {
                            if ("0".equals(hcp.getRectifyStatus())) {
                                export.setRectifyStatus("未整改");
                            } else if ("1".equals(hcp.getRectifyStatus())) {
                                export.setRectifyStatus("已整改");
                            }
                        }
                    } else if ("5".equals(hcp.getStage())) {
                        if (!StringUtils.isEmpty(hcp.getAcceptStatus())) {
                            if ("0".equals(hcp.getAcceptStatus())) {
                                export.setRectifyStatus("未验收");
                            } else if ("1".equals(hcp.getAcceptStatus())) {
                                export.setRectifyStatus("已验收");
                            } else if ("2".equals(hcp.getAcceptStatus())) {
                                export.setRectifyStatus("验收未通过");
                            }
                        }
                        SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd");
                        try {
                            if (f.parse(f.format(hcp.getRectifyDeadlineTime())).before(f.parse(f.format(hcp.getRectifyCompleteTime())))) {
                                export.setRectifyStatus(export.getRectifyStatus() + "(超期改)");
                            } else {
                                export.setRectifyStatus(export.getRectifyStatus() + "(按期改)");
                            }
                        } catch (ParseException e) {
                        }
                    }
                if (ObjectUtils.isNotEmpty(hcp.getRectifyMeasure())){
                    export.setRectifyMeasure(hcp.getRectifyMeasure());
                }
                if (hcp.getRegisterCreateTime() != null) {
                    export.setRegisterCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getRegisterCreateTime()));
                if (ObjectUtils.isNotEmpty(hcp.getRectifyCompleteTime())){
                    export.setRectifyCompleteTime(DateUtils.parseDateToStr("yyyy-MM-dd", hcp.getRectifyCompleteTime()));
                }
                if (hcp.getExamineCreateTime() != null) {
                    export.setExamineCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getExamineCreateTime()));
                if (ObjectUtils.isNotEmpty(hcp.getAcceptUserName())){
                    export.setAcceptUserName(hcp.getAcceptUserName());
                }
                if (hcp.getRectifyCreateTime() != null) {
                    export.setRectifyCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getRectifyCreateTime()));
                if (ObjectUtils.isNotEmpty(hcp.getAcceptCreateTime())){
                    export.setAcceptCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd", hcp.getAcceptCreateTime()));
                }
                if (hcp.getAcceptCreateTime() != null) {
                    export.setAcceptCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getAcceptCreateTime()));
                if (ObjectUtils.isNotEmpty(hcp.getAcceptOpinion())){
                    export.setAcceptOpinion(hcp.getAcceptOpinion());
                }
                export.setPreRectifyPhoto(hcp.getPreRectifyPhoto());
                export.setTroubleTypeName(hcp.getTroubleTypeName());
                export.setRegisterUserName(hcp.getRegisterUserName());
                export.setExamineUserName(hcp.getExamineUserName());
                export.setRectifyUserName(hcp.getRectifyUserName());
                export.setRectifyMeasure(hcp.getRectifyMeasure());
                export.setPostRectifyPhoto(hcp.getPostRectifyPhoto());
                export.setAcceptUserName(hcp.getAcceptUserName());
                exportList.add(export);
            }
            exportList.add(export);
        }
//        for (int i = 0; i < list.size(); i++) {
//            HiddenDangerCheckPoint hcp = list.get(i);
//            HiddenDangerCheckPointExport export = new HiddenDangerCheckPointExport();
//            export.setIndex(String.valueOf(i + 1));
//            if (hcp != null) {
//                //排查方式
//                if ("2".equals(hcp.getDangerSources())) {
//                    export.setCheckType("隐患上报");
//                } else {
//                    if ("1".equals(hcp.getCheckType())) {
//                        export.setCheckType("基础清单排查");
//                    } else if ("2".equals(hcp.getCheckType())) {
//                        export.setCheckType("风险单元清单排查");
//                    } else {
//                        export.setCheckType("风险单元清单排查");
//                    }
//                }
//
//                //基础清单名称
//                if ("1".equals(hcp.getCheckType()) && !StringUtils.isEmpty(hcp.getRiskName())) {
//                    export.setBaseRiskName(hcp.getRiskName());
//                } else {
//                    export.setBaseRiskName("-");
//                }
//
//                //风险单元
//                if ((!("1".equals(hcp.getCheckType()))) && !StringUtils.isEmpty(hcp.getRiskName())) {
//                    export.setRiskPointName(hcp.getRiskName());
//                } else {
//                    export.setRiskPointName("-");
//                }
//
//                //风险单元类型
//                if ("1".equals(hcp.getRiskType())) {
//                    export.setRiskPointType("设备设施清单");
//                } else if ("2".equals(hcp.getRiskType())) {
//                    export.setRiskPointType("作业活动清单");
//                } else if ("3".equals(hcp.getRiskType())) {
//                    export.setRiskPointType("工艺节点清单");
//                }
//                // 隐患责任部门
//                export.setDangerDep(hcp.getRectifyDeptName());
//
//                //隐患名称
//                export.setDangerName(hcp.getDangerName());
//
//                //隐患描述   todo
//                export.setDangerDescription(hcp.getDangerDescription());
//
//                //隐患级别
//                if ("0".equals(hcp.getDangerLevel())) {
//                    export.setDangerLevel("一般隐患");
//                } else if ("1".equals(hcp.getDangerLevel())) {
//                    export.setDangerLevel("重大隐患");
//                } else if ("2".equals(hcp.getDangerLevel())) {
//                    export.setDangerLevel("不是隐患");
//                } else {
//                    export.setDangerLevel("");
//                }
//
//                //隐患来源
//                if ("1".equals(hcp.getDangerSources())) {
//                    export.setDangerSources("隐患排查计划");
//                } else if ("2".equals(hcp.getDangerSources())) {
//                    export.setDangerSources("隐患上报");
//                } else if ("3".equals(hcp.getDangerSources())) {
//                    export.setDangerSources("定时隐患排查");
//                } else {
//                    export.setDangerSources("");
//                }
//
//                //整改完成期限
//                if(ObjectUtils.isNotEmpty(hcp.getRectifyDeadlineTime())){
//                    export.setRectifyDeadlineTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getRectifyDeadlineTime()));
//                }
//
//                //整改完成时间
//                if(ObjectUtils.isNotEmpty(hcp.getRectifyCompleteTime())){
//                    export.setRectifyCompleteTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getRectifyCompleteTime()));
//                }
//
//                //整改状态
//                if (!StringUtils.isEmpty(hcp.getStage())) {
//                    if ("3".equals(hcp.getStage())) {
//                        if (!StringUtils.isEmpty(hcp.getExamineStatus())) {
//                            if ("0".equals(hcp.getExamineStatus())) {
//                                export.setRectifyStatus("待核查");
//                            } else if ("1".equals(hcp.getExamineStatus())) {
//                                export.setRectifyStatus("已核查");
//                            }
//                        }
//                    } else if ("4".equals(hcp.getStage())) {
//                        if (!StringUtils.isEmpty(hcp.getRectifyStatus())) {
//                            if ("0".equals(hcp.getRectifyStatus())) {
//                                export.setRectifyStatus("未整改");
//                            } else if ("1".equals(hcp.getRectifyStatus())) {
//                                export.setRectifyStatus("已整改");
//                            }
//                        }
//                    } else if ("5".equals(hcp.getStage())) {
//                        if (!StringUtils.isEmpty(hcp.getAcceptStatus())) {
//                            if ("0".equals(hcp.getAcceptStatus())) {
//                                export.setRectifyStatus("未验收");
//                            } else if ("1".equals(hcp.getAcceptStatus())) {
//                                export.setRectifyStatus("已验收");
//                            } else if ("2".equals(hcp.getAcceptStatus())) {
//                                export.setRectifyStatus("验收未通过");
//                            }
//                        }
//                        SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd");
//                        try {
//                            if (f.parse(f.format(hcp.getRectifyDeadlineTime())).before(f.parse(f.format(hcp.getRectifyCompleteTime())))) {
//                                export.setRectifyStatus(export.getRectifyStatus() + "(超期改)");
//                            } else {
//                                export.setRectifyStatus(export.getRectifyStatus() + "(按期改)");
//                            }
//                        } catch (ParseException e) {
//                        }
//                    }
//                }
//                if (hcp.getRegisterCreateTime() != null) {
//                    export.setRegisterCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getRegisterCreateTime()));
//                }
//                if (hcp.getExamineCreateTime() != null) {
//                    export.setExamineCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getExamineCreateTime()));
//                }
//                if (hcp.getRectifyCreateTime() != null) {
//                    export.setRectifyCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getRectifyCreateTime()));
//                }
//                if (hcp.getAcceptCreateTime() != null) {
//                    export.setAcceptCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getAcceptCreateTime()));
//                }
//                export.setPreRectifyPhoto(hcp.getPreRectifyPhoto());
//                export.setTroubleTypeName(hcp.getTroubleTypeName());
//                export.setRegisterUserName(hcp.getRegisterUserName());
//                export.setExamineUserName(hcp.getExamineUserName());
//                export.setRectifyUserName(hcp.getRectifyUserName());
//                export.setRectifyMeasure(hcp.getRectifyMeasure());
//                export.setPostRectifyPhoto(hcp.getPostRectifyPhoto());
//                export.setAcceptUserName(hcp.getAcceptUserName());
//                exportList.add(export);
//            }
//        }
        ExcelUtilByDangerLedger<HiddenDangerCheckPointExport> util = new ExcelUtilByDangerLedger<HiddenDangerCheckPointExport>(HiddenDangerCheckPointExport.class);
        return util.exportExcel(exportList, companyName + "隐患排查台账");
    }
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
@@ -162,6 +162,12 @@
    @ResponseBody
    @Transactional
    public AjaxResult addDangerReportSave(HiddenDangerCheckPoint hdcp) {
        if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){
            throw new RuntimeException("检查人不能为空");
        }
        if (ObjectUtils.isEmpty(hdcp.getFindTime())){
            throw new RuntimeException("发现时间不能为空");
        }
        HiddenDangerCheck hiddenDangerCheck  = new HiddenDangerCheck();
        hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者
        hiddenDangerCheck.setCreateTime(DateUtils.getNowDate());//获取创建时间
@@ -234,7 +240,12 @@
        HiddenDangerCheck hiddenDangerCheck  = new HiddenDangerCheck();
//        hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者
//        hiddenDangerCheck.setCreateTime(DateUtils.getNowDate());//获取创建时间
        if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){
            throw new RuntimeException("检查人不能为空");
        }
        if (ObjectUtils.isEmpty(hdcp.getFindTime())){
            throw new RuntimeException("发现时间不能为空");
        }
        hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者
        hiddenDangerCheck.setCreateTime(hdcp.getRectifyCreateTime());//获取创建时间
@@ -441,7 +452,6 @@
    /**
     * 修改判定隐患上报保存
     * todo-2022 隐患核查(判定隐患) 以判定的隐患,才需要上报
     */
    @Log(title = "修改判定隐患上报保存", businessType = BusinessType.UPDATE)
    @PostMapping("/editJudgeDangerReportSave")
@@ -460,7 +470,7 @@
                hiddenDangerCheckPoint.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_EXAMINE);//隐患核查阶段(数据进入到隐患核查阶段)
                hiddenDangerCheckPoint.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查)
//                // todo-2022 隐患信息判定
//                //
//                int result = riskService.updateDangerInfoJudge(hiddenDangerCheckPoint);
//                if (result < 1){
//                    throw new RuntimeException("整改信息保存失败");
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
@@ -436,6 +436,11 @@
    private Long companyId;
    private String checkPerson;
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private Date findTime;
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java
@@ -4,6 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity;
import lombok.Data;
import java.util.Date;
@@ -11,290 +12,115 @@
 * 隐患排查台账导出对象
 *
 */
@Data
public class HiddenDangerCheckPointExport extends BaseEntity
{
    @Excel(name = "序号")
    private String index;
    @Excel(name = "排查方式")
    private String checkType;
    @Excel(name = "隐患事实")
    private String dangerDescription;
    @Excel(name = "检查人员")
    private String checkPerson;
    @Excel(name = "基础清单名称")
    private String baseRiskName;
    @Excel(name = "排查日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private String findTime;
    @Excel(name = "风险单元")
    private String riskPointName;
    @Excel(name = "风险单元类型")
    private String riskPointType;
    @Excel(name = "隐患名称")
    private String dangerName;
//    @Excel(name = "隐患图片", cellType = ColumnType.PICTURE)
    private String preRectifyPhoto;
    @Excel(name = "隐患类别")
    private String troubleTypeName;
    @Excel(name = "隐患级别")
    @Excel(name = "隐患分级")
    private String dangerLevel;
    @Excel(name = "隐患来源")
    private String dangerSources;
    @Excel(name = "整改期限")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private String rectifyDeadlineTime;
    @Excel(name = "隐患责任部门")
    private String dangerDep;
    @Excel(name = "整改状态")
    private String rectifyStatus;
    @Excel(name = "隐患登记时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private String registerCreateTime;
    @Excel(name = "登记人员")
    private String registerUserName;
    @Excel(name = "隐患核查时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private String examineCreateTime;
    @Excel(name = "核查人员")
    private String examineUserName;
    @Excel(name = "隐患整改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private String rectifyCreateTime;
    @Excel(name = "整改人员")
    private String rectifyUserName;
    @Excel(name = "责任人")
    private String judgeUserName;
    @Excel(name = "整改措施")
    private String rectifyMeasure;
//    @Excel(name = "隐患整改后照片", cellType = ColumnType.PICTURE)
    private String postRectifyPhoto;
    @Excel(name = "隐患验收时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private String acceptCreateTime;
    @Excel(name = "验收人员")
    private String acceptUserName;
    @Excel(name = "隐患治理期限")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private String rectifyDeadlineTime;
    @Excel(name = "整改完成时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "完成日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private String rectifyCompleteTime;
    @Excel(name = "隐患描述")
    private String dangerDescription;
    @Excel(name = "验证人")
    private String acceptUserName;
    public String getRectifyDeadlineTime() {
        return rectifyDeadlineTime;
    }
    @Excel(name = "验证时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private String acceptCreateTime;
    public void setRectifyDeadlineTime(String rectifyDeadlineTime) {
        this.rectifyDeadlineTime = rectifyDeadlineTime;
    }
    @Excel(name = "完成情况")
    private String acceptOpinion;
    public String getRectifyCompleteTime() {
        return rectifyCompleteTime;
    }
    public void setRectifyCompleteTime(String rectifyCompleteTime) {
        this.rectifyCompleteTime = rectifyCompleteTime;
    }
//
//    @Excel(name = "排查方式")
//    private String checkType;
//
//
//    @Excel(name = "基础清单名称")
//    private String baseRiskName;
//
//    @Excel(name = "风险单元")
//    private String riskPointName;
//
//
//    @Excel(name = "风险单元类型")
//    private String riskPointType;
//
//
//    @Excel(name = "隐患名称")
//    private String dangerName;
    public String getDangerDescription() {
        return dangerDescription;
    }
//    @Excel(name = "隐患图片", cellType = ColumnType.PICTURE)
//    private String preRectifyPhoto;
//
//    @Excel(name = "隐患类别")
//    private String troubleTypeName;
//
//    @Excel(name = "隐患级别")
//    private String dangerLevel;
//
//    @Excel(name = "隐患来源")
//    private String dangerSources;
//
//    @Excel(name = "隐患责任部门")
//    private String dangerDep;
//
//    @Excel(name = "整改状态")
//    private String rectifyStatus;
//
//    @Excel(name = "隐患登记时间")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    private String registerCreateTime;
//
//    @Excel(name = "登记人员")
//    private String registerUserName;
//
//    @Excel(name = "隐患核查时间")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    private String examineCreateTime;
//
//    @Excel(name = "核查人员")
//    private String examineUserName;
//
//    @Excel(name = "隐患整改时间")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    private String rectifyCreateTime;
//
//    @Excel(name = "整改人员")
//    private String rectifyUserName;
//
//    @Excel(name = "整改措施")
//    private String rectifyMeasure;
//
////    @Excel(name = "隐患整改后照片", cellType = ColumnType.PICTURE)
//    private String postRectifyPhoto;
    public void setDangerDescription(String dangerDescription) {
        this.dangerDescription = dangerDescription;
    }
    public String getPreRectifyPhoto() {
        return preRectifyPhoto;
    }
    public void setPreRectifyPhoto(String preRectifyPhoto) {
        this.preRectifyPhoto = preRectifyPhoto;
    }
    public String getTroubleTypeName() {
        return troubleTypeName;
    }
    public void setTroubleTypeName(String troubleTypeName) {
        this.troubleTypeName = troubleTypeName;
    }
    public String getRegisterUserName() {
        return registerUserName;
    }
    public void setRegisterUserName(String registerUserName) {
        this.registerUserName = registerUserName;
    }
    public String getExamineUserName() {
        return examineUserName;
    }
    public void setExamineUserName(String examineUserName) {
        this.examineUserName = examineUserName;
    }
    public String getDangerDep() {
        return dangerDep;
    }
    public void setDangerDep(String dangerDep) {
        this.dangerDep = dangerDep;
    }
    public String getRectifyUserName() {
        return rectifyUserName;
    }
    public void setRectifyUserName(String rectifyUserName) {
        this.rectifyUserName = rectifyUserName;
    }
    public String getRectifyMeasure() {
        return rectifyMeasure;
    }
    public void setRectifyMeasure(String rectifyMeasure) {
        this.rectifyMeasure = rectifyMeasure;
    }
    public String getPostRectifyPhoto() {
        return postRectifyPhoto;
    }
    public void setPostRectifyPhoto(String postRectifyPhoto) {
        this.postRectifyPhoto = postRectifyPhoto;
    }
    public String getAcceptUserName() {
        return acceptUserName;
    }
    public void setAcceptUserName(String acceptUserName) {
        this.acceptUserName = acceptUserName;
    }
    public String getIndex() {
        return index;
    }
    public void setIndex(String index) {
        this.index = index;
    }
    public String getRegisterCreateTime() {
        return registerCreateTime;
    }
    public void setRegisterCreateTime(String registerCreateTime) {
        this.registerCreateTime = registerCreateTime;
    }
    public String getExamineCreateTime() {
        return examineCreateTime;
    }
    public void setExamineCreateTime(String examineCreateTime) {
        this.examineCreateTime = examineCreateTime;
    }
    public String getRectifyCreateTime() {
        return rectifyCreateTime;
    }
    public void setRectifyCreateTime(String rectifyCreateTime) {
        this.rectifyCreateTime = rectifyCreateTime;
    }
    public String getAcceptCreateTime() {
        return acceptCreateTime;
    }
    public void setAcceptCreateTime(String acceptCreateTime) {
        this.acceptCreateTime = acceptCreateTime;
    }
    public String getCheckType() {
        return checkType;
    }
    public void setCheckType(String checkType) {
        this.checkType = checkType;
    }
    public String getBaseRiskName() {
        return baseRiskName;
    }
    public void setBaseRiskName(String baseRiskName) {
        this.baseRiskName = baseRiskName;
    }
    public String getRiskPointName() {
        return riskPointName;
    }
    public void setRiskPointName(String riskPointName) {
        this.riskPointName = riskPointName;
    }
    public String getRiskPointType() {
        return riskPointType;
    }
    public void setRiskPointType(String riskPointType) {
        this.riskPointType = riskPointType;
    }
    public String getDangerName() {
        return dangerName;
    }
    public void setDangerName(String dangerName) {
        this.dangerName = dangerName;
    }
    public String getDangerLevel() {
        return dangerLevel;
    }
    public void setDangerLevel(String dangerLevel) {
        this.dangerLevel = dangerLevel;
    }
    public String getDangerSources() {
        return dangerSources;
    }
    public void setDangerSources(String dangerSources) {
        this.dangerSources = dangerSources;
    }
    public String getRectifyStatus() {
        return rectifyStatus;
    }
    public void setRectifyStatus(String rectifyStatus) {
        this.rectifyStatus = rectifyStatus;
    }
}
src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
@@ -82,8 +82,6 @@
        <result property="acceptCreateTime" column="accept_create_time"/>
        <result property="acceptStatus" column="accept_status"/>
        <result property="stage" column="stage"/>
        <result property="scheduleCreateUserId" column="schedule_create_user_id"/>
        <result property="scheduleCreateUserName" column="schedule_create_user_name"/>
        <result property="scheduleCheckUserId" column="schedule_check_user_id"/>
@@ -96,16 +94,14 @@
        <result property="jobMessage" column="job_message"/>
        <result property="status" column="status"/>
        <result property="exceptionInfo" column="exception_info"/>
        <result property="troubleshootTypeCycleNum" column="type_cycle_num"/>
        <result property="troubleshootTypeCycleType" column="type_cycle_type"/>
        <result property="checkType" column="check_type"/>
        <result property="companyId" column="company_id"/>
        <result property="checkPerson" column="check_person"/>
        <result property="findTime" column="find_time"/>
    </resultMap>
    <sql id="selectHiddenDangerCheckPointVo">
@@ -132,7 +128,8 @@
        c.check_type,a.company_id,
         b.type_cycle_num,b.type_cycle_type,
         a.examine_user_id, a.examine_user_name
         a.examine_user_id, a.examine_user_name,
         a.check_person, a.find_time
         from tr_hidden_danger_check_point a
         left join tr_hidden_danger_check  c  on  c.check_id = a.check_id
         left join tr_troubleshoot_type  b  on  c.troubleshoot_type_id = b.type_id
@@ -261,21 +258,21 @@
                a.plan_formulate_status != #{planFormulateStatusExclude}
            </if>
            <if test="judgeQueryByUserId != null  and judgeQueryByUserId != ''">
                and a.danger_sources = 2
                and a.danger_sources in (2,3)
                and (a.register_user_id = #{judgeQueryByUserId} or (a.judge_user_id = #{judgeQueryByUserId} and
                a.report_status IS NOT NULL) )
            </if>
            <if test="null != judgeQueryByUserIdList  and judgeQueryByUserIdList.size() > 0">
                and a.danger_sources = 2 and a.report_status IS NOT NULL and (a.judge_user_id in
                and a.danger_sources in (2,3) and a.report_status IS NOT NULL and (a.judge_user_id in
                <foreach collection="judgeQueryByUserIdList" item="judgeQueryByUserId" open="(" separator="," close=")">
                    #{judgeQueryByUserId}
                </foreach>)
            </if>
            <if test="reportStatusByHasHandle != null  and reportStatusByHasHandle != ''">and (a.report_status = 1 or
                a.report_status = 2)
                a.report_status = 2 or a.report_status = 3)
            </if>
            <if test="reportStatusIsNotNull != null  and reportStatusIsNotNull != ''">and (a.report_status IS NOT
                NULL)
@@ -419,12 +416,13 @@
            <if test="acceptCreateTime != null ">accept_create_time,</if>
            <if test="acceptStatus != null  and acceptStatus != ''">accept_status,</if>
            <if test="stage != null  and stage != ''">stage,</if>
            <if test="scheduleCheckStatus != null  and scheduleCheckStatus != ''">schedule_check_status,</if>
            <if test="checkType != null  and checkType != ''">check_type,</if>
            <if test="companyId != null  and companyId != ''">company_id,</if>
            <if test="checkPerson != null  and checkPerson != ''">check_person,</if>
            <if test="findTime != null ">find_time,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null ">#{id},</if>
@@ -482,12 +480,13 @@
            <if test="acceptCreateTime != null ">#{acceptCreateTime},</if>
            <if test="acceptStatus != null  and acceptStatus != ''">#{acceptStatus},</if>
            <if test="stage != null  and stage != ''">#{stage},</if>
            <if test="scheduleCheckStatus != null  and scheduleCheckStatus != ''">#{scheduleCheckStatus},</if>
            <if test="checkType != null  and checkType != ''">#{checkType},</if>
            <if test="companyId != null  and companyId != ''">#{companyId},</if>
            <if test="checkPerson != null  and checkPerson != ''">#{checkPerson},</if>
            <if test="findTime != null ">#{findTime},</if>
        </trim>
    </insert>
@@ -563,7 +562,8 @@
            </if>
            <if test="checkType != null  and checkType != ''">check_type = #{checkType},</if>
            <if test="checkPerson != null  and checkPerson != ''">check_person = #{checkPerson},</if>
            <if test="findTime != null ">find_time = #{findTime},</if>
        </trim>
        where id = #{id}
    </update>