From dc1f8126ce1e5ff191a122a84ea65f4ba6918a04 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 09 八月 2022 11:13:46 +0800
Subject: [PATCH] 时间fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java | 3 +++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java | 4 +++-
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java | 16 ++++++++++++++++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutyfileInfo.java | 14 ++++++++------
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java | 5 +++++
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java | 3 +++
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java | 4 ++++
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java | 3 +++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java | 3 +++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java | 3 +++
10 files changed, 51 insertions(+), 7 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() {
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
index 4b5ab94..2568acd 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.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;
@@ -68,6 +70,7 @@
this.repairPersonName = repairPersonName;
}
//维修开始日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp repairStartDate;
public Timestamp getRepairStartDate() {
@@ -78,6 +81,7 @@
this.repairStartDate = repairStartDate;
}
//维修结束日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp repairEndDate;
public Timestamp getRepairEndDate() {
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java
index aa20823..c7c26f3 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.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;
@@ -78,6 +80,7 @@
this.leadingPersonName = leadingPersonName;
}
//保养日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp takecareDate;
public Timestamp getTakecareDate() {
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java
index 033adf1..66d3f26 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.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;
@@ -68,6 +70,7 @@
this.testPersonName = testPersonName;
}
//检测日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp testDate;
public Timestamp getTestDate() {
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java
index fa211c7..04a6a4d 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java
@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.targetDuty.entity;
import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -58,6 +60,7 @@
this.itemDetail = itemDetail;
}
//考核日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp examineDate;
public Timestamp getExamineDate() {
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java
index 227072e..d440426 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java
@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.targetDuty.entity;
import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -107,7 +109,7 @@
public void setSetPersonDepartmentId(Long setPersonDepartmentId) {
this.setPersonDepartmentId = setPersonDepartmentId;
}
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp setTimem;
public Timestamp getSetTimem() {
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java
index 3d99f43..77f17d2 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java
@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.targetDuty.entity;
import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -48,6 +50,7 @@
this.value = value;
}
//制定日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp makeDate;
public Timestamp getMakeDate() {
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutyfileInfo.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutyfileInfo.java
index 7344921..eca6eb8 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutyfileInfo.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutyfileInfo.java
@@ -5,12 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 目标责任书(TargetDutyfileInfo)表实体类
*
* @author xurui
- * @since 2022-07-21 10:07:54
+ * @since 2022-08-09 11:07:00
*/
@SuppressWarnings("serial")
@TableName("target_dutyfile_info")
@@ -28,7 +29,7 @@
}
//序号
- private String indexNum;
+ private String indexNum;
public String getIndexNum() {
return indexNum;
@@ -38,7 +39,7 @@
this.indexNum = indexNum;
}
//岗位号/外键
- private Long jobId;
+ private Long jobId;
public Long getJobId() {
return jobId;
@@ -48,7 +49,8 @@
this.jobId = jobId;
}
//责任书签订日期
- private Timestamp signDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp signDate;
public Timestamp getSignDate() {
return signDate;
@@ -58,7 +60,7 @@
this.signDate = signDate;
}
//备注信息
- private String memo;
+ private String memo;
public String getMemo() {
return memo;
@@ -68,7 +70,7 @@
this.memo = memo;
}
//责任书附件，多个附件用逗号隔开
- private String extraFile;
+ private String extraFile;
public String getExtraFile() {
return extraFile;
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
index 5178188..12cf42a 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.targetDuty.entity;
import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -68,6 +70,7 @@
this.makerDepartmentId = makerDepartmentId;
}
//制定日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp makeDate;
public Timestamp getMakeDate() {
@@ -88,6 +91,7 @@
this.uploadValue = uploadValue;
}
//上报时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp uploadDate;
public Timestamp getUploadDate() {
@@ -118,6 +122,7 @@
this.examinePersonId = examinePersonId;
}
//考核时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp examineDate;
public Timestamp getExamineDate() {
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
index 7013024..bd836e3 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.targetDuty.entity;
import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -79,6 +81,7 @@
this.level = level;
}
//完成期限
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp completeDate;
public Timestamp getCompleteDate() {
--
Gitblit v1.9.2