From 07e4b1114feadc19478847a9bcda869b5d6a5bf7 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 02 Sep 2022 14:23:10 +0800
Subject: [PATCH] 项目目录结构调整
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
index 00e6d23..401642c 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
@@ -12,6 +12,8 @@
private Long id;
//类型/类别外键
private Long equipmentTypeId;
+ //类型/类别名称
+ private String equipmentTypeName;
//具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
private Integer infoType;
//名称
@@ -98,7 +100,9 @@
private Timestamp actualStopDate;
//停用提交人/外键
private Long stopSubmitPersonId;
- //停用提交日期
+ //停用提交人名称
+ private String stopSubmitPersonName;
+ //停用提交日期
private Timestamp stopSubmitDate;
//恢复理由
private String recoveryReason;
@@ -136,7 +140,39 @@
private List<EquipmentCheckStandardDetail> checkStandardeDetailList = new ArrayList<>();
+ //区域ID/外键
+ private Long areaId;
+ //区域名称
+ private String areaName;
+
+
+ //保养周期
+ private String takecareCycle;
+
+ public String getTakecareCycle() {
+ return takecareCycle;
+ }
+
+ public void setTakecareCycle(String takecareCycle) {
+ this.takecareCycle = takecareCycle;
+ }
+
+ 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;
+ }
public List<EquipmentRepairDetail> getRepaireDetailList() {
return repaireDetailList;
@@ -178,6 +214,14 @@
this.leadingPersonName = leadingPersonName;
}
+
+ public String getStopSubmitPersonName() {
+ return stopSubmitPersonName;
+ }
+
+ public void setStopSubmitPersonName(String stopSubmitPersonName) {
+ this.stopSubmitPersonName = stopSubmitPersonName;
+ }
//ID
public Long getId() {
return id;
@@ -619,4 +663,12 @@
public void setLeadingDepartmentName(String leadingDepartmentName) {
this.leadingDepartmentName = leadingDepartmentName;
}
+
+ public String getEquipmentTypeName() {
+ return equipmentTypeName;
+ }
+
+ public void setEquipmentTypeName(String equipmentTypeName) {
+ this.equipmentTypeName = equipmentTypeName;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2