From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 10:10:14 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java | 68 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 3 deletions(-)
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..ad08837 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
@@ -12,6 +12,8 @@
private Long id;
//类型/类别外键
private Long equipmentTypeId;
+ //类型名称
+ private String equipmentTypeName;
//名称
private String name;
//单位部门外键
@@ -22,18 +24,51 @@
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;
//检查周期
private String checkCycle;
//应急预案/外键
private Long emergencePlanId;
+ //应急预案名称
+ private String emergencePlanName;
//主要危险有害因素
private String dangerousElement;
//易导致风险
@@ -325,4 +360,31 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+
+ public String getEquipmentTypeName() {
+ return equipmentTypeName;
+ }
+
+ public void setEquipmentTypeName(String equipmentTypeName) {
+ this.equipmentTypeName = equipmentTypeName;
+ }
+
+ public String getEmergencePlanName() {
+ return emergencePlanName;
+ }
+
+ public void setEmergencePlanName(String emergencePlanName) {
+ this.emergencePlanName = emergencePlanName;
+ }
+ //备注
+ private String memo;
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.2