From aace11a7e1201a8d1fc0b50b659368918d23e794 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Tue, 02 Aug 2022 16:43:59 +0800
Subject: [PATCH] 一览接口fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java | 65 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 22 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 060e0ee..15b43bc 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
@@ -13,17 +13,11 @@
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillEvaluationFileReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillEvaluationReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillEvaluationUserReqDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillEvaluationDetailRespDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillEvaluationFileRespDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillEvaluationPageRespDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillEvaluationUserRespDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.*;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillEvaluationQuery;
import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillEvaluationDBQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyDrillEvaluationService;
-import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillEvaluationFileInfoService;
-import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillEvaluationInfoService;
-import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillEvaluationUserInfoService;
-import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillPlanInfoService;
+import com.gkhy.safePlatform.emergency.service.baseService.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -47,8 +41,16 @@
private EmergencyDrillEvaluationUserInfoService emergencyDrillEvaluationUserInfoService;
@Autowired
- private EmergencyDrillPlanInfoService emergencyDrillPlanInfoService;
+ private EmergencyDrillExecuteInfoService emergencyDrillExecuteInfoService;
+ @Autowired
+ private EmergencyDrillExecuteUserInfoService emergencyDrillExecuteUserInfoService;
+
+ @Autowired
+ private EmergencyDrillPlanFileInfoService emergencyDrillPlanFileInfoService;
+
+ @Autowired
+ private EmergencyDrillPlanUserInfoService emergencyDrillPlanUserInfoService;
@Override
public SearchResultVO<List<EmergencyDrillEvaluationPageRespDTO>> selectEmergencyDrillEvaluationList(PageQuery<EmergencyDrillEvaluationQuery> query) {
@@ -66,7 +68,7 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -76,13 +78,13 @@
@Override
public ResultVO addEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
// 判断请求中是否存在演练计划id
- if (emergencyDrillEvaluationReqDTO.getDrillPlanId() == null) {
- throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NULL);
+ if (emergencyDrillEvaluationReqDTO.getDrillExecuteId() == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NULL);
} else {
- EmergencyDrillPlanInfoDetailDO emergencyDrillPlanInfoDetailDO = emergencyDrillPlanInfoService.selectEmergencyDrillPlanById(emergencyDrillEvaluationReqDTO.getDrillPlanId());
+ EmergencyDrillExecuteInfoDetailDO emergencyDrillExecuteInfoDetailDO = emergencyDrillExecuteInfoService.selectEmergencyDrillExecuteById(emergencyDrillEvaluationReqDTO.getDrillExecuteId());
// 判断是否存在该演练计划
- if (emergencyDrillPlanInfoDetailDO == null) {
- throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NOT_EXIST);
+ if (emergencyDrillExecuteInfoDetailDO == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NOT_EXIST);
} else {
Date nowDate = new Date();
// 新增应急演练实施评价
@@ -141,18 +143,37 @@
} else {
BeanUtils.copyProperties(emergencyDrillEvaluationInfoDetailDO, emergencyDrillEvaluationDetailRespDTO);
- // 查找对应的人员
- List<EmergencyDrillEvaluationUserInfoDO> emergencyDrillEvaluationUserInfoDOList = emergencyDrillEvaluationUserInfoService.selectEmergencyDrillEvaluationUserByDrillEvaluationId(id);
- if (!CollectionUtils.isEmpty(emergencyDrillEvaluationUserInfoDOList)) {
- List<EmergencyDrillEvaluationUserRespDTO> emergencyUserUserRespDTOList = BeanCopyUtils.copyBeanList(emergencyDrillEvaluationUserInfoDOList, EmergencyDrillEvaluationUserRespDTO.class);
- emergencyDrillEvaluationDetailRespDTO.setUserList(emergencyUserUserRespDTOList);
+ // 演练计划的文件
+ List<EmergencyDrillPlanFileInfoDO> planFileInfoDOList = emergencyDrillPlanFileInfoService.selectEmergencyDrillPlanFileByDrillPlanId(emergencyDrillEvaluationDetailRespDTO.getDrillPlanId());
+ if (!CollectionUtils.isEmpty(planFileInfoDOList)) {
+ List<EmergencyDrillPlanFileRespDTO> emergencyUserFileRespDTOList = BeanCopyUtils.copyBeanList(planFileInfoDOList, EmergencyDrillPlanFileRespDTO.class);
+ emergencyDrillEvaluationDetailRespDTO.setPlanFileList(emergencyUserFileRespDTOList);
}
- // 查找对应的附件
+ // 演练计划的人员
+ List<EmergencyDrillPlanUserInfoDO> planUserInfoDOList = emergencyDrillPlanUserInfoService.selectEmergencyDrillPlanUserByDrillPlanId(emergencyDrillEvaluationDetailRespDTO.getDrillPlanId());
+ if (!CollectionUtils.isEmpty(planUserInfoDOList)) {
+ List<EmergencyDrillPlanUserRespDTO> emergencyUserUserRespDTOList = BeanCopyUtils.copyBeanList(planUserInfoDOList, EmergencyDrillPlanUserRespDTO.class);
+ emergencyDrillEvaluationDetailRespDTO.setPlanUserList(emergencyUserUserRespDTOList);
+ }
+ // 演练实施的人员
+ List<EmergencyDrillExecuteUserInfoDO> executeUserList = emergencyDrillExecuteUserInfoService.selectEmergencyDrillExecuteUserByDrillExecuteId(emergencyDrillEvaluationDetailRespDTO.getDrillExecuteId());
+ if (!CollectionUtils.isEmpty(executeUserList)) {
+ List<EmergencyDrillExecuteUserRespDTO> emergencyUserFileRespDTOList = BeanCopyUtils.copyBeanList(executeUserList, EmergencyDrillExecuteUserRespDTO.class);
+ emergencyDrillEvaluationDetailRespDTO.setExecuteUserList(emergencyUserFileRespDTOList);
+ }
+ // 演练评价的文件
List<EmergencyDrillEvaluationFileInfoDO> emergencyDrillEvaluationFileInfoDOList = emergencyDrillEvaluationFileInfoService.selectEmergencyDrillEvaluationFileByDrillEvaluationId(id);
if (!CollectionUtils.isEmpty(emergencyDrillEvaluationFileInfoDOList)) {
List<EmergencyDrillEvaluationFileRespDTO> emergencyUserFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyDrillEvaluationFileInfoDOList, EmergencyDrillEvaluationFileRespDTO.class);
- emergencyDrillEvaluationDetailRespDTO.setFileList(emergencyUserFileRespDTOList);
+ emergencyDrillEvaluationDetailRespDTO.setEvaluationFileList(emergencyUserFileRespDTOList);
}
+ // 演练评价的人员
+ List<EmergencyDrillEvaluationUserInfoDO> emergencyDrillEvaluationUserInfoDOList = emergencyDrillEvaluationUserInfoService.selectEmergencyDrillEvaluationUserByDrillEvaluationId(id);
+ if (!CollectionUtils.isEmpty(emergencyDrillEvaluationUserInfoDOList)) {
+ List<EmergencyDrillEvaluationUserRespDTO> emergencyUserUserRespDTOList = BeanCopyUtils.copyBeanList(emergencyDrillEvaluationUserInfoDOList, EmergencyDrillEvaluationUserRespDTO.class);
+ emergencyDrillEvaluationDetailRespDTO.setEvaluationUserList(emergencyUserUserRespDTOList);
+ }
+
return new ResultVO<>(ResultCodes.OK, emergencyDrillEvaluationDetailRespDTO);
}
}
--
Gitblit v1.9.2