From fe5eb668c432419f37bd646930d3ca60a1afd467 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Wed, 19 Jun 2024 11:16:31 +0800
Subject: [PATCH] 添加

---
 src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java |   62 ++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 13 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 8d577cc..11f7f26 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,17 @@
 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.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 +30,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;
 
 /**
@@ -47,12 +57,17 @@
 
 
 
-    @GetMapping()
-    public String selectTbBaseCheckTaskPage(ModelMap mmap)
+//    @GetMapping()
+//    public String selectTbBaseCheckTaskPage(ModelMap mmap)
+//    {
+//        return prefix + "/specialCheckTaskLog";
+//    }
+    @GetMapping("{id}")
+    public String specialCheckTaskLog(@PathVariable("id")String id,ModelMap modelMap)
     {
+        modelMap.put("id",id);
         return prefix + "/specialCheckTaskLog";
     }
-
 
 
     @PostMapping("/list")
@@ -74,9 +89,8 @@
     @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);
         return prefix + "/add";
     }
 
@@ -97,20 +111,42 @@
         }
     }
 
-    @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";
+    }
+
+    /**
      * 修改保存
      */
     @PostMapping("/edit")

--
Gitblit v1.9.2