From a2c3c7a3032ac93bbcfd83f055b036f7e8b6c20b Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 27 七月 2022 18:13:00 +0800
Subject: [PATCH] fix

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java |   43 ++++++++++++++++++++++++-------------------
 1 files changed, 24 insertions(+), 19 deletions(-)

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 f9b1395..b973cbf 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
@@ -159,6 +159,7 @@
 
     @Override
     public ResultVO updateEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
+        Date nowDate = new Date();
         //查询是否存在
         EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(emergencyTeamReqDTO.getId());
         if (emergencyTeamInfoDetailDO==null){
@@ -167,16 +168,15 @@
             EmergencyTeamInfo emergencyTeamInfo = new EmergencyTeamInfo();
             BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamInfo);
             emergencyTeamInfo.setUpdateUid(uid);
-            emergencyTeamInfo.setGmtModitify(new Date());
+            emergencyTeamInfo.setGmtModitify(nowDate);
             emergencyTeamInfoService.updateEmergencyTeam(emergencyTeamInfo);
             //修改应急队伍附件
-            updateEmergencyTeamFile(uid,emergencyTeamReqDTO.getId(),emergencyTeamReqDTO.getFileList());
+            updateEmergencyTeamFile(uid,emergencyTeamReqDTO.getId(),nowDate,emergencyTeamReqDTO.getFileList());
             return new ResultVO(ResultCodes.OK);
         }
     }
 
-    private void updateEmergencyTeamFile(Long uid ,Long teamId ,List<EmergencyTeamFileReqDTO> emergencyTeamFileReqDTOList){
-        Date nowDate = new Date();
+    private void updateEmergencyTeamFile(Long uid ,Long teamId ,Date nowDate,List<EmergencyTeamFileReqDTO> emergencyTeamFileReqDTOList){
 
         List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList = emergencyTeamFileInfoService.selectByEmergencyTeamId(teamId);
         List<Long> oldIdsList = emergencyTeamFileInfoDOList.stream().map(EmergencyTeamFileInfoDO::getId).collect(Collectors.toList());
@@ -245,7 +245,26 @@
     }
 
     @Override
-    public ResultVO deleteEmergencyTeam(Long id) {
+    public ResultVO batchDeleteEmergencyTeam(String ids) {
+        if (StringUtils.isBlank(ids)){
+            throw new EmergencyException(EmergencyResultCodes.TEAM_NULL);
+        }else{
+            String[] idArr = ids.split(",");
+            for (String id : idArr) {
+                deleteEmergencyTeam(Long.valueOf(id));
+            }
+            return new ResultVO(ResultCodes.OK);
+        }
+    }
+
+    @Override
+    public ResultVO getEmergencyTeamMemberByTeamId(Long teamId) {
+        List<EmergencyTeamMemberInfoDO> emergencyTeamMemberInfoDOList = emergencyTeamMemberInfoService.selectByEmergencyTeamId(teamId);
+        List<EmergencyTeamMemberRespDTO> emergencyTeamMemberRespDTOList = BeanCopyUtils.copyBeanList(emergencyTeamMemberInfoDOList , EmergencyTeamMemberRespDTO.class);
+        return new ResultVO<>(ResultCodes.OK,emergencyTeamMemberRespDTOList);
+    }
+
+    private void deleteEmergencyTeam(Long id) {
         //查询是否存在
         EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(id);
         if (emergencyTeamInfoDetailDO==null){
@@ -258,20 +277,6 @@
             emergencyTeamFileInfoService.deleteEmergencyTeamFileByTeamId(teamId);
             //删除应急队伍
             emergencyTeamInfoService.deleteEmergencyTeamById(teamId);
-            return new ResultVO(ResultCodes.OK);
-        }
-    }
-
-    @Override
-    public ResultVO batchDeleteEmergencyTeam(String ids) {
-        if (StringUtils.isBlank(ids)){
-            throw new EmergencyException(EmergencyResultCodes.TEAM_NULL);
-        }else{
-            String[] idArr = ids.split(",");
-            for (String id : idArr) {
-                deleteEmergencyTeam(Long.valueOf(id));
-            }
-            return new ResultVO(ResultCodes.OK);
         }
     }
 

--
Gitblit v1.9.2