From 352c5c4c62875306ef7db8d61688bf7fc8a6e842 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期四, 13 六月 2024 15:25:49 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java | 14 ++++++++++++--
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDateDTO.java | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 2 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 6ddc64b..131995e 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,6 @@
package com.ruoyi.project.tr.specialCheck.controller;
+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 +9,14 @@
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.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 +26,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;
/**
@@ -104,8 +110,12 @@
@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);
+
+ 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();
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDateDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDateDTO.java
new file mode 100644
index 0000000..240fec2
--- /dev/null
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDateDTO.java
@@ -0,0 +1,43 @@
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class TbSpecialCheckTaskLogDateDTO {
+
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+ private String hazardCode;
+ private String hazardSource;
+
+ private String taskId;
+
+ private String checkType;
+
+ private Date checkDate;
+
+ private String resultStatus;
+
+ private Byte deleted;
+
+ private String createBy;
+
+ private Date createDate;
+
+ private String updateBy;
+
+ private Date updateDate;
+
+ private Date reportTime;
+
+ private Byte reportStatus;
+}
--
Gitblit v1.9.2