songhuangfeng123
2022-08-10 56ba708b25e1834eeb6c0366945b2c1fbafcfbe5
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java
@@ -82,7 +82,7 @@
            throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NULL);
        } else {
            EmergencyDrillExecuteInfoDetailDO emergencyDrillExecuteInfoDetailDO = emergencyDrillExecuteInfoService.selectEmergencyDrillExecuteById(emergencyDrillEvaluationReqDTO.getDrillExecuteId());
            // 判断是否存在该演练计划
            // 判断是否存在该演练实施
            if (emergencyDrillExecuteInfoDetailDO == null) {
                throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NOT_EXIST);
            } else {
@@ -98,7 +98,7 @@
                if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getFileList())) {
                    addEmergencyDrillEvaluationFile(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getFileList());
                }
                // 新增急演练计划应急人员表
                // 新增急演练实施评价应急人员表
                if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getUserList())) {
                    addEmergencyDrillEvaluationUser(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getUserList());
                }
@@ -194,15 +194,16 @@
        } else {
            EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo = new EmergencyDrillEvaluationInfo();
            BeanUtils.copyProperties(emergencyDrillEvaluationReqDTO, emergencyDrillEvaluationInfo);
            emergencyDrillEvaluationInfo.setId(emergencyDrillEvaluationInfoDetailDO.getId());
            emergencyDrillEvaluationInfo.setUpdateUid(uid);
            emergencyDrillEvaluationInfo.setGmtModitify(nowDate);
            emergencyDrillEvaluationInfoService.updateEmergencyDrillEvaluation(emergencyDrillEvaluationInfo);
            // 更新急演练计划附件表
            // 更新急演练实施评价附件表
            if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getFileList())) {
                updateEmergencyDrillEvaluationFile(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getFileList());
            }
            // 更新急演练计划应急队伍表
            // 更新急演练实施评价应急队伍表
            if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getUserList())) {
                updateEmergencyDrillEvaluationUser(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getUserList());
            }