修复问题

heheng

2025-06-27 5746e59e622daa8ce62d0c29aaba9b8bd5308bcd

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

@@ -6,6 +6,8 @@
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;
@@ -62,6 +64,8 @@

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


    @PostMapping("/export")
@@ -182,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);
        }
@@ -232,7 +251,7 @@
//                //隐患名称
//                export.setDangerName(hcp.getDangerName());
//
//                //隐患描述   todo
//                //隐患描述
//                export.setDangerDescription(hcp.getDangerDescription());
//
//                //隐患级别
@@ -430,8 +449,15 @@
        }

        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);
    }