From 07e4b1114feadc19478847a9bcda869b5d6a5bf7 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 14:23:10 +0800
Subject: [PATCH] 项目目录结构调整
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
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 cb6781e..572afcb 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,16 +1,17 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
-
+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;
+import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 设备维修明细(EquipmentRepairDetail)表实体类
*
* @author xurui
- * @since 2022-07-19 15:10:57
+ * @since 2022-08-29 08:37:54
*/
@SuppressWarnings("serial")
@TableName("equipment_repair_detail")
@@ -28,7 +29,7 @@
}
//具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
- private Integer infoTpe;
+ private Integer infoTpe;
public Integer getInfoTpe() {
return infoTpe;
@@ -38,7 +39,7 @@
this.infoTpe = infoTpe;
}
//设备ID/外键
- private Long equipmentId;
+ private Long equipmentId;
public Long getEquipmentId() {
return equipmentId;
@@ -48,7 +49,7 @@
this.equipmentId = equipmentId;
}
//维修负责人/外键
- private Long repairPersonId;
+ private Long repairPersonId;
public Long getRepairPersonId() {
return repairPersonId;
@@ -57,8 +58,19 @@
public void setRepairPersonId(Long repairPersonId) {
this.repairPersonId = repairPersonId;
}
+ //维修负责人名称
+ private String repairPersonName;
+
+ public String getRepairPersonName() {
+ return repairPersonName;
+ }
+
+ public void setRepairPersonName(String repairPersonName) {
+ this.repairPersonName = repairPersonName;
+ }
//维修开始日期
- private Timestamp repairStartDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp repairStartDate;
public Timestamp getRepairStartDate() {
return repairStartDate;
@@ -68,7 +80,8 @@
this.repairStartDate = repairStartDate;
}
//维修结束日期
- private Timestamp repairEndDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp repairEndDate;
public Timestamp getRepairEndDate() {
return repairEndDate;
@@ -78,7 +91,7 @@
this.repairEndDate = repairEndDate;
}
//维修负责人单位/外键
- private Long repairPersonDepartmentId;
+ private Long repairPersonDepartmentId;
public Long getRepairPersonDepartmentId() {
return repairPersonDepartmentId;
@@ -87,8 +100,18 @@
public void setRepairPersonDepartmentId(Long repairPersonDepartmentId) {
this.repairPersonDepartmentId = repairPersonDepartmentId;
}
+ //维修负责人单位名称
+ private String repairPersonDepartmentName;
+
+ public String getRepairPersonDepartmentName() {
+ return repairPersonDepartmentName;
+ }
+
+ public void setRepairPersonDepartmentName(String repairPersonDepartmentName) {
+ this.repairPersonDepartmentName = repairPersonDepartmentName;
+ }
//维修情况
- private String repairMemo;
+ private String repairMemo;
public String getRepairMemo() {
return repairMemo;
@@ -98,7 +121,7 @@
this.repairMemo = repairMemo;
}
//维修状态 1：维修中 2：已修好
- private Integer repairStatus;
+ private Integer repairStatus;
public Integer getRepairStatus() {
return repairStatus;
@@ -108,7 +131,7 @@
this.repairStatus = repairStatus;
}
//设施异常项
- private String exceptionInfo;
+ private String exceptionInfo;
public String getExceptionInfo() {
return exceptionInfo;
@@ -117,5 +140,15 @@
public void setExceptionInfo(String exceptionInfo) {
this.exceptionInfo = exceptionInfo;
}
-
+ //是否删除 0:未删除 1:删除
+ private Integer delFlag;
+
+ public Integer getDelFlag() {
+ return delFlag;
+ }
+
+ public void setDelFlag(Integer delFlag) {
+ this.delFlag = delFlag;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.2