From 4bb08dd0399b3d7d034e72a3748e6676e2fc0398 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: Fri, 19 Aug 2022 10:44:28 +0800
Subject: [PATCH] 修改配置文件
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 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 a0e2a3d..edc1e7f 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;
//名称
@@ -54,6 +56,8 @@
private Timestamp nextTakecareDate;
//负责人ID外键
private Long leadingPersonId;
+ //负责人姓名
+ private String leadingPersonName;
//负责人部门外键
private Long leadingPersonDepartmentId;
//负责人部门名称
@@ -96,7 +100,9 @@
private Timestamp actualStopDate;
//停用提交人/外键
private Long stopSubmitPersonId;
- //停用提交日期
+ //停用提交人名称
+ private String stopSubmitPersonName;
+ //停用提交日期
private Timestamp stopSubmitDate;
//恢复理由
private String recoveryReason;
@@ -134,7 +140,27 @@
private List<EquipmentCheckStandardDetail> checkStandardeDetailList = new ArrayList<>();
+ //区域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;
+ }
public List<EquipmentRepairDetail> getRepaireDetailList() {
return repaireDetailList;
@@ -168,6 +194,22 @@
this.takecareDetailList = takecareDetailList;
}
+ public String getLeadingPersonName() {
+ return leadingPersonName;
+ }
+
+ public void setLeadingPersonName(String leadingPersonName) {
+ this.leadingPersonName = leadingPersonName;
+ }
+
+
+ public String getStopSubmitPersonName() {
+ return stopSubmitPersonName;
+ }
+
+ public void setStopSubmitPersonName(String stopSubmitPersonName) {
+ this.stopSubmitPersonName = stopSubmitPersonName;
+ }
//ID
public Long getId() {
return id;
@@ -609,4 +651,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