From 9bc8b88ac7f037f7e27f389fdbb507c64d1299f7 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 05 七月 2022 12:06:27 +0800
Subject: [PATCH] 设置删除标识

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java              |    6 +++---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfo.java          |    6 +++---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java        |    6 +++---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java |    3 +++
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java              |    6 +++---
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
index a78a4f3..3e75870 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
@@ -12,7 +12,7 @@
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    private Byte delFlag;
+    private Boolean delFlag;
 
     private Date gmtCreate;
 
@@ -46,11 +46,11 @@
         this.id = id;
     }
 
-    public Byte getDelFlag() {
+    public Boolean getDelFlag() {
         return delFlag;
     }
 
-    public void setDelFlag(Byte delFlag) {
+    public void setDelFlag(Boolean delFlag) {
         this.delFlag = delFlag;
     }
 
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfo.java
index 30506a5..6bf37cb 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfo.java
@@ -12,7 +12,7 @@
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    private Byte delFlag;
+    private Boolean delFlag;
 
     private Date gmtCreate;
 
@@ -36,11 +36,11 @@
         this.id = id;
     }
 
-    public Byte getDelFlag() {
+    public Boolean getDelFlag() {
         return delFlag;
     }
 
-    public void setDelFlag(Byte delFlag) {
+    public void setDelFlag(Boolean delFlag) {
         this.delFlag = delFlag;
     }
 
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java
index 603e100..736ab0c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java
@@ -12,7 +12,7 @@
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    private Byte delFlag;
+    private Boolean delFlag;
 
     private Date gmtCreate;
 
@@ -44,11 +44,11 @@
         this.id = id;
     }
 
-    public Byte getDelFlag() {
+    public Boolean getDelFlag() {
         return delFlag;
     }
 
-    public void setDelFlag(Byte delFlag) {
+    public void setDelFlag(Boolean delFlag) {
         this.delFlag = delFlag;
     }
 
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java
index 8bef8a3..5cb8b2e 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java
@@ -12,7 +12,7 @@
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    private Byte delFlag;
+    private Boolean delFlag;
 
     private Date gmtCreate;
 
@@ -44,11 +44,11 @@
         this.id = id;
     }
 
-    public Byte getDelFlag() {
+    public Boolean getDelFlag() {
         return delFlag;
     }
 
-    public void setDelFlag(Byte delFlag) {
+    public void setDelFlag(Boolean delFlag) {
         this.delFlag = delFlag;
     }
 
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
index 5bc9aa3..ba4fd5b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
@@ -84,6 +84,7 @@
         //1.新增应急队伍
         EmergencyTeamFileInfo emergencyTeamFileInfo = new EmergencyTeamFileInfo();
         BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamFileInfo);
+        emergencyTeamFileInfo.setDelFlag(false);
         emergencyTeamFileInfo.setCreateUid(uid);
         emergencyTeamFileInfo.setGmtCreate(nowDate);
         emergencyTeamInfoService.addEmergencyTeam(emergencyTeamFileInfo);
@@ -92,6 +93,7 @@
         BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(),fileInfoList.getClass());
         fileInfoList.forEach(EmergencyTeamFileInfo -> {
             EmergencyTeamFileInfo.setTeamId(emergencyTeamFileInfo.getTeamId());
+            EmergencyTeamFileInfo.setDelFlag(false);
             EmergencyTeamFileInfo.setCreateUid(uid);
             EmergencyTeamFileInfo.setGmtCreate(nowDate);
         });
@@ -101,6 +103,7 @@
         BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(),memberInfoList.getClass());
         memberInfoList.forEach(EmergencyTeamMemberInfo -> {
             EmergencyTeamMemberInfo.setTeamId(emergencyTeamFileInfo.getTeamId());
+            EmergencyTeamMemberInfo.setDelFlag(false);
             EmergencyTeamMemberInfo.setCreateUid(uid);
             EmergencyTeamMemberInfo.setGmtCreate(nowDate);
         });

--
Gitblit v1.9.2