From d018082465bdb6bdbb956cfd4d80d67ba39232f6 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 17:21:24 +0800
Subject: [PATCH] 应急评价fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java
index 15b43bc..69ead7e 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java
@@ -152,8 +152,12 @@
// 演练计划的人员
List<EmergencyDrillPlanUserInfoDO> planUserInfoDOList = emergencyDrillPlanUserInfoService.selectEmergencyDrillPlanUserByDrillPlanId(emergencyDrillEvaluationDetailRespDTO.getDrillPlanId());
if (!CollectionUtils.isEmpty(planUserInfoDOList)) {
- List<EmergencyDrillPlanUserRespDTO> emergencyUserUserRespDTOList = BeanCopyUtils.copyBeanList(planUserInfoDOList, EmergencyDrillPlanUserRespDTO.class);
- emergencyDrillEvaluationDetailRespDTO.setPlanUserList(emergencyUserUserRespDTOList);
+ List<EmergencyDrillPlanUserRespDTO> emergencyDrillPlanUserRespDTOList = BeanCopyUtils.copyBeanList(planUserInfoDOList, EmergencyDrillPlanUserRespDTO.class);
+
+ List<EmergencyDrillPlanUserRespDTO> planUserList = emergencyDrillPlanUserRespDTOList.stream().filter(user -> user.getType()==1 ).collect(Collectors.toList());
+ List<EmergencyDrillPlanUserRespDTO> planChargeUserList = emergencyDrillPlanUserRespDTOList.stream().filter(user -> user.getType()==2 ).collect(Collectors.toList());
+ emergencyDrillEvaluationDetailRespDTO.setPlanUserList(planUserList);
+ emergencyDrillEvaluationDetailRespDTO.setPlanChargeUserList(planChargeUserList);
}
// 演练实施的人员
List<EmergencyDrillExecuteUserInfoDO> executeUserList = emergencyDrillExecuteUserInfoService.selectEmergencyDrillExecuteUserByDrillExecuteId(emergencyDrillEvaluationDetailRespDTO.getDrillExecuteId());
@@ -288,13 +292,13 @@
}
@Override
- public ResultVO batchDeleteEmergencyDrillEvaluation(String ids) {
- if (StringUtils.isBlank(ids)) {
+ public ResultVO batchDeleteEmergencyDrillEvaluation(Long[] ids) {
+
+ if (ids == null || ids.length==0){
throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_NULL);
- } else {
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteEmergencyDrillEvaluation(Long.valueOf(id));
+ }else{
+ for (Long id : ids){
+ deleteEmergencyDrillEvaluation(id);
}
return new ResultVO(ResultCodes.OK);
}
--
Gitblit v1.9.2