From b98d1d16f81efb2a7795f1b8753e10a3fa98968f Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 16 八月 2022 17:32:55 +0800
Subject: [PATCH] 应急第一个图

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 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 c203bc7..e792e0e 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
@@ -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,13 +98,11 @@
                 if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getFileList())) {
                     addEmergencyDrillEvaluationFile(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getFileList());
                 }
-                // 新增急演练计划应急人员表
+                // 新增急演练实施评价应急人员表
                 if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getUserList())) {
                     addEmergencyDrillEvaluationUser(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getUserList());
                 }
 
-                // 修改实施表的评价状态
-                emergencyDrillExecuteInfoService.updateStatusById(emergencyDrillEvaluationReqDTO.getDrillExecuteId());
                 return new ResultVO<>(ResultCodes.OK);
             }
         }
@@ -140,7 +138,7 @@
     public ResultVO<EmergencyDrillEvaluationDetailRespDTO> getEmergencyDrillEvaluationById(Long id) {
         EmergencyDrillEvaluationDetailRespDTO emergencyDrillEvaluationDetailRespDTO = new EmergencyDrillEvaluationDetailRespDTO();
         // 查询是否存在
-        EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationById(id);
+        EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationByExecuteId(id);
         if (emergencyDrillEvaluationInfoDetailDO == null) {
             throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_NOT_EXIST);
         } else {
@@ -169,17 +167,18 @@
                 emergencyDrillEvaluationDetailRespDTO.setExecuteUserList(emergencyUserFileRespDTOList);
             }
             // 演练评价的文件
-            List<EmergencyDrillEvaluationFileInfoDO> emergencyDrillEvaluationFileInfoDOList = emergencyDrillEvaluationFileInfoService.selectEmergencyDrillEvaluationFileByDrillEvaluationId(id);
+            List<EmergencyDrillEvaluationFileInfoDO> emergencyDrillEvaluationFileInfoDOList = emergencyDrillEvaluationFileInfoService.selectEmergencyDrillEvaluationFileByDrillEvaluationId(emergencyDrillEvaluationDetailRespDTO.getId());
             if (!CollectionUtils.isEmpty(emergencyDrillEvaluationFileInfoDOList)) {
                 List<EmergencyDrillEvaluationFileRespDTO> emergencyUserFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyDrillEvaluationFileInfoDOList, EmergencyDrillEvaluationFileRespDTO.class);
                 emergencyDrillEvaluationDetailRespDTO.setEvaluationFileList(emergencyUserFileRespDTOList);
             }
             // 演练评价的人员
-            List<EmergencyDrillEvaluationUserInfoDO> emergencyDrillEvaluationUserInfoDOList = emergencyDrillEvaluationUserInfoService.selectEmergencyDrillEvaluationUserByDrillEvaluationId(id);
+            List<EmergencyDrillEvaluationUserInfoDO> emergencyDrillEvaluationUserInfoDOList = emergencyDrillEvaluationUserInfoService.selectEmergencyDrillEvaluationUserByDrillEvaluationId(emergencyDrillEvaluationDetailRespDTO.getId());
             if (!CollectionUtils.isEmpty(emergencyDrillEvaluationUserInfoDOList)) {
                 List<EmergencyDrillEvaluationUserRespDTO> emergencyUserUserRespDTOList = BeanCopyUtils.copyBeanList(emergencyDrillEvaluationUserInfoDOList, EmergencyDrillEvaluationUserRespDTO.class);
                 emergencyDrillEvaluationDetailRespDTO.setEvaluationUserList(emergencyUserUserRespDTOList);
             }
+
 
             return new ResultVO<>(ResultCodes.OK, emergencyDrillEvaluationDetailRespDTO);
         }
@@ -189,25 +188,27 @@
     public ResultVO updateEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
         Date nowDate = new Date();
         // 查询是否存在
-        EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationById(emergencyDrillEvaluationReqDTO.getId());
+        EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationByExecuteId(emergencyDrillEvaluationReqDTO.getDrillExecuteId());
         if (emergencyDrillEvaluationInfoDetailDO == null) {
             throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_NOT_EXIST);
         } 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());
             }
-
+            // 修改实施表的评价状态
+            emergencyDrillExecuteInfoService.updateStatusById(emergencyDrillEvaluationInfoDetailDO.getDrillExecuteId());
             return new ResultVO<>(ResultCodes.OK);
         }
     }
@@ -309,7 +310,7 @@
 
     private void deleteEmergencyDrillEvaluation(Long id) {
         //查询是否存在
-        EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationById(id);
+        EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationByExecuteId(id);
         if (emergencyDrillEvaluationInfoDetailDO == null) {
             throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_NOT_EXIST);
         } else {

--
Gitblit v1.9.2