From b591b26cc9290e1469281e3bc22b8aea4f8d061a Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 06 七月 2022 15:30:05 +0800
Subject: [PATCH] 应急队伍
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamMemberInfoServiceImpl.java | 26 ++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java | 44 ++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamFileInfoRepository.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamMemberInfoService.java | 10
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamFileInfoServiceImpl.java | 21 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java | 4
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml | 11 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java | 1
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml | 111 +++++++---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java | 11 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamFileInfoService.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamMemberInfoRepository.java | 9
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml | 114 +++++++----
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java | 11 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java | 162 ++++++++++++++-
16 files changed, 435 insertions(+), 114 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
index 31eb0bf..441a3fb 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
@@ -3,6 +3,7 @@
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
+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.EmergencyTeamPageRespDTO;
@@ -46,4 +47,47 @@
public ResultVO<EmergencyTeamDetailRespDTO> getEmergencyTeamById(@PathVariable("id")Long id){
return emergencyTeamService.getEmergencyTeamById(id);
}
+
+ /**
+ * 应急队伍修改
+ */
+ @RequestMapping(value = "/update",method = RequestMethod.POST)
+ public ResultVO updateEmergencyTeam(Principal principal, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) {
+ String uid = principal.getName();
+ return emergencyTeamService.updateEmergencyTeam(Long.valueOf(uid), emergencyTeamReqDTO);
+ }
+
+ /**
+ * 应急队伍删除
+ */
+ @RequestMapping(value = "/delete/{id}",method = RequestMethod.GET)
+ public ResultVO deleteEmergencyTeam(@PathVariable("id")Long id){
+ return emergencyTeamService.deleteEmergencyTeam(id);
+ }
+
+ /**
+ * 应急队伍修改(应急人员新增)
+ */
+ @RequestMapping(value = "/addMember",method = RequestMethod.POST)
+ public ResultVO addEmergencyTeamMember(Principal principal, @RequestBody EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO) {
+ String uid = principal.getName();
+ return emergencyTeamService.addEmergencyTeamMember(Long.valueOf(uid), emergencyTeamMemberReqDTO);
+ }
+
+ /**
+ * 应急队伍修改(应急人员修改)
+ */
+ @RequestMapping(value = "/updateMember",method = RequestMethod.POST)
+ public ResultVO updateEmergencyTeamMember(Principal principal, @RequestBody EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO) {
+ String uid = principal.getName();
+ return emergencyTeamService.updateEmergencyTeamMember(Long.valueOf(uid), emergencyTeamMemberReqDTO);
+ }
+ /**
+ * 应急队伍修改(应急人员删除)
+ */
+ @RequestMapping(value = "/deleteMember/{id}",method = RequestMethod.GET)
+ public ResultVO deleteEmergencyTeamMember(@PathVariable("id")Long id){
+ return emergencyTeamService.deleteEmergencyTeamMember(id);
+ }
+
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
index 35f043e..dc9815b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
@@ -26,6 +26,7 @@
TEAM_NOT_EXIST("T1008" , "应急队伍不存在"),
+ TEAM_USER_NOT_EXIST("T1009" , "应急队伍人员不存在"),
ERROR("A3000", "未知错误");
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamFileInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamFileInfoRepository.java
index 625f84a..36584c2 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamFileInfoRepository.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamFileInfoRepository.java
@@ -15,4 +15,8 @@
List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(@Param("teamId") Long teamId);
void addEmergencyTeamFile(EmergencyTeamFileInfo emergencyTeamFileInfoDO);
+
+ void deleteEmergencyTeamFileByIds(@Param("ids") List<Long> ids);
+
+ void deleteEmergencyTeamFileByTeamId(@Param("teamId") Long teamId);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java
index e2672e9..af25346 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java
@@ -20,4 +20,8 @@
void addEmergencyTeam(EmergencyTeamInfo emergencyTeamInfo);
EmergencyTeamInfoDetailDO selectEmergencyTeamById(@P("id") Long id);
+
+ void updateEmergencyTeam(EmergencyTeamInfo emergencyTeamInfo);
+
+ void deleteEmergencyTeamById(@Param("teamId") Long teamId);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamMemberInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamMemberInfoRepository.java
index 6edd981..623afc7 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamMemberInfoRepository.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamMemberInfoRepository.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO;
+import org.apache.ibatis.annotations.Param;
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Repository;
@@ -15,4 +16,12 @@
void addEmergencyTeamMember(EmergencyTeamMemberInfo emergencyTeamMemberInfo);
List<EmergencyTeamMemberInfoDO> selectByEmergencyTeamId(@P("id") Long id);
+
+ void updateEmergencyTeamMember(EmergencyTeamMemberInfo emergencyTeamMemberInfo);
+
+ void deleteEmergencyTeamMemberByTeamId(@Param("teamId") Long teamId);
+
+ void deleteEmergencyTeamMemberById(@Param("id") Long id);
+
+ EmergencyTeamMemberInfoDO selectEmergencyTeamMemberById(@Param("id")Long id);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
index e75f467..8ef2d70 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
@@ -3,6 +3,7 @@
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+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.EmergencyTeamPageRespDTO;
@@ -17,4 +18,14 @@
ResultVO addEmergencyTeam(Long valueOf, EmergencyTeamReqDTO emergencyTeamReqDTO);
ResultVO<EmergencyTeamDetailRespDTO> getEmergencyTeamById(Long id);
+
+ ResultVO updateEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO);
+
+ ResultVO addEmergencyTeamMember(Long uid, EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO);
+
+ ResultVO updateEmergencyTeamMember(Long valueOf, EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO);
+
+ ResultVO deleteEmergencyTeam(Long id);
+
+ ResultVO deleteEmergencyTeamMember(Long id);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamFileInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamFileInfoService.java
index 43c3247..dc27ff9 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamFileInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamFileInfoService.java
@@ -11,5 +11,9 @@
List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(Long id);
- void addEmergencyTeamFile(List<EmergencyTeamFileInfo> fileList);
+ void addEmergencyTeamFile(EmergencyTeamFileInfo emergencyTeamFileInfo);
+
+ void deleteEmergencyTeamFileByIds(List<Long> ids);
+
+ void deleteEmergencyTeamFileByTeamId(Long teamId);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java
index 60df1b4..44842bf 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java
@@ -17,4 +17,8 @@
void addEmergencyTeam(EmergencyTeamInfo emergencyTeamInfo);
EmergencyTeamInfoDetailDO selectEmergencyTeamById(Long id);
+
+ void updateEmergencyTeam(EmergencyTeamInfo emergencyTeamInfo);
+
+ void deleteEmergencyTeamById(Long teamId);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamMemberInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamMemberInfoService.java
index 55e6260..2b0174a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamMemberInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamMemberInfoService.java
@@ -9,7 +9,15 @@
public interface EmergencyTeamMemberInfoService extends IService<EmergencyTeamMemberInfo> {
- void addEmergencyTeamMember(List<EmergencyTeamMemberInfo> memberList);
+ void addEmergencyTeamMember(EmergencyTeamMemberInfo memberInfo);
List<EmergencyTeamMemberInfoDO> selectByEmergencyTeamId(Long id);
+
+ void updateEmergencyTeamMember(EmergencyTeamMemberInfo emergencyTeamMemberInfo);
+
+ void deleteEmergencyTeamMemberByTeamId(Long teamId);
+
+ void deleteEmergencyTeamMemberById(Long id);
+
+ EmergencyTeamMemberInfoDO selectEmergencyTeamMemberById(Long id);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamFileInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamFileInfoServiceImpl.java
index 4536328..3ee19d8 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamFileInfoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamFileInfoServiceImpl.java
@@ -7,9 +7,7 @@
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyTeamFileInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
import java.util.List;
@Service("emergencyTeamFileInfoService")
@@ -21,15 +19,22 @@
@Override
public List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(Long id) {
- List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList= emergencyTeamFileInfoRepository.selectByEmergencyTeamId(id);
- return CollectionUtils.isEmpty(emergencyTeamFileInfoDOList)?new ArrayList<>():emergencyTeamFileInfoDOList;
+ return emergencyTeamFileInfoRepository.selectByEmergencyTeamId(id);
}
@Override
- public void addEmergencyTeamFile(List<EmergencyTeamFileInfo> fileList) {
- for (EmergencyTeamFileInfo emergencyTeamFileInfo : fileList){
- emergencyTeamFileInfoRepository.addEmergencyTeamFile(emergencyTeamFileInfo);
- }
+ public void addEmergencyTeamFile(EmergencyTeamFileInfo emergencyTeamFileInfo) {
+ emergencyTeamFileInfoRepository.addEmergencyTeamFile(emergencyTeamFileInfo);
+ }
+
+ @Override
+ public void deleteEmergencyTeamFileByIds(List<Long> ids) {
+ emergencyTeamFileInfoRepository.deleteEmergencyTeamFileByIds(ids);
+ }
+
+ @Override
+ public void deleteEmergencyTeamFileByTeamId(Long teamId) {
+ emergencyTeamFileInfoRepository.deleteEmergencyTeamFileByTeamId(teamId);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java
index 263f38e..a67f6d6 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO;
@@ -35,5 +34,15 @@
return emergencyTeamInfoRepository.selectEmergencyTeamById(id);
}
+ @Override
+ public void updateEmergencyTeam(EmergencyTeamInfo emergencyTeamInfo) {
+ emergencyTeamInfoRepository.updateEmergencyTeam(emergencyTeamInfo);
+ }
+
+ @Override
+ public void deleteEmergencyTeamById(Long teamId) {
+ emergencyTeamInfoRepository.deleteEmergencyTeamById(teamId);
+ }
+
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamMemberInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamMemberInfoServiceImpl.java
index 4cedfe6..993846a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamMemberInfoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamMemberInfoServiceImpl.java
@@ -18,14 +18,32 @@
private EmergencyTeamMemberInfoRepository emergencyTeamMemberInfoRepository;
@Override
- public void addEmergencyTeamMember(List<EmergencyTeamMemberInfo> memberList) {
- for (EmergencyTeamMemberInfo emergencyTeamMemberInfo : memberList){
- emergencyTeamMemberInfoRepository.addEmergencyTeamMember(emergencyTeamMemberInfo);
- }
+ public void addEmergencyTeamMember(EmergencyTeamMemberInfo emergencyTeamMemberInfo) {
+ emergencyTeamMemberInfoRepository.addEmergencyTeamMember(emergencyTeamMemberInfo);
}
@Override
public List<EmergencyTeamMemberInfoDO> selectByEmergencyTeamId(Long id) {
return emergencyTeamMemberInfoRepository.selectByEmergencyTeamId(id);
}
+
+ @Override
+ public void updateEmergencyTeamMember(EmergencyTeamMemberInfo emergencyTeamMemberInfo) {
+ emergencyTeamMemberInfoRepository.updateEmergencyTeamMember(emergencyTeamMemberInfo);
+ }
+
+ @Override
+ public void deleteEmergencyTeamMemberByTeamId(Long teamId) {
+ emergencyTeamMemberInfoRepository.deleteEmergencyTeamMemberByTeamId(teamId);
+ }
+
+ @Override
+ public void deleteEmergencyTeamMemberById(Long id) {
+ emergencyTeamMemberInfoRepository.deleteEmergencyTeamMemberById(id);
+ }
+
+ @Override
+ public EmergencyTeamMemberInfoDO selectEmergencyTeamMemberById(Long id) {
+ return emergencyTeamMemberInfoRepository.selectEmergencyTeamMemberById(id);
+ }
}
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 5c5c0ef..b40fdf9 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
@@ -10,6 +10,7 @@
import com.gkhy.safePlatform.emergency.entity.*;
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;
@@ -30,6 +31,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
@Service("emergencyTeamService")
public class EmergencyTeamServiceImpl implements EmergencyTeamService {
@@ -81,7 +83,6 @@
@Override
public ResultVO addEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
-
//必填项验证
checkRequired(emergencyTeamReqDTO);
@@ -94,30 +95,43 @@
emergencyTeamInfo.setGmtCreate(nowDate);
emergencyTeamInfoService.addEmergencyTeam(emergencyTeamInfo);
//2.新增应急队伍附件
- List<EmergencyTeamFileInfo> fileInfoList = BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(), EmergencyTeamFileInfo.class);
+ addEmergencyTeamFile(emergencyTeamInfo.getId(),uid,nowDate,emergencyTeamReqDTO.getFileList());
+ //3.新增应急队伍人员
+ addEmergencyTeamMember(emergencyTeamInfo.getId(),uid,nowDate,emergencyTeamReqDTO.getMemberList());
+
+ return new ResultVO(ResultCodes.OK);
+ }
+
+ private void addEmergencyTeamFile(Long teamId ,Long uid , Date nowDate , List<EmergencyTeamFileReqDTO> emergencyTeamFileReqDTOList){
+ List<EmergencyTeamFileInfo> fileInfoList = BeanCopyUtils.copyBeanList(emergencyTeamFileReqDTOList, EmergencyTeamFileInfo.class);
fileInfoList.forEach(EmergencyTeamFileInfo -> {
- EmergencyTeamFileInfo.setTeamId(emergencyTeamInfo.getId());
+ EmergencyTeamFileInfo.setTeamId(teamId);
EmergencyTeamFileInfo.setDelFlag(false);
EmergencyTeamFileInfo.setCreateUid(uid);
EmergencyTeamFileInfo.setGmtCreate(nowDate);
});
- emergencyTeamFileInfoService.addEmergencyTeamFile(fileInfoList);
- //3.新增应急队伍人员
- List<EmergencyTeamMemberInfo> memberInfoList = BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(), EmergencyTeamMemberInfo.class);
- memberInfoList.forEach(EmergencyTeamMemberInfo -> {
- EmergencyTeamMemberInfo.setTeamId(emergencyTeamInfo.getId());
- EmergencyTeamMemberInfo.setDelFlag(false);
- EmergencyTeamMemberInfo.setCreateUid(uid);
- EmergencyTeamMemberInfo.setGmtCreate(nowDate);
- });
- emergencyTeamMemberInfoService.addEmergencyTeamMember(memberInfoList);
+ for (EmergencyTeamFileInfo emergencyTeamFileInfo :fileInfoList){
+ emergencyTeamFileInfoService.addEmergencyTeamFile(emergencyTeamFileInfo);
+ }
+ }
- return new ResultVO(ResultCodes.OK);
+ private void addEmergencyTeamMember(Long teamId ,Long uid , Date nowDate , List<EmergencyTeamMemberReqDTO> emergencyTeamMemberReqDTOList){
+ List<EmergencyTeamMemberInfo> memberInfoList = BeanCopyUtils.copyBeanList(emergencyTeamMemberReqDTOList, EmergencyTeamMemberInfo.class);
+ memberInfoList.forEach(EmergencyTeamFileInfo -> {
+ EmergencyTeamFileInfo.setTeamId(teamId);
+ EmergencyTeamFileInfo.setDelFlag(false);
+ EmergencyTeamFileInfo.setCreateUid(uid);
+ EmergencyTeamFileInfo.setGmtCreate(nowDate);
+ });
+ for (EmergencyTeamMemberInfo emergencyTeamMemberInfo : memberInfoList){
+ emergencyTeamMemberInfoService.addEmergencyTeamMember(emergencyTeamMemberInfo);
+ }
}
@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);
@@ -140,9 +154,126 @@
return new ResultVO<>(ResultCodes.OK ,emergencyTeamDetailRespDTO);
}
+ @Override
+ public ResultVO updateEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
+ //查询是否存在
+ EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(uid);
+ if (emergencyTeamInfoDetailDO==null){
+ throw new EmergencyException(EmergencyResultCodes.TEAM_NOT_EXIST);
+ }else{
+ EmergencyTeamInfo emergencyTeamInfo = new EmergencyTeamInfo();
+ BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamInfo);
+ emergencyTeamInfo.setUpdateUid(uid);
+ emergencyTeamInfo.setGmtModitify(new Date());
+ emergencyTeamInfoService.updateEmergencyTeam(emergencyTeamInfo);
+ //修改应急队伍附件
+ updateEmergencyTeamFile(uid,emergencyTeamReqDTO.getId(),emergencyTeamReqDTO.getFileList());
+ }
+ return new ResultVO(ResultCodes.OK);
+ }
+
+ private void updateEmergencyTeamFile(Long uid ,Long teamId ,List<EmergencyTeamFileReqDTO> emergencyTeamFileReqDTOList){
+ Date nowDate = new Date();
+
+ List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList = emergencyTeamFileInfoService.selectByEmergencyTeamId(teamId);
+ List<Long> oldIdsList = emergencyTeamFileInfoDOList.stream().map(EmergencyTeamFileInfoDO::getId).collect(Collectors.toList());
+ List<Long> newIdsList = new ArrayList<>();
+
+ //新增的附件集合
+ List<EmergencyTeamFileInfo> addList = new ArrayList<>();
+ //删除的附件集合(id)
+ List<Long> deleteList = new ArrayList<>();
+ for (EmergencyTeamFileReqDTO emergencyTeamFileReqDTO : emergencyTeamFileReqDTOList){
+ //如果不存在id则表示页面新增的附件
+ if (emergencyTeamFileReqDTO.getId() == null){
+ EmergencyTeamFileInfo emergencyTeamFileInfo = new EmergencyTeamFileInfo();
+ BeanUtils.copyProperties(emergencyTeamFileReqDTO,emergencyTeamFileInfo);
+ emergencyTeamFileInfo.setDelFlag(false);
+ emergencyTeamFileInfo.setGmtCreate(nowDate);
+ emergencyTeamFileInfo.setCreateUid(uid);
+ emergencyTeamFileInfo.setTeamId(teamId);
+ addList.add(emergencyTeamFileInfo);
+ }
+ //如果存在id则判断页面是否删除
+ else{
+ newIdsList.add(emergencyTeamFileReqDTO.getId());
+ }
+ }
+ for (Long oldId : oldIdsList){
+ if (!newIdsList.contains(oldId)){
+ deleteList.add(oldId);
+ }
+ }
+ if (!CollectionUtils.isEmpty(addList)){
+ for (EmergencyTeamFileInfo emergencyTeamFileInfo : addList){
+ emergencyTeamFileInfoService.addEmergencyTeamFile(emergencyTeamFileInfo);
+ }
+ }
+ if (!CollectionUtils.isEmpty(deleteList)){
+ emergencyTeamFileInfoService.deleteEmergencyTeamFileByIds(deleteList);
+ }
+ }
+
+ @Override
+ public ResultVO addEmergencyTeamMember(Long uid, EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO) {
+ EmergencyTeamMemberInfo emergencyTeamMemberInfo = new EmergencyTeamMemberInfo();
+ BeanUtils.copyProperties(emergencyTeamMemberReqDTO,emergencyTeamMemberInfo);
+ emergencyTeamMemberInfo.setCreateUid(uid);
+ emergencyTeamMemberInfo.setGmtCreate(new Date());
+ emergencyTeamMemberInfo.setDelFlag(false);
+ emergencyTeamMemberInfoService.addEmergencyTeamMember(emergencyTeamMemberInfo);
+ return new ResultVO(ResultCodes.OK);
+ }
+
+ @Override
+ public ResultVO updateEmergencyTeamMember(Long uid, EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO) {
+ //查询是否存在
+ EmergencyTeamMemberInfoDO emergencyTeamMemberInfoDO = emergencyTeamMemberInfoService.selectEmergencyTeamMemberById(emergencyTeamMemberReqDTO.getId());
+ if (emergencyTeamMemberInfoDO==null){
+ throw new EmergencyException(EmergencyResultCodes.TEAM_USER_NOT_EXIST);
+ }else{
+ EmergencyTeamMemberInfo emergencyTeamMemberInfo = new EmergencyTeamMemberInfo();
+ BeanUtils.copyProperties(emergencyTeamMemberReqDTO,emergencyTeamMemberInfo);
+ emergencyTeamMemberInfo.setUpdateUid(uid);
+ emergencyTeamMemberInfo.setGmtModitify(new Date());
+ emergencyTeamMemberInfoService.updateEmergencyTeamMember(emergencyTeamMemberInfo);
+ }
+ return new ResultVO(ResultCodes.OK);
+ }
+
+ @Override
+ public ResultVO deleteEmergencyTeam(Long id) {
+ //查询是否存在
+ EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(id);
+ if (emergencyTeamInfoDetailDO==null){
+ throw new EmergencyException(EmergencyResultCodes.TEAM_NOT_EXIST);
+ }else{
+ Long teamId = emergencyTeamInfoDetailDO.getId();
+ //删除人员
+ emergencyTeamMemberInfoService.deleteEmergencyTeamMemberByTeamId(teamId);
+ //删除附件
+ emergencyTeamFileInfoService.deleteEmergencyTeamFileByTeamId(teamId);
+ //删除应急队伍
+ emergencyTeamInfoService.deleteEmergencyTeamById(teamId);
+ }
+ return new ResultVO(ResultCodes.OK);
+ }
+
+ @Override
+ public ResultVO deleteEmergencyTeamMember(Long id) {
+ //查询是否存在
+ EmergencyTeamMemberInfoDO emergencyTeamMemberInfoDO = emergencyTeamMemberInfoService.selectEmergencyTeamMemberById(id);
+ if (emergencyTeamMemberInfoDO==null){
+ throw new EmergencyException(EmergencyResultCodes.TEAM_USER_NOT_EXIST);
+ }else{
+ emergencyTeamMemberInfoService.deleteEmergencyTeamMemberById(id);
+ }
+ return new ResultVO(ResultCodes.OK);
+ }
+
+
/**
* 验证必填项
- *
* @return
*/
private void checkRequired(EmergencyTeamReqDTO emergencyTeamReqDTO) {
@@ -159,7 +290,6 @@
throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL);
}
//负责人部门
-
if (emergencyTeamReqDTO.getPrincipalDepartmentId() == null || emergencyTeamReqDTO.getPrincipalDepartmentId() == 0) {
throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_DEPARTMENT_NULL);
}
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml
index 92eccd9..d270679 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml
@@ -39,4 +39,15 @@
)
</insert>
+ <update id = "deleteEmergencyTeamFileByIds" >
+ update emergency_team_file set del_flag = 1 where id in
+ <foreach item="id" collection="ids" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </update>
+
+ <update id="deleteEmergencyTeamFileByTeamId">
+ update emergency_team_file set del_flag = 1 where team_id = #{teamId}
+ </update>
+
</mapper>
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml
index 94d5405..8cc914f 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml
@@ -6,59 +6,63 @@
<resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO" id="emergencyTeamInfoPageDOResult">
<id column="id" property="id" jdbcType="BIGINT"/>
- <result column="team_level" property="teamLevel" />
- <result column="team_name" property="teamName" />
- <result column="principal_phone" property="principalPhone" />
- <result column="team_desc" property="teamDesc" />
+ <result column="team_level" property="teamLevel"/>
+ <result column="team_name" property="teamName"/>
+ <result column="principal_phone" property="principalPhone"/>
+ <result column="team_desc" property="teamDesc"/>
</resultMap>
<select id="selectEmergencyTeamList" resultMap="emergencyTeamInfoPageDOResult">
select id,`team_level`,`team_name`,`principal_phone`,`team_desc` from emergency_team where del_flag = 0
- <if test="query.teamName != null and query.teamName != ''"> and `team_name` like concat('%', #{query.teamName}, '%')</if>
- <if test="query.teamLevel != null and query.teamLevel != ''"> and `team_level` = #{query.teamLevel}</if>
+ <if test="query.teamName != null and query.teamName != ''">and `team_name` like concat('%', #{query.teamName},'%')</if>
+ <if test="query.teamLevel != null and query.teamLevel != ''">and `team_level` = #{query.teamLevel}</if>
</select>
- <insert id="addEmergencyTeam" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo" keyProperty="id" useGeneratedKeys="true">
- insert into emergency_team(
- <if test="id != null ">id,</if>
- <if test="delFlag != null ">del_flag,</if>
- <if test="gmtCreate != null ">gmt_create,</if>
- <if test="gmtModitify != null ">gmt_moditify,</if>
- <if test="createUid != null ">create_uid,</if>
- <if test="updateUid != null ">update_uid,</if>
- <if test="principalUid != null ">principal_uid,</if>
- <if test="principalDepartmentId != null ">principal_department_id,</if>
- <if test="teamLevel != null and teamLevel != ''">team_level,</if>
- <if test="teamName != null and teamName != ''">team_name,</if>
- <if test="principalPhone != null and principalPhone != ''">principal_phone,</if>
- <if test="telephoneNumber != null and telephoneNumber != ''">telephone_number,</if>
- <if test="teamDesc != null and teamDesc != ''">team_desc</if>
- )values(
- <if test="id != null ">#{id},</if>
- <if test="delFlag != null ">#{delFlag},</if>
- <if test="gmtCreate != null ">#{gmtCreate},</if>
- <if test="gmtModitify != null ">#{gmtModitify},</if>
- <if test="createUid != null ">#{createUid},</if>
- <if test="updateUid != null ">#{updateUid},</if>
- <if test="principalUid != null ">#{principalUid},</if>
- <if test="principalDepartmentId != null ">#{principalDepartmentId},</if>
- <if test="teamLevel != null and teamLevel != ''">#{teamLevel},</if>
- <if test="teamName != null and teamName != ''">#{teamName},</if>
- <if test="principalPhone != null and principalPhone != ''">#{principalPhone},</if>
- <if test="telephoneNumber != null and telephoneNumber != ''">#{telephoneNumber},</if>
- <if test="teamDesc != null and teamDesc != ''">#{teamDesc}</if>
- )
+ <insert id="addEmergencyTeam" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo"
+ keyProperty="id" useGeneratedKeys="true">
+ insert into emergency_team
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null ">id,</if>
+ <if test="delFlag != null ">del_flag,</if>
+ <if test="gmtCreate != null ">gmt_create,</if>
+ <if test="gmtModitify != null ">gmt_moditify,</if>
+ <if test="createUid != null ">create_uid,</if>
+ <if test="updateUid != null ">update_uid,</if>
+ <if test="principalUid != null ">principal_uid,</if>
+ <if test="principalDepartmentId != null ">principal_department_id,</if>
+ <if test="teamLevel != null and teamLevel != ''">team_level,</if>
+ <if test="teamName != null and teamName != ''">team_name,</if>
+ <if test="principalPhone != null and principalPhone != ''">principal_phone,</if>
+ <if test="telephoneNumber != null and telephoneNumber != ''">telephone_number,</if>
+ <if test="teamDesc != null and teamDesc != ''">team_desc,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null ">#{id},</if>
+ <if test="delFlag != null ">#{delFlag},</if>
+ <if test="gmtCreate != null ">#{gmtCreate},</if>
+ <if test="gmtModitify != null ">#{gmtModitify},</if>
+ <if test="createUid != null ">#{createUid},</if>
+ <if test="updateUid != null ">#{updateUid},</if>
+ <if test="principalUid != null ">#{principalUid},</if>
+ <if test="principalDepartmentId != null ">#{principalDepartmentId},</if>
+ <if test="teamLevel != null and teamLevel != ''">#{teamLevel},</if>
+ <if test="teamName != null and teamName != ''">#{teamName},</if>
+ <if test="principalPhone != null and principalPhone != ''">#{principalPhone},</if>
+ <if test="telephoneNumber != null and telephoneNumber != ''">#{telephoneNumber},</if>
+ <if test="teamDesc != null and teamDesc != ''">#{teamDesc},</if>
+ </trim>
</insert>
- <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoDetailDO" id="emergencyTeamInfoDetailDOResult">
+ <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoDetailDO"
+ id="emergencyTeamInfoDetailDOResult">
<id column="id" property="id" jdbcType="BIGINT"/>
- <result column="principal_uid" property="principalUid" />
- <result column="principal_department_id" property="principalDepartmentId" />
- <result column="team_level" property="teamLevel" />
- <result column="team_name" property="teamName" />
- <result column="principal_phone" property="principalPhone" />
- <result column="telephone_number" property="telephoneNumber" />
- <result column="team_desc" property="teamDesc" />
+ <result column="principal_uid" property="principalUid"/>
+ <result column="principal_department_id" property="principalDepartmentId"/>
+ <result column="team_level" property="teamLevel"/>
+ <result column="team_name" property="teamName"/>
+ <result column="principal_phone" property="principalPhone"/>
+ <result column="telephone_number" property="telephoneNumber"/>
+ <result column="team_desc" property="teamDesc"/>
</resultMap>
<select id="selectEmergencyTeamById" resultMap="emergencyTeamInfoDetailDOResult">
@@ -66,4 +70,26 @@
from emergency_team where del_flag = 0 and id = #{id}
</select>
+ <update id="updateEmergencyTeam" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo">
+ update emergency_team
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="gmtCreate != null ">gmt_create = #{gmtCreate},</if>
+ <if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
+ <if test="createUid != null ">create_uid = #{createUid},</if>
+ <if test="updateUid != null ">update_uid = #{updateUid},</if>
+ <if test="principalUid != null ">principal_uid = #{principalUid},</if>
+ <if test="principalDepartmentId != null ">principal_department_id = #{principalDepartmentId},</if>
+ <if test="teamLevel != null and teamLevel != ''">team_level = #{teamLevel},</if>
+ <if test="teamName != null and teamName != ''">team_name = #{teamName},</if>
+ <if test="principalPhone != null and principalPhone != ''">principal_phone = #{principalPhone},</if>
+ <if test="telephoneNumber != null and telephoneNumber != ''">telephone_number = #{telephoneNumber},</if>
+ <if test="teamDesc != null and teamDesc != ''">team_desc = #{teamDesc},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <update id="deleteEmergencyTeamById">
+ update emergency_team set del_flag = 1 where id = #{teamId}
+ </update>
+
</mapper>
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml
index a55b8e1..db36582 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml
@@ -5,51 +5,84 @@
<mapper namespace="com.gkhy.safePlatform.emergency.repository.EmergencyTeamMemberInfoRepository">
<insert id="addEmergencyTeamMember" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo">
- insert into emergency_team_Member(
- <if test="id != null ">id,</if>
- <if test="delFlag != null ">del_flag,</if>
- <if test="gmtCreate != null ">gmt_create,</if>
- <if test="gmtModitify != null ">gmt_moditify,</if>
- <if test="createUid != null ">create_uid,</if>
- <if test="updateUid != null ">update_uid,</if>
- <if test="teamId != null ">team_id,</if>
- <if test="userUid != null ">user_uid,</if>
- <if test="gender != null ">gender,</if>
- <if test="jobNumber != null and jobNumber != ''">job_number,</if>
- <if test="name != null and name != ''">`name`,</if>
- <if test="phone != null and phone != ''">phone,</if>
- <if test="position != null and position != ''">`position`</if>
- )values(
- <if test="id != null ">#{id},</if>
- <if test="delFlag != null ">#{delFlag},</if>
- <if test="gmtCreate != null ">#{gmtCreate},</if>
- <if test="gmtModitify != null ">#{gmtModitify},</if>
- <if test="createUid != null ">#{createUid},</if>
- <if test="updateUid != null ">#{updateUid},</if>
-
- <if test="teamId != null ">#{teamId},</if>
- <if test="userUid != null ">#{userUid},</if>
- <if test="gender != null ">#{gender},</if>
- <if test="jobNumber != null and jobNumber != ''">#{jobNumber},</if>
- <if test="name != null and name != ''">#{name},</if>
- <if test="phone != null and phone != ''">#{phone},</if>
- <if test="position != null and position != ''">#{position}</if>
- )
+ insert into emergency_team_member
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null ">id,</if>
+ <if test="delFlag != null ">del_flag,</if>
+ <if test="gmtCreate != null ">gmt_create,</if>
+ <if test="gmtModitify != null ">gmt_moditify,</if>
+ <if test="createUid != null ">create_uid,</if>
+ <if test="updateUid != null ">update_uid,</if>
+ <if test="teamId != null ">team_id,</if>
+ <if test="userUid != null ">user_uid,</if>
+ <if test="gender != null ">gender,</if>
+ <if test="jobNumber != null and jobNumber != ''">job_number,</if>
+ <if test="name != null and name != ''">`name`,</if>
+ <if test="phone != null and phone != ''">phone,</if>
+ <if test="position != null and position != ''">`position`</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null ">#{id},</if>
+ <if test="delFlag != null ">#{delFlag},</if>
+ <if test="gmtCreate != null ">#{gmtCreate},</if>
+ <if test="gmtModitify != null ">#{gmtModitify},</if>
+ <if test="createUid != null ">#{createUid},</if>
+ <if test="updateUid != null ">#{updateUid},</if>
+ <if test="teamId != null ">#{teamId},</if>
+ <if test="userUid != null ">#{userUid},</if>
+ <if test="gender != null ">#{gender},</if>
+ <if test="jobNumber != null and jobNumber != ''">#{jobNumber},</if>
+ <if test="name != null and name != ''">#{name},</if>
+ <if test="phone != null and phone != ''">#{phone},</if>
+ <if test="position != null and position != ''">#{position}</if>
+ </trim>
</insert>
- <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO" id="emergencyTeamMemberInfoDOResult">
+ <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO"
+ id="emergencyTeamMemberInfoDOResult">
<id column="id" property="id" jdbcType="BIGINT"/>
- <result column="team_id" property="teamId" />
- <result column="user_uid" property="userUid" />
- <result column="gender" property="gender" />
- <result column="job_number" property="jobNumber" />
- <result column="name" property="name" />
- <result column="phone" property="phone" />
- <result column="position" property="position" />
+ <result column="team_id" property="teamId"/>
+ <result column="user_uid" property="userUid"/>
+ <result column="gender" property="gender"/>
+ <result column="job_number" property="jobNumber"/>
+ <result column="name" property="name"/>
+ <result column="phone" property="phone"/>
+ <result column="position" property="position"/>
</resultMap>
<select id="selectByEmergencyTeamId" resultMap="emergencyTeamMemberInfoDOResult">
- select id ,team_id ,user_uid ,gender ,job_number ,`name` ,phone ,`position` from emergency_team_Member where del_flag = 0 and team_id = #{teamId}
+ select id ,team_id ,user_uid ,gender ,job_number ,`name` ,phone ,`position` from emergency_team_member where del_flag = 0 and team_id = #{teamId}
</select>
+ <select id="selectEmergencyTeamMemberById" resultMap="emergencyTeamMemberInfoDOResult">
+ select id ,team_id ,user_uid ,gender ,job_number ,`name` ,phone ,`position` from emergency_team_member where del_flag = 0 and id = #{id}
+ </select>
+
+ <update id="updateEmergencyTeamMember"
+ parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo">
+ update emergency_team_member
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="gmtCreate != null ">gmt_create = #{gmtCreate},</if>
+ <if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
+ <if test="createUid != null ">create_uid = #{createUid},</if>
+ <if test="updateUid != null ">update_uid = #{updateUid},</if>
+ <if test="teamId != null ">team_id = #{teamId},</if>
+ <if test="userUid != null ">user_uid = #{userUid},</if>
+ <if test="gender != null ">gender = #{gender},</if>
+ <if test="jobNumber != null and jobNumber != ''">job_number = #{jobNumber},</if>
+ <if test="name != null and name != ''">`name` = #{name},</if>
+ <if test="phone != null and phone != ''">phone = #{phone},</if>
+ <if test="position != null and position != ''">`position` = #{position},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <update id="deleteEmergencyTeamMemberByTeamId">
+ update emergency_team_member set del_flag = 1 where team_id = #{teamId}
+ </update>
+
+ <update id="deleteEmergencyTeamMemberById">
+ update emergency_team_member set del_flag = 1 where id = #{id}
+ </update>
+
</mapper>
--
Gitblit v1.9.2