From c604f08ffc5264165a25d15b3eeef87c72ed8489 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 05 七月 2022 18:05:34 +0800
Subject: [PATCH] 应急队伍详情

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java |   77 ++++++++++++++++++++++++++++++--------
 1 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
index 0a86114..5c5c0ef 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
@@ -8,11 +8,13 @@
 import com.gkhy.safePlatform.commons.vo.ResultVO;
 import com.gkhy.safePlatform.commons.vo.SearchResultVO;
 import com.gkhy.safePlatform.emergency.entity.*;
-import com.gkhy.safePlatform.emergency.excepiton.EmergencyServiceException;
+import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
 import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
-import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamFileReqDTO;
+import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamMemberReqDTO;
 import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamReqDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamDetailRespDTO;
 import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamFileRespDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamMemberRespDTO;
 import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamPageRespDTO;
 import com.gkhy.safePlatform.emergency.query.EmergencyTeamQuery;
 import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery;
@@ -113,6 +115,31 @@
         return new ResultVO(ResultCodes.OK);
     }
 
+    @Override
+    public ResultVO<EmergencyTeamDetailRespDTO> getEmergencyTeamById(Long id) {
+        EmergencyTeamDetailRespDTO emergencyTeamDetailRespDTO = new EmergencyTeamDetailRespDTO();
+        EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(id);
+        if (emergencyTeamInfoDetailDO==null){
+            throw new EmergencyException(EmergencyResultCodes.TEAM_NOT_EXIST);
+        }else{
+            BeanUtils.copyProperties(emergencyTeamInfoDetailDO,emergencyTeamDetailRespDTO);
+            //查找对应的附件
+            List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList = emergencyTeamFileInfoService.selectByEmergencyTeamId(id);
+            if (!CollectionUtils.isEmpty(emergencyTeamFileInfoDOList)){
+                List<EmergencyTeamFileRespDTO> emergencyTeamFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyTeamFileInfoDOList , EmergencyTeamFileRespDTO.class);
+                emergencyTeamDetailRespDTO.setFileList(emergencyTeamFileRespDTOList);
+            }
+
+            //查找对应的人员
+            List<EmergencyTeamMemberInfoDO> emergencyTeamMemberInfoDOList = emergencyTeamMemberInfoService.selectByEmergencyTeamId(id);
+            if (!CollectionUtils.isEmpty(emergencyTeamMemberInfoDOList)){
+                List<EmergencyTeamMemberRespDTO> emergencyTeamMemberRespDTOList = BeanCopyUtils.copyBeanList(emergencyTeamMemberInfoDOList , EmergencyTeamMemberRespDTO.class);
+                emergencyTeamDetailRespDTO.setMemberList(emergencyTeamMemberRespDTOList);
+            }
+        }
+        return new ResultVO<>(ResultCodes.OK ,emergencyTeamDetailRespDTO);
+    }
+
     /**
      * 验证必填项
      *
@@ -121,38 +148,54 @@
     private void checkRequired(EmergencyTeamReqDTO emergencyTeamReqDTO) {
         //名称
         if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamName())) {
-            throw new EmergencyServiceException(EmergencyResultCodes.TEAM_NAME_NULL);
+            throw new EmergencyException(EmergencyResultCodes.TEAM_NAME_NULL);
         }
         //级别
         if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamLevel())) {
-            throw new EmergencyServiceException(EmergencyResultCodes.TEAM_LEVEL_NULL);
+            throw new EmergencyException(EmergencyResultCodes.TEAM_LEVEL_NULL);
         }
         //负责人
         if (emergencyTeamReqDTO.getPrincipalUid() == null || emergencyTeamReqDTO.getPrincipalUid() == 0) {
-            throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL);
+            throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL);
         }
         //负责人部门
 
         if (emergencyTeamReqDTO.getPrincipalDepartmentId() == null || emergencyTeamReqDTO.getPrincipalDepartmentId() == 0) {
-            throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_DEPARTMENT_NULL);
+            throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_DEPARTMENT_NULL);
         }
         //负责人手机
         if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalPhone())) {
-            throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_PHONE_NULL);
+            throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_PHONE_NULL);
         }
         //固定电话
         if (StringUtils.isBlank(emergencyTeamReqDTO.getTelephoneNumber())) {
-            throw new EmergencyServiceException(EmergencyResultCodes.TEAM_TELEPHONE_NUMBER_NULL);
+            throw new EmergencyException(EmergencyResultCodes.TEAM_TELEPHONE_NUMBER_NULL);
         }
-    }
-
-    /**
-     * 验证数据库是否存在
-     *
-     * @return
-     */
-    public Boolean checkeExist() {
-        return null;
+        //人员列表如果不为空,则需要验证其中的必填项
+        if (!CollectionUtils.isEmpty(emergencyTeamReqDTO.getMemberList())){
+            for(EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO : emergencyTeamReqDTO.getMemberList()){
+                //工号
+                if (StringUtils.isBlank(emergencyTeamMemberReqDTO.getJobNumber())) {
+                    throw new EmergencyException(EmergencyResultCodes.TEAM_USER_JOB_NUMBER_NULL);
+                }
+                //名称
+                if (StringUtils.isBlank(emergencyTeamMemberReqDTO.getName())) {
+                    throw new EmergencyException(EmergencyResultCodes.TEAM_USER_NAME_NULL);
+                }
+                //性别
+                if (emergencyTeamMemberReqDTO.getGender()==null) {
+                    throw new EmergencyException(EmergencyResultCodes.TEAM_USER_GENDER_NULL);
+                }
+                //手机号码
+                if (StringUtils.isBlank(emergencyTeamMemberReqDTO.getPhone())) {
+                    throw new EmergencyException(EmergencyResultCodes.TEAM_USER_PHONE_NULL);
+                }
+                //职务
+                if (StringUtils.isBlank(emergencyTeamMemberReqDTO.getPosition())) {
+                    throw new EmergencyException(EmergencyResultCodes.TEAM_USER_POSITION_NULL);
+                }
+            }
+        }
     }
 
 }

--
Gitblit v1.9.2