From ad6c598fe4d38218e374334c753c4855a2cf6439 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 17 七月 2024 17:16:08 +0800
Subject: [PATCH] 调整返回值接收类

---
 src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java |   65 ++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
index 2b6b7cd..58c4742 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
@@ -1,5 +1,7 @@
 package com.ruoyi.project.tr.specialCheck.controller;
 
+import com.ruoyi.common.constant.DualControlConstants;
+import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
 import com.ruoyi.doublePrevention.entity.dto.req.PreventRiskControlMeasureDeleteReqDTO;
 import com.ruoyi.doublePrevention.vo.ResultVO;
@@ -8,12 +10,15 @@
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.dc.accidentInformation.domain.AccidentInformation;
+import com.ruoyi.project.enumerate.DcAttachmentTypeEnum;
+import com.ruoyi.project.system.attachment.domain.Attachment;
+import com.ruoyi.project.tr.report.domain.Danger;
 import com.ruoyi.project.tr.riskList.domain.RiskList;
 import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckTaskBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.*;
 import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckTaskLogDTO;
+import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckTaskLogDateDTO;
 import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
 import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
 import com.ruoyi.project.tr.specialCheck.service.SpecialCheckTaskService;
@@ -23,6 +28,9 @@
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.sql.Date;
+import java.time.Instant;
+import java.time.ZoneId;
 import java.util.List;
 
 /**
@@ -79,9 +87,10 @@
     @GetMapping("/add")
     public String add(ModelMap mmap)
     {
-        ResultVO<List<RiskList>> resultVO = riskListService.listHazardSource();
-        Object data = resultVO.getData();
-        mmap.put("hazardList", data);
+        List<RiskList> riskList = riskListService.listHazardSource();
+        mmap.put("hazardList", riskList);
+        List<TbBaseCheckTask> listResult = tbBaseCheckService.listTbBaseCheckTask();
+        mmap.put("tbBaseCheckTask", listResult);
         return prefix + "/add";
     }
 
@@ -91,9 +100,9 @@
      */
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSpecialTask(TbSpecialCheckTaskLog tbSpecialCheckTaskLog){
+    public AjaxResult addSpecialTask(TbSpecialCheckTaskLogEditBO taskLogEditBO){
 
-        ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.addSpecialTask(tbSpecialCheckTaskLog);
+        ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.addSpecialTask(taskLogEditBO);
         String code = resultVO.getCode();
         if ("200".equals(code)){
             return toAjax(1);
@@ -102,17 +111,39 @@
         }
     }
 
-    @GetMapping("/edit/{id}")
+    @GetMapping("/edit/{indexId}")
     public String edit(@PathVariable("indexId") Long indexId, ModelMap mmap)
     {
-        TbSpecialCheckTaskLog specialCheckTaskLogByIndexId = specialCheckTaskService.getSpecialCheckTaskLogByIndexId(indexId);
-        mmap.put("specialCheckTaskLog",specialCheckTaskLogByIndexId);
+        TbSpecialCheckTaskLog specialCheckTaskLog = specialCheckTaskService.getSpecialCheckTaskLogByIndexId(indexId);
 
-        TbBaseCheckTaskBO tbBaseCheckTaskBO = new TbBaseCheckTaskBO();
-        ResultVO<List<TbBaseCheckTask>> listResultVO = tbBaseCheckService.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO);
-        Object data = listResultVO.getData();
-        mmap.put("tbBaseCheckTask", data);
+        TbSpecialCheckTaskLogDateDTO tbSpecialCheckTaskLogDateDTO = BeanCopyUtils.copyBean(specialCheckTaskLog, TbSpecialCheckTaskLogDateDTO.class);
+        Instant instant = specialCheckTaskLog.getCheckDate().atZone(ZoneId.systemDefault()).toInstant();
+        tbSpecialCheckTaskLogDateDTO.setCheckDate(Date.from(instant));
+        mmap.put("specialCheckTaskLog",tbSpecialCheckTaskLogDateDTO);
+        List<RiskList> riskList = riskListService.listHazardSource();
+        mmap.put("hazardList", riskList);
+        List<TbBaseCheckTask> listResult = tbBaseCheckService.listTbBaseCheckTask();
+        mmap.put("tbBaseCheckTask", listResult);
         return prefix + "/edit";
+    }
+
+    /**
+     *
+     */
+    @GetMapping("/detail/{indexId}")
+    public String detail(@PathVariable("indexId") Long indexId, ModelMap mmap)
+    {
+        TbSpecialCheckTaskLog specialCheckTaskLog = specialCheckTaskService.getSpecialCheckTaskLogByIndexId(indexId);
+
+        TbSpecialCheckTaskLogDateDTO tbSpecialCheckTaskLogDateDTO = BeanCopyUtils.copyBean(specialCheckTaskLog, TbSpecialCheckTaskLogDateDTO.class);
+        Instant instant = specialCheckTaskLog.getCheckDate().atZone(ZoneId.systemDefault()).toInstant();
+        tbSpecialCheckTaskLogDateDTO.setCheckDate(Date.from(instant));
+        mmap.put("specialCheckTaskLog",tbSpecialCheckTaskLogDateDTO);
+        List<RiskList> riskList = riskListService.listHazardSource();
+        mmap.put("hazardList", riskList);
+        List<TbBaseCheckTask> listResult = tbBaseCheckService.listTbBaseCheckTask();
+        mmap.put("tbBaseCheckTask", listResult);
+        return prefix + "/detail";
     }
 
     /**
@@ -120,9 +151,9 @@
      */
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(TbSpecialCheckTaskLogUpdateBO updateBO)
+    public AjaxResult editSave(TbSpecialCheckTaskLogEditBO taskLogEditBO)
     {
-        ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.updateSpecialCheckTaskLog(updateBO);
+        ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.updateSpecialCheckTaskLog(taskLogEditBO);
         String code = resultVO.getCode();
         if ("200".equals(code)){
             return toAjax(1);

--
Gitblit v1.9.2