From 4036bf21de728198d9c1d818f1bcbf90732f0304 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 22 七月 2022 15:45:40 +0800
Subject: [PATCH] 日期fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java | 3 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java | 5 +++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java | 3 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java | 3 +++
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java | 4 ++++
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java | 5 ++++-
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java | 1 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java | 4 ++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java | 3 +++
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java | 3 +++
10 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java
index b6e3ef9..e8baaad 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java
@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.emergency.model.dto.req;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.util.List;
@@ -10,6 +12,7 @@
private Boolean status;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillRecordDate;
private Long drillPlanId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java
index 7ec32da..b0a3fc6 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java
@@ -1,5 +1,7 @@
package com.gkhy.safePlatform.emergency.model.dto.req;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -10,8 +12,10 @@
private Integer status;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date makingPlanDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillPlanDate;
private Long makingUserUid;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java
index 302ad9e..0a57857 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java
@@ -1,5 +1,7 @@
package com.gkhy.safePlatform.emergency.model.dto.req;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.util.List;
@@ -9,6 +11,7 @@
private Integer status;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date releaseDate;
private Long authorUid;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java
index ab4a3d1..f8f63a1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java
@@ -2,6 +2,8 @@
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.util.List;
@@ -11,6 +13,7 @@
private Long suppliesId;
private String inspectResult;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inspectTime;
private List<EmergencySuppliesInspectUserReqDTO> userList;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java
index d2c4e19..0a104f1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java
@@ -1,5 +1,7 @@
package com.gkhy.safePlatform.emergency.model.dto.req;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.util.List;
@@ -9,6 +11,7 @@
private Long suppliesId;
private String maintainResult;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date maintainTime;
private List<EmergencySuppliesMaintainUserReqDTO> userList;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java
index a42d29f..0e6c520 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
@@ -10,9 +11,13 @@
@TableId(type = IdType.AUTO)
private Long id;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date productionDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date useDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inspectDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date nextInspectDate;
private Integer inspectPeriod;
private Integer count;
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java
index 1b9df7c..12f0cc5 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java
@@ -19,6 +19,7 @@
private String accidentCause;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date occurrenceTime;
private String occurrencePlace;
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java
index 4eb0265..8c3663b 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java
@@ -1,5 +1,7 @@
package com.gkhy.safePlatform.incidentManage.model.dto.req;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -24,6 +26,7 @@
private String accidentCause;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date reportDeadline;
private String accidentLevel;
@@ -40,6 +43,7 @@
private Long fillInUserUid;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date fillInTime;
private String relevantPersonnelRecords;
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java
index 82dfa7d..6402836 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java
@@ -1,5 +1,7 @@
package com.gkhy.safePlatform.incidentManage.model.dto.req;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -18,6 +20,7 @@
private String workInjuryType;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date declareDate;
private BigDecimal lostTime;
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
index 90851c2..6ae47a0 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
@@ -51,10 +51,13 @@
BeanUtils.copyProperties(query.getSearchParams(), accidentExpressDBQuery);
}
-
List<AccidentExpressInfoPageDO> accidentExpressInfoPageDOList = accidentExpressInfoService.selectAccidentExpressList(page, accidentExpressDBQuery);
List<AccidentExpressPageRespDTO> respList = BeanCopyUtils.copyBeanList(accidentExpressInfoPageDOList, AccidentExpressPageRespDTO.class);
+ respList.forEach(AccidentExpressPageRespDTO ->{
+
+ });
+
return new SearchResultVO<>(
true,
pageIndex,
--
Gitblit v1.9.2