From b854d8d7604329dcf99584d15f83ff02076d9e07 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Thu, 01 Sep 2022 10:52:04 +0800
Subject: [PATCH] 假删除fix
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java | 163 ++++++++++++++++++++++++++++--------------------------
1 files changed, 85 insertions(+), 78 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 b67dbbc..409b5d5 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,18 +1,17 @@
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;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 设备设施详细信息(EquipmentInfo)表实体类
*
* @author xurui
- * @since 2022-08-03 10:55:54
+ * @since 2022-08-29 08:37:54
*/
@SuppressWarnings("serial")
@TableName("equipment_info")
@@ -30,7 +29,7 @@
}
//类型/类别外键
- private Long equipmentTypeId;
+ private Long equipmentTypeId;
public Long getEquipmentTypeId() {
return equipmentTypeId;
@@ -40,7 +39,7 @@
this.equipmentTypeId = equipmentTypeId;
}
//具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
- private Integer infoType;
+ private Integer infoType;
public Integer getInfoType() {
return infoType;
@@ -50,7 +49,7 @@
this.infoType = infoType;
}
//名称
- private String qName;
+ private String qName;
public String getQName() {
return qName;
@@ -60,7 +59,7 @@
this.qName = qName;
}
//位号
- private String positionNum;
+ private String positionNum;
public String getPositionNum() {
return positionNum;
@@ -70,7 +69,7 @@
this.positionNum = positionNum;
}
//用途
- private String qUsage;
+ private String qUsage;
public String getQUsage() {
return qUsage;
@@ -80,7 +79,7 @@
this.qUsage = qUsage;
}
//型号
- private String model;
+ private String model;
public String getModel() {
return model;
@@ -90,7 +89,7 @@
this.model = model;
}
//单位部门外键
- private Long departmentId;
+ private Long departmentId;
public Long getDepartmentId() {
return departmentId;
@@ -100,7 +99,7 @@
this.departmentId = departmentId;
}
//设置部位
- private String setPart;
+ private String setPart;
public String getSetPart() {
return setPart;
@@ -110,8 +109,8 @@
this.setPart = setPart;
}
//生产日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Timestamp produceTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp produceTime;
public Timestamp getProduceTime() {
return produceTime;
@@ -121,7 +120,7 @@
this.produceTime = produceTime;
}
//使用期限(天)
- private String useEndDay;
+ private String useEndDay;
public String getUseEndDay() {
return useEndDay;
@@ -131,7 +130,7 @@
this.useEndDay = useEndDay;
}
//生命周期 1：已使用 2：库存中 3：报废
- private Integer lifeCycle;
+ private Integer lifeCycle;
public Integer getLifeCycle() {
return lifeCycle;
@@ -141,8 +140,8 @@
this.lifeCycle = lifeCycle;
}
//投用日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Timestamp useDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp useDate;
public Timestamp getUseDate() {
return useDate;
@@ -152,7 +151,7 @@
this.useDate = useDate;
}
//维修状态 1:维修中 2：已修好
- private Integer repairStatus;
+ private Integer repairStatus;
public Integer getRepairStatus() {
return repairStatus;
@@ -162,7 +161,7 @@
this.repairStatus = repairStatus;
}
//停用状态 1:停用 2.在用 3.维修 4.报废
- private Integer stopStatus;
+ private Integer stopStatus;
public Integer getStopStatus() {
return stopStatus;
@@ -172,8 +171,8 @@
this.stopStatus = 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 previousCheckDate;
public Timestamp getPreviousCheckDate() {
return previousCheckDate;
@@ -183,8 +182,8 @@
this.previousCheckDate = 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 previousTestDate;
public Timestamp getPreviousTestDate() {
return previousTestDate;
@@ -194,8 +193,8 @@
this.previousTestDate = 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 previousTakecareDate;
public Timestamp getPreviousTakecareDate() {
return previousTakecareDate;
@@ -205,8 +204,8 @@
this.previousTakecareDate = 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 nextCheckDate;
public Timestamp getNextCheckDate() {
return nextCheckDate;
@@ -216,8 +215,8 @@
this.nextCheckDate = 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 nextTestDate;
public Timestamp getNextTestDate() {
return nextTestDate;
@@ -227,8 +226,8 @@
this.nextTestDate = nextTestDate;
}
//下次保养日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Timestamp nextTakecareDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp nextTakecareDate;
public Timestamp getNextTakecareDate() {
return nextTakecareDate;
@@ -238,7 +237,7 @@
this.nextTakecareDate = nextTakecareDate;
}
//负责人ID外键
- private Long leadingPersonId;
+ private Long leadingPersonId;
public Long getLeadingPersonId() {
return leadingPersonId;
@@ -248,7 +247,7 @@
this.leadingPersonId = leadingPersonId;
}
//负责人名称
- private String leadingPersonName;
+ private String leadingPersonName;
public String getLeadingPersonName() {
return leadingPersonName;
@@ -258,7 +257,7 @@
this.leadingPersonName = leadingPersonName;
}
//负责人部门外键
- private Long leadingPersonDepartmentId;
+ private Long leadingPersonDepartmentId;
public Long getLeadingPersonDepartmentId() {
return leadingPersonDepartmentId;
@@ -268,7 +267,7 @@
this.leadingPersonDepartmentId = leadingPersonDepartmentId;
}
//供应商
- private String supplyName;
+ private String supplyName;
public String getSupplyName() {
return supplyName;
@@ -278,7 +277,7 @@
this.supplyName = supplyName;
}
//使用说明
- private String useMemo;
+ private String useMemo;
public String getUseMemo() {
return useMemo;
@@ -288,7 +287,7 @@
this.useMemo = useMemo;
}
//是否检查 1：是 2：否
- private Integer isNeedCheck;
+ private Integer isNeedCheck;
public Integer getIsNeedCheck() {
return isNeedCheck;
@@ -298,7 +297,7 @@
this.isNeedCheck = isNeedCheck;
}
//检查周期
- private String checkCycle;
+ private String checkCycle;
public String getCheckCycle() {
return checkCycle;
@@ -308,7 +307,7 @@
this.checkCycle = checkCycle;
}
//检查提前提醒
- private String checkWarn;
+ private String checkWarn;
public String getCheckWarn() {
return checkWarn;
@@ -318,7 +317,7 @@
this.checkWarn = checkWarn;
}
//是否检测 1：是 2：否
- private Integer isNeedTest;
+ private Integer isNeedTest;
public Integer getIsNeedTest() {
return isNeedTest;
@@ -328,7 +327,7 @@
this.isNeedTest = isNeedTest;
}
//检测周期
- private String testCycle;
+ private String testCycle;
public String getTestCycle() {
return testCycle;
@@ -338,7 +337,7 @@
this.testCycle = testCycle;
}
//检测提前提醒
- private String testWarn;
+ private String testWarn;
public String getTestWarn() {
return testWarn;
@@ -348,7 +347,7 @@
this.testWarn = testWarn;
}
//是否保养 1：是 2：否
- private Integer isNeedTakecare;
+ private Integer isNeedTakecare;
public Integer getIsNeedTakecare() {
return isNeedTakecare;
@@ -358,7 +357,7 @@
this.isNeedTakecare = isNeedTakecare;
}
//检查内容
- private String checkContent;
+ private String checkContent;
public String getCheckContent() {
return checkContent;
@@ -368,7 +367,7 @@
this.checkContent = checkContent;
}
//负责部门/外键
- private Long leadingDepartmentId;
+ private Long leadingDepartmentId;
public Long getLeadingDepartmentId() {
return leadingDepartmentId;
@@ -378,7 +377,7 @@
this.leadingDepartmentId = leadingDepartmentId;
}
//检查指标
- private String checkPoint;
+ private String checkPoint;
public String getCheckPoint() {
return checkPoint;
@@ -388,7 +387,7 @@
this.checkPoint = checkPoint;
}
//预警值
- private String alertNum;
+ private String alertNum;
public String getAlertNum() {
return alertNum;
@@ -398,7 +397,7 @@
this.alertNum = alertNum;
}
//联锁值
- private String lockNum;
+ private String lockNum;
public String getLockNum() {
return lockNum;
@@ -408,7 +407,7 @@
this.lockNum = lockNum;
}
//停用理由
- private String stopReason;
+ private String stopReason;
public String getStopReason() {
return stopReason;
@@ -418,7 +417,7 @@
this.stopReason = stopReason;
}
//停用后措施
- private String afterStopStep;
+ private String afterStopStep;
public String getAfterStopStep() {
return afterStopStep;
@@ -428,8 +427,8 @@
this.afterStopStep = afterStopStep;
}
//实际停用日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Timestamp actualStopDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp actualStopDate;
public Timestamp getActualStopDate() {
return actualStopDate;
@@ -439,7 +438,7 @@
this.actualStopDate = actualStopDate;
}
//停用提交人/外键
- private Long stopSubmitPersonId;
+ private Long stopSubmitPersonId;
public Long getStopSubmitPersonId() {
return stopSubmitPersonId;
@@ -449,7 +448,7 @@
this.stopSubmitPersonId = stopSubmitPersonId;
}
//停用提交人名称
- private String stopSubmitPersonName;
+ private String stopSubmitPersonName;
public String getStopSubmitPersonName() {
return stopSubmitPersonName;
@@ -459,8 +458,8 @@
this.stopSubmitPersonName = stopSubmitPersonName;
}
//停用提交日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Timestamp stopSubmitDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp stopSubmitDate;
public Timestamp getStopSubmitDate() {
return stopSubmitDate;
@@ -470,7 +469,7 @@
this.stopSubmitDate = stopSubmitDate;
}
//恢复理由
- private String recoveryReason;
+ private String recoveryReason;
public String getRecoveryReason() {
return recoveryReason;
@@ -480,8 +479,8 @@
this.recoveryReason = 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 recoverySubmitDate;
public Timestamp getRecoverySubmitDate() {
return recoverySubmitDate;
@@ -491,8 +490,8 @@
this.recoverySubmitDate = recoverySubmitDate;
}
//实际恢复日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Timestamp actualRecoveryDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp actualRecoveryDate;
public Timestamp getActualRecoveryDate() {
return actualRecoveryDate;
@@ -502,7 +501,7 @@
this.actualRecoveryDate = actualRecoveryDate;
}
//报废理由
- private String destoryReason;
+ private String destoryReason;
public String getDestoryReason() {
return destoryReason;
@@ -512,8 +511,8 @@
this.destoryReason = 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 destorySubmitDate;
public Timestamp getDestorySubmitDate() {
return destorySubmitDate;
@@ -523,8 +522,8 @@
this.destorySubmitDate = 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 actualDestoryDate;
public Timestamp getActualDestoryDate() {
return actualDestoryDate;
@@ -533,13 +532,9 @@
public void setActualDestoryDate(Timestamp actualDestoryDate) {
this.actualDestoryDate = actualDestoryDate;
}
-
- //区域ID/外键
- private Long areaId;
-
- //区域名称
- private String areaName;
-
+ //区域ID
+ private Long areaId;
+
public Long getAreaId() {
return areaId;
}
@@ -547,7 +542,9 @@
public void setAreaId(Long areaId) {
this.areaId = areaId;
}
-
+ //区域名称
+ private String areaName;
+
public String getAreaName() {
return areaName;
}
@@ -555,10 +552,9 @@
public void setAreaName(String areaName) {
this.areaName = areaName;
}
-
- //保养周期
- private String takecareCycle;
-
+ //保养周期
+ private String takecareCycle;
+
public String getTakecareCycle() {
return takecareCycle;
}
@@ -566,4 +562,15 @@
public void setTakecareCycle(String takecareCycle) {
this.takecareCycle = takecareCycle;
}
+ //是否删除 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