From 2b4afe24e1136e4eb25e37b7a76565603ddc1a85 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 18 八月 2022 15:37:44 +0800
Subject: [PATCH] 统计fix
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java | 72 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 2 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 edf71e4..b67dbbc 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
@@ -2,6 +2,8 @@
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;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,7 +12,7 @@
* 设备设施详细信息(EquipmentInfo)表实体类
*
* @author xurui
- * @since 2022-07-20 09:19:29
+ * @since 2022-08-03 10:55:54
*/
@SuppressWarnings("serial")
@TableName("equipment_info")
@@ -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() {
@@ -236,6 +246,16 @@
public void setLeadingPersonId(Long leadingPersonId) {
this.leadingPersonId = leadingPersonId;
+ }
+ //负责人名称
+ private String leadingPersonName;
+
+ public String getLeadingPersonName() {
+ return leadingPersonName;
+ }
+
+ public void setLeadingPersonName(String leadingPersonName) {
+ this.leadingPersonName = leadingPersonName;
}
//负责人部门外键
private Long leadingPersonDepartmentId;
@@ -408,6 +428,7 @@
this.afterStopStep = afterStopStep;
}
//实际停用日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualStopDate;
public Timestamp getActualStopDate() {
@@ -427,7 +448,18 @@
public void setStopSubmitPersonId(Long stopSubmitPersonId) {
this.stopSubmitPersonId = stopSubmitPersonId;
}
+ //停用提交人名称
+ private String stopSubmitPersonName;
+
+ public String getStopSubmitPersonName() {
+ return stopSubmitPersonName;
+ }
+
+ public void setStopSubmitPersonName(String stopSubmitPersonName) {
+ this.stopSubmitPersonName = stopSubmitPersonName;
+ }
//停用提交日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp stopSubmitDate;
public Timestamp getStopSubmitDate() {
@@ -448,6 +480,7 @@
this.recoveryReason = recoveryReason;
}
//恢复填报日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp recoverySubmitDate;
public Timestamp getRecoverySubmitDate() {
@@ -458,6 +491,7 @@
this.recoverySubmitDate = recoverySubmitDate;
}
//实际恢复日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualRecoveryDate;
public Timestamp getActualRecoveryDate() {
@@ -478,6 +512,7 @@
this.destoryReason = destoryReason;
}
//报废填报日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp destorySubmitDate;
public Timestamp getDestorySubmitDate() {
@@ -488,6 +523,7 @@
this.destorySubmitDate = destorySubmitDate;
}
//实际报废日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualDestoryDate;
public Timestamp getActualDestoryDate() {
@@ -497,5 +533,37 @@
public void setActualDestoryDate(Timestamp actualDestoryDate) {
this.actualDestoryDate = actualDestoryDate;
}
-
+
+ //区域ID/外键
+ private Long areaId;
+
+ //区域名称
+ private String areaName;
+
+ public Long getAreaId() {
+ return areaId;
+ }
+
+ public void setAreaId(Long areaId) {
+ this.areaId = areaId;
+ }
+
+ public String getAreaName() {
+ return areaName;
+ }
+
+ public void setAreaName(String areaName) {
+ this.areaName = areaName;
+ }
+
+ //保养周期
+ private String takecareCycle;
+
+ public String getTakecareCycle() {
+ return takecareCycle;
+ }
+
+ public void setTakecareCycle(String takecareCycle) {
+ this.takecareCycle = takecareCycle;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2