From 7be0d5b901b999d2347774df3cc1a64927838bb3 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 15 四月 2025 10:10:35 +0800
Subject: [PATCH] 优化每年专项数据获取
---
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java
index 35293f8..a052e89 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java
@@ -9,11 +9,10 @@
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogEditBO;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckScoreAndDangerLogDTO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckScoreAndDangerLogRespDTO;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
import com.ruoyi.project.tr.specialCheck.service.SpecialCheckScoreAndDangerDangerLogService;
import com.ruoyi.project.tr.specialCheck.service.TbBaseCheckService;
@@ -66,8 +65,24 @@
{
ResultVO<List<TbSpecialCheckScoreAndDangerLog>> resultVO = scoreAndDangerDangerLogService.selectSpecialCheckScoreAndDangerLogPage(scoreAndDangerLogBO);
+
List<TbSpecialCheckScoreAndDangerLogRespDTO> data = (List<TbSpecialCheckScoreAndDangerLogRespDTO>) resultVO.getData();
+ List<TbSpecialCheckScoreAndDangerLog> scoreList = (List<TbSpecialCheckScoreAndDangerLog>) resultVO.getData();
List<TbSpecialCheckScoreAndDangerLogDTO> tbSpecialCheckScoreAndDangerLogDTOS = BeanCopyUtils.copyBeanList(data, TbSpecialCheckScoreAndDangerLogDTO.class);
+ for (TbSpecialCheckScoreAndDangerLogDTO score : tbSpecialCheckScoreAndDangerLogDTOS) {
+ for (TbSpecialCheckScoreAndDangerLog datum : scoreList) {
+ if (datum.getId().equals(score.getId())){
+ Instant checkDate = datum.getCheckDate().atZone(ZoneId.systemDefault()).toInstant();
+ score.setCheckDate(Date.from(checkDate));
+
+ Instant createDate = datum.getCreateDate().atZone(ZoneId.systemDefault()).toInstant();
+ score.setCreateDate(Date.from(createDate));
+
+ Instant updateDate = datum.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant();
+ score.setUpdateDate(Date.from(updateDate));
+ }
+ }
+ }
TableDataInfo dataTable = getDataTable(tbSpecialCheckScoreAndDangerLogDTOS);
dataTable.setTotal(resultVO.getCount());
@@ -78,8 +93,9 @@
/**
* 新增
*/
- @GetMapping("/add")
- public String add(ModelMap mmap)
+ @GetMapping("/add/{id}")
+// public String add(ModelMap mmap)
+ public String add(@PathVariable("id") String id, ModelMap mmap)
{
List<RiskList> riskList = riskListService.listHazardSource();
List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
@@ -94,9 +110,9 @@
*/
@PostMapping("/add")
@ResponseBody
- public AjaxResult addSpecialItemDanger(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog){
+ public AjaxResult addSpecialItemDanger(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog){
- ResultVO<TbSpecialCheckScoreAndDangerLog> resultVO = scoreAndDangerDangerLogService.addSpecialScoreAndDanger(scoreAndDangerLog);
+ ResultVO<TbSpecialCheckScoreAndDangerLog> resultVO = scoreAndDangerDangerLogService.addSpecialScoreAndDanger(scoreAndDangerEditLog);
String code = resultVO.getCode();
if ("200".equals(code)){
return toAjax(1);
@@ -105,8 +121,8 @@
}
}
- @GetMapping("/edit/{id}")
- public String edit(@PathVariable("id") Long indexId, ModelMap mmap)
+ @GetMapping("/edit/{indexId}")
+ public String edit(@PathVariable("indexId") Long indexId, ModelMap mmap)
{
TbSpecialCheckScoreAndDangerLog specialCheckItem = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogByIndexId(indexId);
TbSpecialCheckScoreAndDangerLogDTO data = BeanCopyUtils.copyBean(specialCheckItem, TbSpecialCheckScoreAndDangerLogDTO.class);
@@ -120,6 +136,10 @@
Instant updateDate = specialCheckItem.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant();
data.setUpdateDate(Date.from(updateDate));
mmap.put("specialCheckItem",data);
+ List<RiskList> riskList = riskListService.listHazardSource();
+ List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
+ mmap.put("hazardList", riskList);
+ mmap.put("dangerList", dangerList);
// TbBaseCheckTaskBO tbBaseCheckTaskBO = new TbBaseCheckTaskBO();
// ResultVO<List<TbBaseCheckTask>> listResultVO = tbBaseCheckService.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO);
// Object data = listResultVO.getData();
@@ -127,17 +147,31 @@
return prefix + "/edit";
}
- @GetMapping("/detail/{id}")
- public String detail(@PathVariable("id") Long indexId, ModelMap mmap)
+ @GetMapping("/detail/{indexId}")
+ public String detail(@PathVariable("indexId") Long indexId, ModelMap mmap)
{
TbSpecialCheckScoreAndDangerLog specialCheckItem = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogByIndexId(indexId);
- mmap.put("specialCheckItem",specialCheckItem);
+ TbSpecialCheckScoreAndDangerLogDTO data = BeanCopyUtils.copyBean(specialCheckItem, TbSpecialCheckScoreAndDangerLogDTO.class);
+
+ Instant checkDate = specialCheckItem.getCheckDate().atZone(ZoneId.systemDefault()).toInstant();
+ data.setCheckDate(Date.from(checkDate));
+
+ Instant createDate = specialCheckItem.getCreateDate().atZone(ZoneId.systemDefault()).toInstant();
+ data.setCreateDate(Date.from(createDate));
+
+ Instant updateDate = specialCheckItem.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant();
+ data.setUpdateDate(Date.from(updateDate));
+ mmap.put("specialCheckItem",data);
+ List<RiskList> riskList = riskListService.listHazardSource();
+ List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
+ mmap.put("hazardList", riskList);
+ mmap.put("dangerList", dangerList);
// TbBaseCheckTaskBO tbBaseCheckTaskBO = new TbBaseCheckTaskBO();
// ResultVO<List<TbBaseCheckTask>> listResultVO = tbBaseCheckService.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO);
// Object data = listResultVO.getData();
// mmap.put("tbBaseCheckTask", data);
- return prefix + "/edit";
+ return prefix + "/detail";
}
/**
@@ -145,9 +179,9 @@
*/
@PostMapping("/edit")
@ResponseBody
- public AjaxResult editSave(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog)
+ public AjaxResult editSave(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog)
{
- ResultVO<TbSpecialCheckScoreAndDangerLog> resultVO = scoreAndDangerDangerLogService.updateSpecialCheckScoreAndDangerLog(scoreAndDangerLog);
+ ResultVO<TbSpecialCheckScoreAndDangerLog> resultVO = scoreAndDangerDangerLogService.updateSpecialCheckScoreAndDangerLog(scoreAndDangerEditLog);
String code = resultVO.getCode();
if ("200".equals(code)){
return toAjax(1);
--
Gitblit v1.9.2