From b37f83b4585a728b469447068f3f69f6ef0006c2 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 09 八月 2022 11:03:37 +0800
Subject: [PATCH] fix
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java | 98 +++++++++++++++++++++-----------
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java | 37 +++++++++++-
2 files changed, 98 insertions(+), 37 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
index 4b1c0bc..f5f875d 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
@@ -8,13 +8,13 @@
* 重点监管装置/设备 详细信息(KeypointEquipmentInfo)表实体类
*
* @author xurui
- * @since 2022-07-19 13:36:27
+ * @since 2022-08-09 09:39:39
*/
@SuppressWarnings("serial")
@TableName("keypoint_equipment_info")
public class KeypointEquipmentInfo extends BaseDomain {
-
-
+
+
@TableId(type = IdType.AUTO)
private Long id;
public Long getId() {
@@ -25,9 +25,9 @@
this.id = id;
}
- //类型/类别外键
+ //类型/类别外键
private Long equipmentTypeId;
-
+
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
@@ -35,9 +35,9 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //名称
+ //名称
private String name;
-
+
public String getName() {
return name;
}
@@ -45,9 +45,9 @@
public void setName(String name) {
this.name = name;
}
- //单位部门外键
+ //单位部门外键
private Long departmentId;
-
+
public Long getDepartmentId() {
return departmentId;
}
@@ -55,9 +55,9 @@
public void setDepartmentId(Long departmentId) {
this.departmentId = departmentId;
}
- //具体位置
+ //具体位置
private String position;
-
+
public String getPosition() {
return position;
}
@@ -65,9 +65,9 @@
public void setPosition(String position) {
this.position = position;
}
- //负责人姓名
+ //负责人姓名
private String leadingPersonName;
-
+
public String getLeadingPersonName() {
return leadingPersonName;
}
@@ -75,9 +75,9 @@
public void setLeadingPersonName(String leadingPersonName) {
this.leadingPersonName = leadingPersonName;
}
- //联系人/外键
+ //联系人/外键
private Long connectPersonId;
-
+
public Long getConnectPersonId() {
return connectPersonId;
}
@@ -85,9 +85,19 @@
public void setConnectPersonId(Long connectPersonId) {
this.connectPersonId = connectPersonId;
}
- //录入人/外键
+ //联系人名称
+ private String connectPersonName;
+
+ public String getConnectPersonName() {
+ return connectPersonName;
+ }
+
+ public void setConnectPersonName(String connectPersonName) {
+ this.connectPersonName = connectPersonName;
+ }
+ //录入人/外键
private Long inputPersonId;
-
+
public Long getInputPersonId() {
return inputPersonId;
}
@@ -95,9 +105,19 @@
public void setInputPersonId(Long inputPersonId) {
this.inputPersonId = inputPersonId;
}
- //责任人/外键
+ //录入人名称
+ private String inputPersonName;
+
+ public String getInputPersonName() {
+ return inputPersonName;
+ }
+
+ public void setInputPersonName(String inputPersonName) {
+ this.inputPersonName = inputPersonName;
+ }
+ //责任人/外键
private Long responsibilityPersonId;
-
+
public Long getResponsibilityPersonId() {
return responsibilityPersonId;
}
@@ -105,9 +125,19 @@
public void setResponsibilityPersonId(Long responsibilityPersonId) {
this.responsibilityPersonId = responsibilityPersonId;
}
- //装置部位分类 1：关键装置 2：重点部位
+ //责任人名称
+ private String responsibilityPersonName;
+
+ public String getResponsibilityPersonName() {
+ return responsibilityPersonName;
+ }
+
+ public void setResponsibilityPersonName(String responsibilityPersonName) {
+ this.responsibilityPersonName = responsibilityPersonName;
+ }
+ //装置部位分类 1：关键装置 2：重点部位
private Integer partType;
-
+
public Integer getPartType() {
return partType;
}
@@ -115,9 +145,9 @@
public void setPartType(Integer partType) {
this.partType = partType;
}
- //检查周期
+ //检查周期
private String checkCycle;
-
+
public String getCheckCycle() {
return checkCycle;
}
@@ -125,9 +155,9 @@
public void setCheckCycle(String checkCycle) {
this.checkCycle = checkCycle;
}
- //应急预案/外键
+ //应急预案/外键
private Long emergencePlanId;
-
+
public Long getEmergencePlanId() {
return emergencePlanId;
}
@@ -135,9 +165,9 @@
public void setEmergencePlanId(Long emergencePlanId) {
this.emergencePlanId = emergencePlanId;
}
- //主要危险有害因素
+ //主要危险有害因素
private String dangerousElement;
-
+
public String getDangerousElement() {
return dangerousElement;
}
@@ -145,9 +175,9 @@
public void setDangerousElement(String dangerousElement) {
this.dangerousElement = dangerousElement;
}
- //易导致风险
+ //易导致风险
private String toDangerous;
-
+
public String getToDangerous() {
return toDangerous;
}
@@ -155,9 +185,9 @@
public void setToDangerous(String toDangerous) {
this.toDangerous = toDangerous;
}
- //应急处置措施
+ //应急处置措施
private String treatment;
-
+
public String getTreatment() {
return treatment;
}
@@ -165,9 +195,9 @@
public void setTreatment(String treatment) {
this.treatment = treatment;
}
- //现场图片
+ //现场图片
private String scenePic;
-
+
public String getScenePic() {
return scenePic;
}
@@ -175,5 +205,5 @@
public void setScenePic(String scenePic) {
this.scenePic = scenePic;
}
-
+
}
\ No newline at end of file
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java
index 56dd407..1520b20 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java
@@ -22,12 +22,43 @@
private String position;
//负责人姓名
private String leadingPersonName;
- //联系人/外键
+ //联系人/外键
private Long connectPersonId;
- //录入人/外键
+ //联系人名称
+ private String connectPersonName;
+
+ public String getConnectPersonName() {
+ return connectPersonName;
+ }
+
+ public void setConnectPersonName(String connectPersonName) {
+ this.connectPersonName = connectPersonName;
+ }
+ //录入人/外键
private Long inputPersonId;
- //责任人/外键
+ //录入人名称
+ private String inputPersonName;
+
+ public String getInputPersonName() {
+ return inputPersonName;
+ }
+
+ public void setInputPersonName(String inputPersonName) {
+ this.inputPersonName = inputPersonName;
+ }
+ //责任人/外键
private Long responsibilityPersonId;
+
+ //责任人名称
+ private String responsibilityPersonName;
+
+ public String getResponsibilityPersonName() {
+ return responsibilityPersonName;
+ }
+
+ public void setResponsibilityPersonName(String responsibilityPersonName) {
+ this.responsibilityPersonName = responsibilityPersonName;
+ }
//装置部位分类 1：关键装置 2：重点部位
private Integer partType;
//检查周期
--
Gitblit v1.9.2