From dc1f8126ce1e5ff191a122a84ea65f4ba6918a04 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Tue, 09 Aug 2022 11:13:46 +0800
Subject: [PATCH] 时间fix

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
index c6b03e7..38c557a 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
@@ -1,6 +1,8 @@
 package com.gkhy.safePlatform.equipment.entity;
 
 import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gkhy.safePlatform.equipment.entity.BaseDomain;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -108,6 +110,7 @@
         this.setPart = setPart;
     }
                 //生产日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp produceTime;
         
     public Timestamp getProduceTime() {
@@ -138,6 +141,7 @@
         this.lifeCycle = lifeCycle;
     }
                 //投用日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp useDate;
         
     public Timestamp getUseDate() {
@@ -168,6 +172,7 @@
         this.stopStatus = stopStatus;
     }
                 //上次检查日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp previousCheckDate;
         
     public Timestamp getPreviousCheckDate() {
@@ -178,6 +183,7 @@
         this.previousCheckDate = previousCheckDate;
     }
                 //上次检测日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp previousTestDate;
         
     public Timestamp getPreviousTestDate() {
@@ -188,6 +194,7 @@
         this.previousTestDate = previousTestDate;
     }
                 //上次保养日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp previousTakecareDate;
         
     public Timestamp getPreviousTakecareDate() {
@@ -198,6 +205,7 @@
         this.previousTakecareDate = previousTakecareDate;
     }
                 //下次检查日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp nextCheckDate;
         
     public Timestamp getNextCheckDate() {
@@ -208,6 +216,7 @@
         this.nextCheckDate = nextCheckDate;
     }
                 //下次检测日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp nextTestDate;
         
     public Timestamp getNextTestDate() {
@@ -218,6 +227,7 @@
         this.nextTestDate = nextTestDate;
     }
                 //下次保养日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp nextTakecareDate;
         
     public Timestamp getNextTakecareDate() {
@@ -418,6 +428,7 @@
         this.afterStopStep = afterStopStep;
     }
                 //实际停用日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp actualStopDate;
         
     public Timestamp getActualStopDate() {
@@ -448,6 +459,7 @@
         this.stopSubmitPersonName = stopSubmitPersonName;
     }
                 //停用提交日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp stopSubmitDate;
         
     public Timestamp getStopSubmitDate() {
@@ -468,6 +480,7 @@
         this.recoveryReason = recoveryReason;
     }
                 //恢复填报日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp recoverySubmitDate;
         
     public Timestamp getRecoverySubmitDate() {
@@ -478,6 +491,7 @@
         this.recoverySubmitDate = recoverySubmitDate;
     }
                 //实际恢复日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp actualRecoveryDate;
         
     public Timestamp getActualRecoveryDate() {
@@ -498,6 +512,7 @@
         this.destoryReason = destoryReason;
     }
                 //报废填报日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp destorySubmitDate;
         
     public Timestamp getDestorySubmitDate() {
@@ -508,6 +523,7 @@
         this.destorySubmitDate = destorySubmitDate;
     }
                 //实际报废日期
+                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp actualDestoryDate;
         
     public Timestamp getActualDestoryDate() {

--
Gitblit v1.9.2