暂时提交

16639036659

2023-12-11 56c84cd7fb04407536eb0135162313029828a81f

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

@@ -23,6 +23,7 @@
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 org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
@@ -121,7 +122,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<>();

@@ -166,9 +167,13 @@
                    export.setRiskPointType("工艺节点清单");
                }
                // 隐患责任部门
                export.setDangerDep(hcp.getRectifyDeptName()); // todo
                export.setDangerDep(hcp.getRectifyDeptName());

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

                //隐患描述   todo
                export.setDangerDescription(hcp.getDangerDescription());

                //隐患级别
                if ("0".equals(hcp.getDangerLevel())) {
@@ -192,6 +197,15 @@
                    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())) {
@@ -347,6 +361,7 @@
            } else if (("超期改").equals(rectifyStatusLedger)) {
                hiddenDangerCheckPoint.setStage("5");
                hiddenDangerCheckPoint.setOverdueRectify("1");
//                hiddenDangerCheckPoint.setAcceptStatus("1");
            }
        }
        //整改部门