songhuangfeng123
2022-08-04 f3a1ffc586b88a4b8ae43e664f2cefadd3ba7d24
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
@@ -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);
@@ -262,13 +267,13 @@
    }
    @Override
    public ResultVO batchDeleteEmergencyDrillPlan(String ids) {
        if (StringUtils.isBlank(ids)) {
    public ResultVO batchDeleteEmergencyDrillPlan(Long[] ids) {
        if (ids == null ||  ids.length==0){
            throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NULL);
        } else {
            String[] idArr = ids.split(",");
            for (String id : idArr) {
                deleteEmergencyDrillPlan(Long.valueOf(id));
        }else{
            for (Long id : ids){
                deleteEmergencyDrillPlan(id);
            }
            return new ResultVO(ResultCodes.OK);
        }