应急实施评价

songhuangfeng123

2022-08-06 9d43c54b19100f357ea1036bfff5f5ac4a6ec952

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java

@@ -102,6 +102,9 @@
                if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getUserList())) {
                    addEmergencyDrillEvaluationUser(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getUserList());
                }

                // 修改实施表的评价状态
                emergencyDrillExecuteInfoService.updateStatusById(emergencyDrillEvaluationReqDTO.getDrillExecuteId());
                return new ResultVO<>(ResultCodes.OK);
            }
        }
@@ -152,8 +155,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 +295,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);
        }