From f3a1ffc586b88a4b8ae43e664f2cefadd3ba7d24 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 04 八月 2022 15:04:19 +0800
Subject: [PATCH] 应急预案废止

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
index 208090e..8692b48 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
@@ -59,7 +59,7 @@
         return new SearchResultVO<>(
                 true,
                 pageIndex,
-                pageSize,
+                pageSize,page.getPages(),
                 page.getTotal(),
                 respList,
                 ResultCodes.OK
@@ -140,7 +140,12 @@
             List<EmergencyDrillPlanUserInfoDO> emergencyDrillPlanUserInfoDOList = emergencyDrillPlanUserInfoService.selectEmergencyDrillPlanUserByDrillPlanId(id);
             if (!CollectionUtils.isEmpty(emergencyDrillPlanUserInfoDOList)) {
                 List<EmergencyDrillPlanUserRespDTO> emergencyUserUserRespDTOList = BeanCopyUtils.copyBeanList(emergencyDrillPlanUserInfoDOList, EmergencyDrillPlanUserRespDTO.class);
-                emergencyDrillPlanDetailRespDTO.setUserList(emergencyUserUserRespDTOList);
+
+                List<EmergencyDrillPlanUserRespDTO> userList = emergencyUserUserRespDTOList.stream().filter(user -> user.getType()==1).collect(Collectors.toList());
+                List<EmergencyDrillPlanUserRespDTO> chargeUserList = emergencyUserUserRespDTOList.stream().filter(user -> user.getType()==2).collect(Collectors.toList());
+
+                emergencyDrillPlanDetailRespDTO.setUserList(userList);
+                emergencyDrillPlanDetailRespDTO.setChargeUserList(chargeUserList);
             }
             // 查找对应的附件
             List<EmergencyDrillPlanFileInfoDO> emergencyDrillPlanFileInfoDOList = emergencyDrillPlanFileInfoService.selectEmergencyDrillPlanFileByDrillPlanId(id);
@@ -170,7 +175,7 @@
             if (!CollectionUtils.isEmpty(emergencyDrillPlanReqDTO.getFileList())) {
                 updateEmergencyDrillPlanFile(uid, emergencyDrillPlanInfo.getId(), nowDate, emergencyDrillPlanReqDTO.getFileList());
             }
-            // 更新急演练计划应急队伍表
+            // 更新急演练计划应急人员表
             if (!CollectionUtils.isEmpty(emergencyDrillPlanReqDTO.getUserList())) {
                 updateEmergencyDrillPlanUser(uid, emergencyDrillPlanInfo.getId(), nowDate, emergencyDrillPlanReqDTO.getUserList());
             }
@@ -262,13 +267,13 @@
     }
 
     @Override
-    public ResultVO batchDeleteEmergencyDrillPlan(String ids) {
-        if (StringUtils.isBlank(ids)) {
-            throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NOT_EXIST);
-        } else {
-            String[] idArr = ids.split(",");
-            for (String id : idArr) {
-                deleteEmergencyDrillPlan(Long.valueOf(id));
+    public ResultVO batchDeleteEmergencyDrillPlan(Long[] ids) {
+
+        if (ids == null ||  ids.length==0){
+            throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NULL);
+        }else{
+            for (Long id : ids){
+                deleteEmergencyDrillPlan(id);
             }
             return new ResultVO(ResultCodes.OK);
         }
@@ -284,7 +289,7 @@
             emergencyDrillPlanInfoService.deleteEmergencyDrillPlan(DrillPlanId);
             //删除附件
             emergencyDrillPlanFileInfoService.deleteEmergencyDrillPlanFileByDrillPlanId(DrillPlanId);
-            //删除应急队伍
+            //删除人员
             emergencyDrillPlanUserInfoService.deleteEmergencyDrillPlanUserByDrillPlanId(DrillPlanId);
         }
     }

--
Gitblit v1.9.2