From ff3e5ae946d32cf80740ed9e3977c8487b0e8948 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 08 八月 2022 15:09:00 +0800
Subject: [PATCH] fix
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java | 10 ++++++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java | 1 +
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
index 01766ef..9148846 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
@@ -102,6 +102,7 @@
emergencyPlanInfo.setDelFlag(false);
emergencyPlanInfo.setCreateUid(uid);
emergencyPlanInfo.setGmtCreate(nowDate);
+ emergencyPlanInfo.setAbolishStatus(false);
emergencyPlanInfoService.addEmergencyPlan(emergencyPlanInfo);
// 新增应急预案区域表
if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getAreaList())) {
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..00e6d23 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
@@ -54,6 +54,8 @@
private Timestamp nextTakecareDate;
//负责人ID外键
private Long leadingPersonId;
+ //负责人姓名
+ private String leadingPersonName;
//负责人部门外键
private Long leadingPersonDepartmentId;
//负责人部门名称
@@ -168,6 +170,14 @@
this.takecareDetailList = takecareDetailList;
}
+ public String getLeadingPersonName() {
+ return leadingPersonName;
+ }
+
+ public void setLeadingPersonName(String leadingPersonName) {
+ this.leadingPersonName = leadingPersonName;
+ }
+
//ID
public Long getId() {
return id;
--
Gitblit v1.9.2