From 44163ffec2f7a1f4c428cebc2aa5577f1f45e0b5 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 15:28:41 +0800
Subject: [PATCH] 应急计划发布fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 10e38dc..3fa5b82 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());
}
@@ -284,7 +289,7 @@
emergencyDrillPlanInfoService.deleteEmergencyDrillPlan(DrillPlanId);
//删除附件
emergencyDrillPlanFileInfoService.deleteEmergencyDrillPlanFileByDrillPlanId(DrillPlanId);
- //删除应急队伍
+ //删除人员
emergencyDrillPlanUserInfoService.deleteEmergencyDrillPlanUserByDrillPlanId(DrillPlanId);
}
}
--
Gitblit v1.9.2