songhuangfeng123
2022-07-05 92edf51b040f057afa1fece88e0fbcd559baa27f
初始化运行
已修改22个文件
已添加2个文件
304 ■■■■ 文件已修改
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfo.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfoDO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamFileInfoRepository.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamMemberInfoRepository.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamFileInfoService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamMemberInfoService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamFileInfoServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamMemberInfoServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
@@ -18,15 +18,15 @@
    private Date gmtModitify;
    private String createUid;
    private Long createUid;
    private String updateUid;
    private Long updateUid;
    private Byte statue;
    private Date releaseDate;
    private String authorUid;
    private Long authorUid;
    private Long authorDeptId;
@@ -70,19 +70,19 @@
        this.gmtModitify = gmtModitify;
    }
    public String getCreateUid() {
    public Long getCreateUid() {
        return createUid;
    }
    public void setCreateUid(String createUid) {
    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }
    public String getUpdateUid() {
    public Long getUpdateUid() {
        return updateUid;
    }
    public void setUpdateUid(String updateUid) {
    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }
@@ -102,11 +102,11 @@
        this.releaseDate = releaseDate;
    }
    public String getAuthorUid() {
    public Long getAuthorUid() {
        return authorUid;
    }
    public void setAuthorUid(String authorUid) {
    public void setAuthorUid(Long authorUid) {
        this.authorUid = authorUid;
    }
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java
@@ -16,7 +16,7 @@
    private Date releaseDate;
    private String authorUid;
    private Long authorUid;
    private Long authorDeptId;
@@ -52,11 +52,11 @@
        this.releaseDate = releaseDate;
    }
    public String getAuthorUid() {
    public Long getAuthorUid() {
        return authorUid;
    }
    public void setAuthorUid(String authorUid) {
    public void setAuthorUid(Long authorUid) {
        this.authorUid = authorUid;
    }
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfo.java
@@ -18,9 +18,9 @@
    private Date gmtModitify;
    private String createUid;
    private Long createUid;
    private String updateUid;
    private Long updateUid;
    private Long teamId;
@@ -60,19 +60,19 @@
        this.gmtModitify = gmtModitify;
    }
    public String getCreateUid() {
    public Long getCreateUid() {
        return createUid;
    }
    public void setCreateUid(String createUid) {
    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }
    public String getUpdateUid() {
    public Long getUpdateUid() {
        return updateUid;
    }
    public void setUpdateUid(String updateUid) {
    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java
@@ -18,11 +18,11 @@
    private Date gmtModitify;
    private String createUid;
    private Long createUid;
    private String updateUid;
    private Long updateUid;
    private String principalUid;
    private Long principalUid;
    private Long principalDepartmentId;
@@ -68,27 +68,27 @@
        this.gmtModitify = gmtModitify;
    }
    public String getCreateUid() {
    public Long getCreateUid() {
        return createUid;
    }
    public void setCreateUid(String createUid) {
    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }
    public String getUpdateUid() {
    public Long getUpdateUid() {
        return updateUid;
    }
    public void setUpdateUid(String updateUid) {
    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }
    public String getPrincipalUid() {
    public Long getPrincipalUid() {
        return principalUid;
    }
    public void setPrincipalUid(String principalUid) {
    public void setPrincipalUid(Long principalUid) {
        this.principalUid = principalUid;
    }
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java
@@ -17,7 +17,7 @@
    private Date releaseDate;
    private String authorUid;
    private Long authorUid;
    private Long authorDeptId;
@@ -53,11 +53,11 @@
        this.releaseDate = releaseDate;
    }
    public String getAuthorUid() {
    public Long getAuthorUid() {
        return authorUid;
    }
    public void setAuthorUid(String authorUid) {
    public void setAuthorUid(Long authorUid) {
        this.authorUid = authorUid;
    }
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java
@@ -18,13 +18,13 @@
    private Date gmtModitify;
    private String createUid;
    private Long createUid;
    private String updateUid;
    private Long updateUid;
    private Long teamId;
    private String userUid;
    private Long userUid;
    private Byte gender;
@@ -68,19 +68,19 @@
        this.gmtModitify = gmtModitify;
    }
    public String getCreateUid() {
    public Long getCreateUid() {
        return createUid;
    }
    public void setCreateUid(String createUid) {
    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }
    public String getUpdateUid() {
    public Long getUpdateUid() {
        return updateUid;
    }
    public void setUpdateUid(String updateUid) {
    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }
@@ -92,11 +92,11 @@
        this.teamId = teamId;
    }
    public String getUserUid() {
    public Long getUserUid() {
        return userUid;
    }
    public void setUserUid(String userUid) {
    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfoDO.java
@@ -12,7 +12,7 @@
    private Long teamId;
    private String userUid;
    private Long userUid;
    private Byte gender;
@@ -41,11 +41,11 @@
        this.teamId = teamId;
    }
    public String getUserUid() {
    public Long getUserUid() {
        return userUid;
    }
    public void setUserUid(String userUid) {
    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java
@@ -7,7 +7,7 @@
    private Long teamId;
    private String userUid;
    private Long userUid;
    private Byte gender;
@@ -35,11 +35,11 @@
        this.teamId = teamId;
    }
    public String getUserUid() {
    public Long getUserUid() {
        return userUid;
    }
    public void setUserUid(String userUid) {
    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
@@ -6,7 +6,7 @@
    private Long id;
    private String principalUid;
    private Long principalUid;
    private Long principalDepartmentId;
@@ -32,11 +32,11 @@
        this.id = id;
    }
    public String getPrincipalUid() {
    public Long getPrincipalUid() {
        return principalUid;
    }
    public void setPrincipalUid(String principalUid) {
    public void setPrincipalUid(Long principalUid) {
        this.principalUid = principalUid;
    }
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java
@@ -7,7 +7,7 @@
    private Long teamId;
    private String userUid;
    private Long userUid;
    private Byte gender;
@@ -35,11 +35,11 @@
        this.teamId = teamId;
    }
    public String getUserUid() {
    public Long getUserUid() {
        return userUid;
    }
    public void setUserUid(String userUid) {
    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java
@@ -13,5 +13,7 @@
@Repository
public interface EmergencyPlanInfoRepository extends BaseMapper<EmergencyPlanInfo> {
    List<EmergencyPlanInfoPageDO> selectEmergencyPlanList(Page<EmergencyPlanInfoPageDO> page, @Param("query") EmergencyPlanDBQuery emergencyPlanDBQuery);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamFileInfoRepository.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -11,7 +12,7 @@
@Repository
public interface EmergencyTeamFileInfoRepository extends BaseMapper<EmergencyTeamFileInfo> {
    List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(Long id);
    List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(@Param("teamId") Long teamId);
    void addEmergencyTeamFile(List<EmergencyTeamFileInfoDO> fileList);
    void addEmergencyTeamFile(EmergencyTeamFileInfo emergencyTeamFileInfoDO);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery;
@@ -16,5 +16,5 @@
    List<EmergencyTeamInfoPageDO> selectEmergencyTeamList(Page<EmergencyTeamInfoPageDO> page, @Param("query") EmergencyTeamDBQuery emergencyTeamDBQuery);
    void addEmergencyTeam(EmergencyTeamFileInfoDO emergencyTeamFileInfoDO);
    void addEmergencyTeam(EmergencyTeamFileInfo emergencyTeamFileInfo);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamMemberInfoRepository.java
@@ -2,13 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface EmergencyTeamMemberInfoRepository extends BaseMapper<EmergencyTeamMemberInfo> {
    void addEmergencyTeamMember(List<EmergencyTeamMemberInfoDO> memberList);
    void addEmergencyTeamMember(EmergencyTeamMemberInfo emergencyTeamMemberInfo);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamFileInfoService.java
@@ -11,5 +11,5 @@
    List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(Long id);
    void addEmergencyTeamFile(List<EmergencyTeamFileInfoDO> fileList);
    void addEmergencyTeamFile(List<EmergencyTeamFileInfo> fileList);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery;
@@ -14,5 +14,5 @@
    List<EmergencyTeamInfoPageDO> selectEmergencyTeamList(Page<EmergencyTeamInfoPageDO> page, EmergencyTeamDBQuery emergencyTeamDBQuery);
    void addEmergencyTeam(EmergencyTeamFileInfoDO emergencyTeamFileInfoDO);
    void addEmergencyTeam(EmergencyTeamFileInfo emergencyTeamFileInfo);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamMemberInfoService.java
@@ -2,13 +2,12 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO;
import java.util.List;
public interface EmergencyTeamMemberInfoService extends IService<EmergencyTeamMemberInfo> {
    void addEmergencyTeamMember(List<EmergencyTeamMemberInfoDO> memberList);
    void addEmergencyTeamMember(List<EmergencyTeamMemberInfo> memberList);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamFileInfoServiceImpl.java
@@ -26,8 +26,10 @@
    }
    @Override
    public void addEmergencyTeamFile(List<EmergencyTeamFileInfoDO> fileList) {
        emergencyTeamFileInfoRepository.addEmergencyTeamFile(fileList);
    public void addEmergencyTeamFile(List<EmergencyTeamFileInfo> fileList) {
        for (EmergencyTeamFileInfo emergencyTeamFileInfo : fileList){
            emergencyTeamFileInfoRepository.addEmergencyTeamFile(emergencyTeamFileInfo);
        }
    }
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery;
@@ -25,8 +25,8 @@
    }
    @Override
    public void addEmergencyTeam(EmergencyTeamFileInfoDO emergencyTeamFileInfoDO) {
        emergencyTeamInfoRepository.addEmergencyTeam(emergencyTeamFileInfoDO);
    public void addEmergencyTeam(EmergencyTeamFileInfo emergencyTeamFileInfo) {
        emergencyTeamInfoRepository.addEmergencyTeam(emergencyTeamFileInfo);
    }
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamMemberInfoServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO;
import com.gkhy.safePlatform.emergency.repository.EmergencyTeamMemberInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyTeamMemberInfoService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +17,9 @@
    private EmergencyTeamMemberInfoRepository emergencyTeamMemberInfoRepository;
    @Override
    public void addEmergencyTeamMember(List<EmergencyTeamMemberInfoDO> memberList) {
        emergencyTeamMemberInfoRepository.addEmergencyTeamMember(memberList);
    public void addEmergencyTeamMember(List<EmergencyTeamMemberInfo> memberList) {
        for (EmergencyTeamMemberInfo emergencyTeamMemberInfo : memberList){
            emergencyTeamMemberInfoRepository.addEmergencyTeamMember(emergencyTeamMemberInfo);
        }
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
@@ -7,10 +7,8 @@
import com.gkhy.safePlatform.commons.utils.StringUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO;
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyServiceException;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamFileRespDTO;
@@ -27,6 +25,7 @@
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Service("emergencyTeamService")
@@ -79,22 +78,33 @@
    @Override
    public ResultVO addEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
        Date nowDate = new Date();
        //必填项验证
        checkRequired(emergencyTeamReqDTO);
        //1.新增应急队伍
        EmergencyTeamFileInfoDO emergencyTeamFileInfoDO = new EmergencyTeamFileInfoDO();
        BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamFileInfoDO);
        emergencyTeamInfoService.addEmergencyTeam(emergencyTeamFileInfoDO);
        EmergencyTeamFileInfo emergencyTeamFileInfo = new EmergencyTeamFileInfo();
        BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamFileInfo);
        emergencyTeamFileInfo.setCreateUid(uid);
        emergencyTeamFileInfo.setGmtCreate(nowDate);
        emergencyTeamInfoService.addEmergencyTeam(emergencyTeamFileInfo);
        //2.新增应急队伍附件
        List<EmergencyTeamFileInfoDO> fileInfoDOList = new ArrayList<>();
        BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(),fileInfoDOList.getClass());
        fileInfoDOList.forEach(e->e.setTeamId(emergencyTeamFileInfoDO.getId()));
        emergencyTeamFileInfoService.addEmergencyTeamFile(fileInfoDOList);
        List<EmergencyTeamFileInfo> fileInfoList = new ArrayList<>();
        BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(),fileInfoList.getClass());
        fileInfoList.forEach(EmergencyTeamFileInfo -> {
            EmergencyTeamFileInfo.setTeamId(emergencyTeamFileInfo.getTeamId());
            EmergencyTeamFileInfo.setCreateUid(uid);
            EmergencyTeamFileInfo.setGmtCreate(nowDate);
        });
        emergencyTeamFileInfoService.addEmergencyTeamFile(fileInfoList);
        //3.新增应急队伍人员
        List<EmergencyTeamMemberInfoDO> memberInfoDOList = new ArrayList<>();
        BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(),memberInfoDOList.getClass());
        memberInfoDOList.forEach(e->e.setTeamId(emergencyTeamFileInfoDO.getId()));
        emergencyTeamMemberInfoService.addEmergencyTeamMember(memberInfoDOList);
        List<EmergencyTeamMemberInfo> memberInfoList = new ArrayList<>();
        BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(),memberInfoList.getClass());
        memberInfoList.forEach(EmergencyTeamMemberInfo -> {
            EmergencyTeamMemberInfo.setTeamId(emergencyTeamFileInfo.getTeamId());
            EmergencyTeamMemberInfo.setCreateUid(uid);
            EmergencyTeamMemberInfo.setGmtCreate(nowDate);
        });
        emergencyTeamMemberInfoService.addEmergencyTeamMember(memberInfoList);
        return ResultVO.success();
    }
@@ -113,7 +123,7 @@
            throw new EmergencyServiceException(EmergencyResultCodes.TEAM_LEVEL_NULL);
        }
        //负责人
        if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalUid())){
        if(emergencyTeamReqDTO.getPrincipalUid() == null || emergencyTeamReqDTO.getPrincipalUid() == 0){
            throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL);
        }
        //负责人部门
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml
对比新文件
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.safePlatform.emergency.repository.EmergencyTeamFileInfoRepository">
    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO" id="emergencyTeamFileInfoDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="team_id" property="teamId" />
        <result column="file_url" property="fileUrl" />
        <result column="file_name" property="fileName" />
    </resultMap>
    <select id="selectByEmergencyTeamId" resultMap="emergencyTeamFileInfoDOResult">
        select id,`team_id`,`file_url`,`file_name` from emergency_team_file where del_flag = 0 and team_id = #{teamId}
    </select>
    <insert id="addEmergencyTeamFile" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo">
        insert into emergency_team_file(
        <if test="id != null ">id,</if>
        <if test="delFlag != null ">del_flag,</if>
        <if test="gmtCreate != null and gmtCreate != ''">gmt_create,</if>
        <if test="gmtModitify != null and gmtModitify != ''">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="fileUrl != null and fileUrl != ''">file_url,</if>
        <if test="fileName != null and fileName != ''">file_name,</if>
        )values(
        <if test="id != null ">#{id},</if>
        <if test="delFlag != null ">#{delFlag},</if>
        <if test="gmtCreate != null and gmtCreate != ''">#{gmtCreate},</if>
        <if test="gmtModitify != null and gmtModitify != ''">#{gmtModitify},</if>
        <if test="createUid != null ">#{createUid},</if>
        <if test="updateUid != null ">#{updateUid},</if>
        <if test="teamId != null ">#{teamId},</if>
        <if test="fileUrl != null and fileUrl != ''">#{fileUrl},</if>
        <if test="fileName != null and fileName != ''">#{fileName},</if>
        )
    </insert>
</mapper>
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml
@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.safePlatform.emergency.repository.EmergencyTeamInfoRepository">
    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO" id="pageResult">
    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO" id="emergencyTeamInfoPageResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="team_level" property="teamLevel" />
        <result column="team_name" property="teamName" />
@@ -12,10 +12,42 @@
        <result column="team_desc" property="teamDesc" />
    </resultMap>
    <select id="selectEmergencyTeamList" resultMap="pageResult">
    <select id="selectEmergencyTeamList" resultMap="emergencyTeamInfoPageResult">
        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>
    </select>
    <insert id="addEmergencyTeam" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo">
        insert into emergency_team(
        <if test="id != null ">id,</if>
        <if test="delFlag != null ">del_flag,</if>
        <if test="gmtCreate != null and gmtCreate != ''">gmt_create,</if>
        <if test="gmtModitify != null and gmtModitify != ''">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 and gmtCreate != ''">#{gmtCreate},</if>
        <if test="gmtModitify != null and gmtModitify != ''">#{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>
</mapper>
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml
对比新文件
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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 and gmtCreate != ''">gmt_create,</if>
        <if test="gmtModitify != null and gmtModitify != ''">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 and gmtCreate != ''">#{gmtCreate},</if>
        <if test="gmtModitify != null and gmtModitify != ''">#{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>
</mapper>