优化处理

heheng

3 天以前 ac8870aae3ec2b5ec5315cc668b482858195cfa4

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

@@ -5,6 +5,9 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.poi.ExcelUtilByDangerLedger;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -23,8 +26,11 @@
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPointExport;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import lombok.Data;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;

@@ -32,10 +38,7 @@
import java.text.NumberFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;

/**
 * 隐患台账Controller
@@ -61,6 +64,8 @@

    @Autowired
    private ICompanyService companyService;
    @Autowired
    private RiskService riskService;


    @PostMapping("/export")
@@ -121,7 +126,7 @@
        if (!StringUtils.isEmpty(rectifyDeptIdLedger)) {
            hiddenDangerCheckPoint.setRectifyDeptId(Long.valueOf(rectifyDeptIdLedger));
        }
        List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint);
        List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointListNew(hiddenDangerCheckPoint);

        List<HiddenDangerCheckPointExport> exportList = new ArrayList<>();

@@ -130,132 +135,219 @@
            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(ObjectUtils.isNotEmpty(hcp.getRectifyDeadlineTime())){
                    export.setRectifyDeadlineTime(DateUtils.parseDateToStr("yyyy-MM-dd", hcp.getRectifyDeadlineTime()));
                }

                //风险单元
                if ((!("1".equals(hcp.getCheckType()))) && !StringUtils.isEmpty(hcp.getRiskName())) {
                    export.setRiskPointName(hcp.getRiskName());
                } else {
                    export.setRiskPointName("-");
                if (ObjectUtils.isNotEmpty(hcp.getJudgeUserName())){
                    export.setJudgeUserName(hcp.getJudgeUserName());
                }


                //风险单元类型
                if ("1".equals(hcp.getRiskType())) {
                    export.setRiskPointType("设备设施清单");
                } else if ("2".equals(hcp.getRiskType())) {
                    export.setRiskPointType("作业活动清单");
                } else if ("3".equals(hcp.getRiskType())) {
                    export.setRiskPointType("工艺节点清单");
                if (ObjectUtils.isNotEmpty(hcp.getRectifyMeasure())){
                    export.setRectifyMeasure(hcp.getRectifyMeasure());
                }

                //隐患名称
                export.setDangerName(hcp.getDangerName());


                //隐患级别
                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 (ObjectUtils.isNotEmpty(hcp.getRectifyCompleteTime())){
                    export.setRectifyCompleteTime(DateUtils.parseDateToStr("yyyy-MM-dd", hcp.getRectifyCompleteTime()));
                }

                //隐患来源
                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.getAcceptUserName())){
                    export.setAcceptUserName(hcp.getAcceptUserName());
                }

                if (ObjectUtils.isNotEmpty(hcp.getAcceptCreateTime())){
                    export.setAcceptCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd", hcp.getAcceptCreateTime()));
                }

                //整改状态
                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.getAcceptOpinion())){
                    export.setAcceptOpinion(hcp.getAcceptOpinion());
                }
                if (hcp.getRegisterCreateTime() != null) {
                    export.setRegisterCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getRegisterCreateTime()));

                //上报时间。判定人、核查人
                if (ObjectUtils.isNotEmpty(hcp.getRegisterCreateTime())){
                    export.setRegisterCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd", hcp.getRegisterCreateTime()));
                }
                if (hcp.getExamineCreateTime() != null) {
                    export.setExamineCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getExamineCreateTime()));
                if (ObjectUtils.isNotEmpty(hcp.getJudgeUserName())){
                    export.setJudgeUserName1(hcp.getJudgeUserName());
                }
                if (hcp.getRectifyCreateTime() != null) {
                    export.setRectifyCreateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getRectifyCreateTime()));
                if (ObjectUtils.isNotEmpty(hcp.getExamineUserName())){
                    export.setExamineUserName(hcp.getExamineUserName());
                }
                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);
                if (ObjectUtils.isNotEmpty(hcp.getRegisterCreateTime())){
                    export.setRegisterCreateTime1(DateUtils.parseDateToStr("yyyy-MM-dd", hcp.getRegisterCreateTime()));
                }
            }
            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());
//
//                //隐患描述
//                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 + "隐患排查台账");
@@ -348,6 +440,7 @@
            } else if (("超期改").equals(rectifyStatusLedger)) {
                hiddenDangerCheckPoint.setStage("5");
                hiddenDangerCheckPoint.setOverdueRectify("1");
//                hiddenDangerCheckPoint.setAcceptStatus("1");
            }
        }
        //整改部门
@@ -356,11 +449,19 @@
        }

        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)){
                if (ObjectUtils.isNotEmpty(dangerInfo.getReportTime())){
                    dangerCheckPoint.setReportTime(dangerInfo.getReportTime());
                }
            }
        }

        return getDataTable(list);
    }


    //companyId下总的数据统计
    public void getDangerDataStatistics(String companyId, ModelMap mmap) {
@@ -513,7 +614,7 @@
    }

    /**
     * 列表页面（根据companyId）  todo
     * 列表页面（根据companyId）
     */
    @GetMapping("/listByCompanyId/{companyId}")
    public String listByCompanyId(@PathVariable("companyId") Long companyId, ModelMap mmap) {
@@ -621,6 +722,44 @@
        return getDataTable(list);
    }

    /**
     * 隐患核查--核查
     */
    @Log(title = "隐患核查--核查")
    @GetMapping("/editDangerLevel/{id}")
    public String editNextConfirm(@PathVariable("id") Long id, ModelMap mmap) {
        //隐患排查实体
        HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id));
        mmap.put("hdcp", hiddenDangerCheckPoint);

        return prefix + "/editDangerLevel";
    }

    /**
     * 隐患类别修改
     */
    @Log(title = "隐患上报", businessType = BusinessType.DELETE)
    @PostMapping("/editDangerLevelSave")
    @ResponseBody
    @Transactional
    public AjaxResult editDangerLevelSave(HiddenDangerCheckPoint hdcp) {
        if(ObjectUtils.isEmpty(hdcp.getId())){
            return AjaxResult.error("id不能为空");
        }
        if(ObjectUtils.isEmpty(hdcp.getTroubleTypeName())){
            return AjaxResult.error("隐患类别不能为空");
        }
        //获取当前更新用户信息
        User sysUser = getSysUser();
        hdcp.setUpdateBy(ShiroUtils.getLoginName());
        hdcp.setUpdateTime(DateUtils.getNowDate());
        int i = hiddenDangerCheckPointService.editDangerLevel(hdcp);
        if (i < 1){
            return AjaxResult.error("操作失败");
        }
        return AjaxResult.success();
    }

}