From 357935fb2785dc79f4f47ffa7e1c503bc8cea376 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 16 九月 2022 15:19:50 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java
index 94536de..7958b2a 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java
@@ -38,16 +38,16 @@
private String useEndDay;
//生命周期 1：已使用 2：库存中 3：报废
@ExcelCell(index = 11)
- private Integer lifeCycle;
+ private Byte lifeCycle;
//投用日期
@ExcelCell(index = 12)
private Timestamp useDate;
//维修状态 1:维修中 2：已修好
@ExcelCell(index = 13)
- private Integer repairStatus;
+ private Byte repairStatus;
//停用状态 1:停用 2.在用 3.维修 4.报废
@ExcelCell(index = 14)
- private Integer stopStatus;
+ private Byte stopStatus;
//上次检查日期
@ExcelCell(index = 15)
private Timestamp previousCheckDate;
@@ -168,7 +168,7 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
public Integer getInfoType() {
return infoType;
}
@@ -209,7 +209,7 @@
public void setModel(String model) {
this.model = model;
}
- //单位部门外键
+ //单位部门外键
public Long getDepartmentId() {
return departmentId;
}
@@ -217,7 +217,7 @@
public void setDepartmentId(Long departmentId) {
this.departmentId = departmentId;
}
- //设置部位
+ //设置部位
public String getSetPart() {
return setPart;
}
@@ -225,7 +225,7 @@
public void setSetPart(String setPart) {
this.setPart = setPart;
}
- //生产日期
+ //生产日期
public Timestamp getProduceTime() {
return produceTime;
}
@@ -233,7 +233,7 @@
public void setProduceTime(Timestamp produceTime) {
this.produceTime = produceTime;
}
- //使用期限(天)
+ //使用期限(天)
public String getUseEndDay() {
return useEndDay;
}
@@ -241,15 +241,15 @@
public void setUseEndDay(String useEndDay) {
this.useEndDay = useEndDay;
}
- //生命周期 1：已使用 2：库存中 3：报废
- public Integer getLifeCycle() {
+ //生命周期 1：已使用 2：库存中 3：报废
+ public Byte getLifeCycle() {
return lifeCycle;
}
- public void setLifeCycle(Integer lifeCycle) {
+ public void setLifeCycle(Byte lifeCycle) {
this.lifeCycle = lifeCycle;
}
- //投用日期
+ //投用日期
public Timestamp getUseDate() {
return useDate;
}
@@ -257,23 +257,23 @@
public void setUseDate(Timestamp useDate) {
this.useDate = useDate;
}
- //维修状态 1:维修中 2：已修好
- public Integer getRepairStatus() {
+ //维修状态 1:维修中 2：已修好
+ public Byte getRepairStatus() {
return repairStatus;
}
- public void setRepairStatus(Integer repairStatus) {
+ public void setRepairStatus(Byte repairStatus) {
this.repairStatus = repairStatus;
}
- //停用状态 1:停用 2.在用 3.维修 4.报废
- public Integer getStopStatus() {
+ //停用状态 1:停用 2.在用 3.维修 4.报废
+ public Byte getStopStatus() {
return stopStatus;
}
- public void setStopStatus(Integer stopStatus) {
+ public void setStopStatus(Byte stopStatus) {
this.stopStatus = stopStatus;
}
- //上次检查日期
+ //上次检查日期
public Timestamp getPreviousCheckDate() {
return previousCheckDate;
}
@@ -281,7 +281,7 @@
public void setPreviousCheckDate(Timestamp previousCheckDate) {
this.previousCheckDate = previousCheckDate;
}
- //上次检测日期
+ //上次检测日期
public Timestamp getPreviousTestDate() {
return previousTestDate;
}
@@ -289,7 +289,7 @@
public void setPreviousTestDate(Timestamp previousTestDate) {
this.previousTestDate = previousTestDate;
}
- //上次保养日期
+ //上次保养日期
public Timestamp getPreviousTakecareDate() {
return previousTakecareDate;
}
@@ -297,7 +297,7 @@
public void setPreviousTakecareDate(Timestamp previousTakecareDate) {
this.previousTakecareDate = previousTakecareDate;
}
- //下次检查日期
+ //下次检查日期
public Timestamp getNextCheckDate() {
return nextCheckDate;
}
@@ -305,7 +305,7 @@
public void setNextCheckDate(Timestamp nextCheckDate) {
this.nextCheckDate = nextCheckDate;
}
- //下次检测日期
+ //下次检测日期
public Timestamp getNextTestDate() {
return nextTestDate;
}
@@ -313,7 +313,7 @@
public void setNextTestDate(Timestamp nextTestDate) {
this.nextTestDate = nextTestDate;
}
- //下次保养日期
+ //下次保养日期
public Timestamp getNextTakecareDate() {
return nextTakecareDate;
}
@@ -321,7 +321,7 @@
public void setNextTakecareDate(Timestamp nextTakecareDate) {
this.nextTakecareDate = nextTakecareDate;
}
- //负责人ID外键
+ //负责人ID外键
public Long getLeadingPersonId() {
return leadingPersonId;
}
@@ -329,7 +329,7 @@
public void setLeadingPersonId(Long leadingPersonId) {
this.leadingPersonId = leadingPersonId;
}
- //负责人部门外键
+ //负责人部门外键
public Long getLeadingPersonDepartmentId() {
return leadingPersonDepartmentId;
}
@@ -337,7 +337,7 @@
public void setLeadingPersonDepartmentId(Long leadingPersonDepartmentId) {
this.leadingPersonDepartmentId = leadingPersonDepartmentId;
}
- //供应商
+ //供应商
public String getSupplyName() {
return supplyName;
}
@@ -345,7 +345,7 @@
public void setSupplyName(String supplyName) {
this.supplyName = supplyName;
}
- //使用说明
+ //使用说明
public String getUseMemo() {
return useMemo;
}
@@ -353,7 +353,7 @@
public void setUseMemo(String useMemo) {
this.useMemo = useMemo;
}
- //是否检查 1：是 2：否
+ //是否检查 1：是 2：否
public Integer getIsNeedCheck() {
return isNeedCheck;
}
@@ -361,7 +361,7 @@
public void setIsNeedCheck(Integer isNeedCheck) {
this.isNeedCheck = isNeedCheck;
}
- //检查周期
+ //检查周期
public String getCheckCycle() {
return checkCycle;
}
@@ -369,7 +369,7 @@
public void setCheckCycle(String checkCycle) {
this.checkCycle = checkCycle;
}
- //检查提前提醒
+ //检查提前提醒
public String getCheckWarn() {
return checkWarn;
}
@@ -377,7 +377,7 @@
public void setCheckWarn(String checkWarn) {
this.checkWarn = checkWarn;
}
- //是否检测 1：是 2：否
+ //是否检测 1：是 2：否
public Integer getIsNeedTest() {
return isNeedTest;
}
@@ -385,7 +385,7 @@
public void setIsNeedTest(Integer isNeedTest) {
this.isNeedTest = isNeedTest;
}
- //检测周期
+ //检测周期
public String getTestCycle() {
return testCycle;
}
@@ -393,7 +393,7 @@
public void setTestCycle(String testCycle) {
this.testCycle = testCycle;
}
- //检测提前提醒
+ //检测提前提醒
public String getTestWarn() {
return testWarn;
}
@@ -401,7 +401,7 @@
public void setTestWarn(String testWarn) {
this.testWarn = testWarn;
}
- //是否保养 1：是 2：否
+ //是否保养 1：是 2：否
public Integer getIsNeedTakecare() {
return isNeedTakecare;
}
@@ -409,7 +409,7 @@
public void setIsNeedTakecare(Integer isNeedTakecare) {
this.isNeedTakecare = isNeedTakecare;
}
- //检查内容
+ //检查内容
public String getCheckContent() {
return checkContent;
}
@@ -417,7 +417,7 @@
public void setCheckContent(String checkContent) {
this.checkContent = checkContent;
}
- //负责部门/外键
+ //负责部门/外键
public Long getLeadingDepartmentId() {
return leadingDepartmentId;
}
@@ -425,7 +425,7 @@
public void setLeadingDepartmentId(Long leadingDepartmentId) {
this.leadingDepartmentId = leadingDepartmentId;
}
- //检查指标
+ //检查指标
public String getCheckPoint() {
return checkPoint;
}
@@ -433,7 +433,7 @@
public void setCheckPoint(String checkPoint) {
this.checkPoint = checkPoint;
}
- //预警值
+ //预警值
public String getAlertNum() {
return alertNum;
}
@@ -441,7 +441,7 @@
public void setAlertNum(String alertNum) {
this.alertNum = alertNum;
}
- //联锁值
+ //联锁值
public String getLockNum() {
return lockNum;
}
@@ -449,7 +449,7 @@
public void setLockNum(String lockNum) {
this.lockNum = lockNum;
}
- //停用理由
+ //停用理由
public String getStopReason() {
return stopReason;
}
@@ -457,7 +457,7 @@
public void setStopReason(String stopReason) {
this.stopReason = stopReason;
}
- //停用后措施
+ //停用后措施
public String getAfterStopStep() {
return afterStopStep;
}
@@ -465,7 +465,7 @@
public void setAfterStopStep(String afterStopStep) {
this.afterStopStep = afterStopStep;
}
- //实际停用日期
+ //实际停用日期
public Timestamp getActualStopDate() {
return actualStopDate;
}
@@ -473,7 +473,7 @@
public void setActualStopDate(Timestamp actualStopDate) {
this.actualStopDate = actualStopDate;
}
- //停用提交人/外键
+ //停用提交人/外键
public Long getStopSubmitPersonId() {
return stopSubmitPersonId;
}
@@ -481,7 +481,7 @@
public void setStopSubmitPersonId(Long stopSubmitPersonId) {
this.stopSubmitPersonId = stopSubmitPersonId;
}
- //停用提交日期
+ //停用提交日期
public Timestamp getStopSubmitDate() {
return stopSubmitDate;
}
@@ -489,7 +489,7 @@
public void setStopSubmitDate(Timestamp stopSubmitDate) {
this.stopSubmitDate = stopSubmitDate;
}
- //恢复理由
+ //恢复理由
public String getRecoveryReason() {
return recoveryReason;
}
@@ -497,7 +497,7 @@
public void setRecoveryReason(String recoveryReason) {
this.recoveryReason = recoveryReason;
}
- //恢复填报日期
+ //恢复填报日期
public Timestamp getRecoverySubmitDate() {
return recoverySubmitDate;
}
@@ -505,7 +505,7 @@
public void setRecoverySubmitDate(Timestamp recoverySubmitDate) {
this.recoverySubmitDate = recoverySubmitDate;
}
- //实际恢复日期
+ //实际恢复日期
public Timestamp getActualRecoveryDate() {
return actualRecoveryDate;
}
@@ -513,7 +513,7 @@
public void setActualRecoveryDate(Timestamp actualRecoveryDate) {
this.actualRecoveryDate = actualRecoveryDate;
}
- //报废理由
+ //报废理由
public String getDestoryReason() {
return destoryReason;
}
@@ -521,7 +521,7 @@
public void setDestoryReason(String destoryReason) {
this.destoryReason = destoryReason;
}
- //报废填报日期
+ //报废填报日期
public Timestamp getDestorySubmitDate() {
return destorySubmitDate;
}
@@ -529,7 +529,7 @@
public void setDestorySubmitDate(Timestamp destorySubmitDate) {
this.destorySubmitDate = destorySubmitDate;
}
- //实际报废日期
+ //实际报废日期
public Timestamp getActualDestoryDate() {
return actualDestoryDate;
}
@@ -537,5 +537,5 @@
public void setActualDestoryDate(Timestamp actualDestoryDate) {
this.actualDestoryDate = actualDestoryDate;
}
-
-}
\ No newline at end of file
+
+}
--
Gitblit v1.9.2