From 56ba708b25e1834eeb6c0366945b2c1fbafcfbe5 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 10 八月 2022 15:38:31 +0800
Subject: [PATCH] 序列化前段修改fix
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java | 70 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java
index 63eac78..0e68549 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java
@@ -1,5 +1,6 @@
package com.gkhy.safePlatform.equipment.model.dto.req;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.equipment.entity.*;
import java.io.Serializable;
@@ -26,29 +27,37 @@
private Long departmentId;
//设置部位
private String setPart;
- //生产日期
+ //生产日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp produceTime;
//使用期限(天)
private String useEndDay;
//生命周期 1：已使用 2：库存中 3：报废
private Integer lifeCycle;
- //投用日期
+ //投用日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp useDate;
//维修状态 1:维修中 2：已修好
private Integer repairStatus;
//停用状态 1:停用 2.在用 3.维修 4.报废
private Integer stopStatus;
- //上次检查日期
+ //上次检查日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp previousCheckDate;
- //上次检测日期
+ //上次检测日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp previousTestDate;
- //上次保养日期
+ //上次保养日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp previousTakecareDate;
- //下次检查日期
+ //下次检查日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp nextCheckDate;
- //下次检测日期
+ //下次检测日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp nextTestDate;
- //下次保养日期
+ //下次保养日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp nextTakecareDate;
//负责人ID外键
private Long leadingPersonId;
@@ -88,29 +97,35 @@
private String stopReason;
//停用后措施
private String afterStopStep;
- //实际停用日期
+ //实际停用日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualStopDate;
//停用提交人/外键
private Long stopSubmitPersonId;
//停用提交人名称
private String stopSubmitPersonName;
- //停用提交日期
+ //停用提交日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp stopSubmitDate;
//恢复理由
private String recoveryReason;
- //恢复填报日期
+ //恢复填报日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp recoverySubmitDate;
- //实际恢复日期
+ //实际恢复日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualRecoveryDate;
//报废理由
private String destoryReason;
- //报废填报日期
+ //报废填报日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp destorySubmitDate;
- //实际报废日期
+ //实际报废日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualDestoryDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp createTime;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp updateTime;
//设备保养
@@ -654,4 +669,27 @@
public List<EquipmentCheckStandardDetail> getCheckStandardeDetailList() {
return checkStandardeDetailList;
}
+
+
+ //区域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;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2