From c8e1f4749f96282a31eb37c50fa869a431430a3f Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期五, 22 十二月 2023 15:52:01 +0800
Subject: [PATCH] 隐患查询、台账添加未判定任务
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
index 437f1ca..8902ae7 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
+++ b/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);
}
@@ -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);
}
--
Gitblit v1.9.2