From 9015e720487b737743232b0b3aa464c2ac9e8d17 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期五, 15 十一月 2024 17:31:24 +0800
Subject: [PATCH] 修改请求地址
---
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemLogController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemLogController.java
index ef76a57..a91d1f9 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemLogController.java
@@ -13,8 +13,10 @@
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckItemDangerLogDTO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckItemLogDTO;
+import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckScoreAndDangerLogDTO;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemLog;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService;
import com.ruoyi.project.tr.specialCheck.service.TbBaseCheckService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,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;
/**
@@ -68,8 +73,21 @@
{
ResultVO<List<TbSpecialCheckItemLog>> resultVO = itemDangerLogService.selectSpecialCheckItemDangerLogPage(itemDangerLogBO);
+ List<TbSpecialCheckItemLog> itemList = (List<TbSpecialCheckItemLog>) resultVO.getData();
List<TbSpecialCheckItemDangerLogDTO> data = (List<TbSpecialCheckItemDangerLogDTO>) resultVO.getData();
+ List<TbSpecialCheckItemLogDTO> tbSpecialCheckItemLogDTOS = BeanCopyUtils.copyBeanList(data, TbSpecialCheckItemLogDTO.class);
+ for (TbSpecialCheckItemLogDTO item : tbSpecialCheckItemLogDTOS) {
+ for (TbSpecialCheckItemLog datum : itemList) {
+ if (datum.getId().equals(item.getId())){
+ Instant createDate = datum.getCreateDate().atZone(ZoneId.systemDefault()).toInstant();
+ item.setCreateDate(Date.from(createDate));
+
+ Instant updateDate = datum.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant();
+ item.setUpdateDate(Date.from(updateDate));
+ }
+ }
+ }
TableDataInfo dataTable = getDataTable(data);
dataTable.setTotal(resultVO.getCount());
@@ -113,6 +131,11 @@
TbSpecialCheckItemLog specialCheckItem = itemDangerLogService.getSpecialCheckItemDangerLogByIndexId(indexId);
TbSpecialCheckItemLogDTO data = BeanCopyUtils.copyBean(specialCheckItem, TbSpecialCheckItemLogDTO.class);
+ 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);
// TbBaseCheckTaskBO tbBaseCheckTaskBO = new TbBaseCheckTaskBO();
--
Gitblit v1.9.2