From 37f303aa95b9f6e09db8db216dbe39834ef4ca98 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 13:58:58 +0800
Subject: [PATCH] fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 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 f9b1395..c43dc17 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
@@ -74,7 +74,7 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -82,7 +82,7 @@
}
@Override
- public ResultVO addEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
+ public ResultVO<EmergencyTeamDetailRespDTO> addEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
//必填项验证
checkRequired(emergencyTeamReqDTO);
@@ -102,7 +102,9 @@
if (!CollectionUtils.isEmpty(emergencyTeamReqDTO.getMemberList())){
addEmergencyTeamMember(emergencyTeamInfo.getId(),uid,nowDate,emergencyTeamReqDTO.getMemberList());
}
- return new ResultVO(ResultCodes.OK);
+ EmergencyTeamDetailRespDTO emergencyTeamDetailRespDTO = new EmergencyTeamDetailRespDTO();
+ BeanUtils.copyProperties(emergencyTeamInfo,emergencyTeamDetailRespDTO);
+ return new ResultVO<>(ResultCodes.OK,emergencyTeamDetailRespDTO);
}
private void addEmergencyTeamFile(Long teamId ,Long uid , Date nowDate , List<EmergencyTeamFileReqDTO> emergencyTeamFileReqDTOList){
@@ -159,6 +161,7 @@
@Override
public ResultVO updateEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
+ Date nowDate = new Date();
//查询是否存在
EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(emergencyTeamReqDTO.getId());
if (emergencyTeamInfoDetailDO==null){
@@ -167,16 +170,15 @@
EmergencyTeamInfo emergencyTeamInfo = new EmergencyTeamInfo();
BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamInfo);
emergencyTeamInfo.setUpdateUid(uid);
- emergencyTeamInfo.setGmtModitify(new Date());
+ emergencyTeamInfo.setGmtModitify(nowDate);
emergencyTeamInfoService.updateEmergencyTeam(emergencyTeamInfo);
//修改应急队伍附件
- updateEmergencyTeamFile(uid,emergencyTeamReqDTO.getId(),emergencyTeamReqDTO.getFileList());
+ updateEmergencyTeamFile(uid,emergencyTeamReqDTO.getId(),nowDate,emergencyTeamReqDTO.getFileList());
return new ResultVO(ResultCodes.OK);
}
}
- private void updateEmergencyTeamFile(Long uid ,Long teamId ,List<EmergencyTeamFileReqDTO> emergencyTeamFileReqDTOList){
- Date nowDate = new Date();
+ private void updateEmergencyTeamFile(Long uid ,Long teamId ,Date nowDate,List<EmergencyTeamFileReqDTO> emergencyTeamFileReqDTOList){
List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList = emergencyTeamFileInfoService.selectByEmergencyTeamId(teamId);
List<Long> oldIdsList = emergencyTeamFileInfoDOList.stream().map(EmergencyTeamFileInfoDO::getId).collect(Collectors.toList());
@@ -245,7 +247,25 @@
}
@Override
- public ResultVO deleteEmergencyTeam(Long id) {
+ public ResultVO batchDeleteEmergencyTeam(Long[] ids) {
+ if (ids == null || ids.length==0){
+ throw new EmergencyException(EmergencyResultCodes.TEAM_NULL);
+ }else{
+ for (Long id : ids){
+ deleteEmergencyTeam(id);
+ }
+ return new ResultVO(ResultCodes.OK);
+ }
+ }
+
+ @Override
+ public ResultVO getEmergencyTeamMemberByTeamId(Long teamId) {
+ List<EmergencyTeamMemberInfoDO> emergencyTeamMemberInfoDOList = emergencyTeamMemberInfoService.selectByEmergencyTeamId(teamId);
+ List<EmergencyTeamMemberRespDTO> emergencyTeamMemberRespDTOList = BeanCopyUtils.copyBeanList(emergencyTeamMemberInfoDOList , EmergencyTeamMemberRespDTO.class);
+ return new ResultVO<>(ResultCodes.OK,emergencyTeamMemberRespDTOList);
+ }
+
+ private void deleteEmergencyTeam(Long id) {
//查询是否存在
EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(id);
if (emergencyTeamInfoDetailDO==null){
@@ -258,20 +278,6 @@
emergencyTeamFileInfoService.deleteEmergencyTeamFileByTeamId(teamId);
//删除应急队伍
emergencyTeamInfoService.deleteEmergencyTeamById(teamId);
- return new ResultVO(ResultCodes.OK);
- }
- }
-
- @Override
- public ResultVO batchDeleteEmergencyTeam(String ids) {
- if (StringUtils.isBlank(ids)){
- throw new EmergencyException(EmergencyResultCodes.TEAM_NULL);
- }else{
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteEmergencyTeam(Long.valueOf(id));
- }
- return new ResultVO(ResultCodes.OK);
}
}
--
Gitblit v1.9.2