应急演练实施评价

songhuangfeng123

2022-07-13 32ad753d4e87c244918c83ec3870f32179a0ff98

应急演练实施评价

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillEvaluationController.java

对比新文件
@@ -0,0 +1,66 @@
package com.gkhy.safePlatform.emergency.controller;

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.EmergencyDrillEvaluationReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillEvaluationDetailRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillEvaluationPageRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillEvaluationQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyDrillEvaluationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.security.Principal;
import java.util.List;

@RestController
@RequestMapping("/emergencyDrillEvaluation")
public class EmergencyDrillEvaluationController {

    @Autowired
    private EmergencyDrillEvaluationService emergencyDrillEvaluationService;

    /**
     * 应急演练计划列表
     */
    @RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
    private ResultVO<List<EmergencyDrillEvaluationPageRespDTO>> list (@RequestBody PageQuery<EmergencyDrillEvaluationQuery> pageQuery){
        PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize());
        return  emergencyDrillEvaluationService.selectEmergencyDrillEvaluationList(pageQuery);
    }

    /**
     * 应急演练计划新增
     */
    @RequestMapping(value = "/add",method = RequestMethod.POST)
    public ResultVO addEmergencyDrillEvaluation(Principal principal, @RequestBody EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
        String uid = principal.getName();
        return emergencyDrillEvaluationService.addEmergencyDrillEvaluation(Long.valueOf(uid), emergencyDrillEvaluationReqDTO);
    }

    /**
     * 应急演练计划详情
     */
    @RequestMapping(value = "/info/{id}",method = RequestMethod.GET)
    public ResultVO<EmergencyDrillEvaluationDetailRespDTO> getEmergencyDrillEvaluationById(@PathVariable("id")Long id){
        return emergencyDrillEvaluationService.getEmergencyDrillEvaluationById(id);
    }

    /**
     * 应急演练计划修改
     */
    @RequestMapping(value = "/update",method = RequestMethod.POST)
    public ResultVO updateEmergencyDrillEvaluation(Principal principal, @RequestBody EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
        String uid = principal.getName();
        return emergencyDrillEvaluationService.updateEmergencyDrillEvaluation(Long.valueOf(uid), emergencyDrillEvaluationReqDTO);
    }

    /**
     * 应急演练计划删除/批量删除
     */
    @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
    public ResultVO batchDeleteEmergencyDrillEvaluation(@PathVariable("ids")String ids){
        return emergencyDrillEvaluationService.batchDeleteEmergencyDrillEvaluation(ids);
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationFileInfo.java

对比新文件
@@ -0,0 +1,117 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("emergency_drill_evaluation_file")
public class EmergencyDrillEvaluationFileInfo {

    @TableId(type = IdType.AUTO)
    private Long id;

    private Boolean delFlag;

    private Date gmtCreate;

    private Date gmtModitify;

    private Long createUid;

    private Long updateUid;

    private Long drillEvaluationId;

    private String fileUrl;

    private String fileName;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Boolean getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(Boolean delFlag) {
        this.delFlag = delFlag;
    }

    public Date getGmtCreate() {
        return gmtCreate;
    }

    public void setGmtCreate(Date gmtCreate) {
        this.gmtCreate = gmtCreate;
    }

    public Date getGmtModitify() {
        return gmtModitify;
    }

    public void setGmtModitify(Date gmtModitify) {
        this.gmtModitify = gmtModitify;
    }

    public Long getCreateUid() {
        return createUid;
    }

    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }

    public Long getUpdateUid() {
        return updateUid;
    }

    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }

    public Long getDrillEvaluationId() {
        return drillEvaluationId;
    }

    public void setDrillEvaluationId(Long drillEvaluationId) {
        this.drillEvaluationId = drillEvaluationId;
    }

    public String getFileUrl() {
        return fileUrl;
    }

    public void setFileUrl(String fileUrl) {
        this.fileUrl = fileUrl;
    }

    public String getFileName() {
        return fileName;
    }

    public void setFileName(String fileName) {
        this.fileName = fileName;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationFileInfo{" +
                "id=" + id +
                ", delFlag=" + delFlag +
                ", gmtCreate=" + gmtCreate +
                ", gmtModitify=" + gmtModitify +
                ", createUid=" + createUid +
                ", updateUid=" + updateUid +
                ", drillEvaluationId=" + drillEvaluationId +
                ", fileUrl='" + fileUrl + '\'' +
                ", fileName='" + fileName + '\'' +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationFileInfoDO.java

对比新文件
@@ -0,0 +1,63 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("emergency_drill_evaluation_file")
public class EmergencyDrillEvaluationFileInfoDO {

    @TableId(type = IdType.AUTO)
    private Long id;


    private Long drillEvaluationId;

    private String fileUrl;

    private String fileName;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getDrillEvaluationId() {
        return drillEvaluationId;
    }

    public void setDrillEvaluationId(Long drillEvaluationId) {
        this.drillEvaluationId = drillEvaluationId;
    }

    public String getFileUrl() {
        return fileUrl;
    }

    public void setFileUrl(String fileUrl) {
        this.fileUrl = fileUrl;
    }

    public String getFileName() {
        return fileName;
    }

    public void setFileName(String fileName) {
        this.fileName = fileName;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationFileInfo{" +
                "id=" + id +
                ", drillEvaluationId=" + drillEvaluationId +
                ", fileUrl='" + fileUrl + '\'' +
                ", fileName='" + fileName + '\'' +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java

对比新文件
@@ -0,0 +1,260 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("emergency_drill_evaluation")
public class EmergencyDrillEvaluationInfo {

    @TableId(type = IdType.AUTO)
    private Long id;

    private Boolean delFlag;

    private Date gmtCreate;

    private Date gmtModitify;

    private Long createUid;

    private Long updateUid;

    private Long drillPlanId;

    private String suitable;

    private String sufficient;

    private String arrival;

    private String supplies;

    private String protection;

    private String whole;

    private String division;

    private String effect;

    private String report;

    private String safety;

    private String rescue;

    private String evacuate;

    private Boolean needModify;

    private String questionAndImprove;

    private String modifyContent;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Boolean getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(Boolean delFlag) {
        this.delFlag = delFlag;
    }

    public Date getGmtCreate() {
        return gmtCreate;
    }

    public void setGmtCreate(Date gmtCreate) {
        this.gmtCreate = gmtCreate;
    }

    public Date getGmtModitify() {
        return gmtModitify;
    }

    public void setGmtModitify(Date gmtModitify) {
        this.gmtModitify = gmtModitify;
    }

    public Long getCreateUid() {
        return createUid;
    }

    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }

    public Long getUpdateUid() {
        return updateUid;
    }

    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }

    public Long getDrillPlanId() {
        return drillPlanId;
    }

    public void setDrillPlanId(Long drillPlanId) {
        this.drillPlanId = drillPlanId;
    }

    public String getSuitable() {
        return suitable;
    }

    public void setSuitable(String suitable) {
        this.suitable = suitable;
    }

    public String getSufficient() {
        return sufficient;
    }

    public void setSufficient(String sufficient) {
        this.sufficient = sufficient;
    }

    public String getArrival() {
        return arrival;
    }

    public void setArrival(String arrival) {
        this.arrival = arrival;
    }

    public String getSupplies() {
        return supplies;
    }

    public void setSupplies(String supplies) {
        this.supplies = supplies;
    }

    public String getProtection() {
        return protection;
    }

    public void setProtection(String protection) {
        this.protection = protection;
    }

    public String getWhole() {
        return whole;
    }

    public void setWhole(String whole) {
        this.whole = whole;
    }

    public String getDivision() {
        return division;
    }

    public void setDivision(String division) {
        this.division = division;
    }

    public String getEffect() {
        return effect;
    }

    public void setEffect(String effect) {
        this.effect = effect;
    }

    public String getReport() {
        return report;
    }

    public void setReport(String report) {
        this.report = report;
    }

    public String getSafety() {
        return safety;
    }

    public void setSafety(String safety) {
        this.safety = safety;
    }

    public String getRescue() {
        return rescue;
    }

    public void setRescue(String rescue) {
        this.rescue = rescue;
    }

    public String getEvacuate() {
        return evacuate;
    }

    public void setEvacuate(String evacuate) {
        this.evacuate = evacuate;
    }

    public Boolean getNeedModify() {
        return needModify;
    }

    public void setNeedModify(Boolean needModify) {
        this.needModify = needModify;
    }

    public String getQuestionAndImprove() {
        return questionAndImprove;
    }

    public void setQuestionAndImprove(String questionAndImprove) {
        this.questionAndImprove = questionAndImprove;
    }

    public String getModifyContent() {
        return modifyContent;
    }

    public void setModifyContent(String modifyContent) {
        this.modifyContent = modifyContent;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationInfo{" +
                "id=" + id +
                ", delFlag=" + delFlag +
                ", gmtCreate=" + gmtCreate +
                ", gmtModitify=" + gmtModitify +
                ", createUid=" + createUid +
                ", updateUid=" + updateUid +
                ", drillPlanId=" + drillPlanId +
                ", suitable='" + suitable + '\'' +
                ", sufficient='" + sufficient + '\'' +
                ", arrival='" + arrival + '\'' +
                ", supplies='" + supplies + '\'' +
                ", protection='" + protection + '\'' +
                ", whole='" + whole + '\'' +
                ", division='" + division + '\'' +
                ", effect='" + effect + '\'' +
                ", report='" + report + '\'' +
                ", safety='" + safety + '\'' +
                ", rescue='" + rescue + '\'' +
                ", evacuate='" + evacuate + '\'' +
                ", needModify=" + needModify +
                ", questionAndImprove='" + questionAndImprove + '\'' +
                ", modifyContent='" + modifyContent + '\'' +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java

对比新文件
@@ -0,0 +1,203 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

@TableName("emergency_drill_evaluation")
public class EmergencyDrillEvaluationInfoDetailDO {

    @TableId(type = IdType.AUTO)
    private Long id;

    private Long drillPlanId;

    private String suitable;

    private String sufficient;

    private String arrival;

    private String supplies;

    private String protection;

    private String whole;

    private String division;

    private String effect;

    private String report;

    private String safety;

    private String rescue;

    private String evacuate;

    private Boolean needModify;

    private String questionAndImprove;

    private String modifyContent;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getDrillPlanId() {
        return drillPlanId;
    }

    public void setDrillPlanId(Long drillPlanId) {
        this.drillPlanId = drillPlanId;
    }

    public String getSuitable() {
        return suitable;
    }

    public void setSuitable(String suitable) {
        this.suitable = suitable;
    }

    public String getSufficient() {
        return sufficient;
    }

    public void setSufficient(String sufficient) {
        this.sufficient = sufficient;
    }

    public String getArrival() {
        return arrival;
    }

    public void setArrival(String arrival) {
        this.arrival = arrival;
    }

    public String getSupplies() {
        return supplies;
    }

    public void setSupplies(String supplies) {
        this.supplies = supplies;
    }

    public String getProtection() {
        return protection;
    }

    public void setProtection(String protection) {
        this.protection = protection;
    }

    public String getWhole() {
        return whole;
    }

    public void setWhole(String whole) {
        this.whole = whole;
    }

    public String getDivision() {
        return division;
    }

    public void setDivision(String division) {
        this.division = division;
    }

    public String getEffect() {
        return effect;
    }

    public void setEffect(String effect) {
        this.effect = effect;
    }

    public String getReport() {
        return report;
    }

    public void setReport(String report) {
        this.report = report;
    }

    public String getSafety() {
        return safety;
    }

    public void setSafety(String safety) {
        this.safety = safety;
    }

    public String getRescue() {
        return rescue;
    }

    public void setRescue(String rescue) {
        this.rescue = rescue;
    }

    public String getEvacuate() {
        return evacuate;
    }

    public void setEvacuate(String evacuate) {
        this.evacuate = evacuate;
    }

    public Boolean getNeedModify() {
        return needModify;
    }

    public void setNeedModify(Boolean needModify) {
        this.needModify = needModify;
    }

    public String getQuestionAndImprove() {
        return questionAndImprove;
    }

    public void setQuestionAndImprove(String questionAndImprove) {
        this.questionAndImprove = questionAndImprove;
    }

    public String getModifyContent() {
        return modifyContent;
    }

    public void setModifyContent(String modifyContent) {
        this.modifyContent = modifyContent;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationInfo{" +
                "id=" + id +
                ", drillPlanId=" + drillPlanId +
                ", suitable='" + suitable + '\'' +
                ", sufficient='" + sufficient + '\'' +
                ", arrival='" + arrival + '\'' +
                ", supplies='" + supplies + '\'' +
                ", protection='" + protection + '\'' +
                ", whole='" + whole + '\'' +
                ", division='" + division + '\'' +
                ", effect='" + effect + '\'' +
                ", report='" + report + '\'' +
                ", safety='" + safety + '\'' +
                ", rescue='" + rescue + '\'' +
                ", evacuate='" + evacuate + '\'' +
                ", needModify=" + needModify +
                ", questionAndImprove='" + questionAndImprove + '\'' +
                ", modifyContent='" + modifyContent + '\'' +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoPageDO.java

对比新文件
@@ -0,0 +1,40 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

@TableName("emergency_drill_evaluation")
public class EmergencyDrillEvaluationInfoPageDO {

    @TableId(type = IdType.AUTO)
    private Long id;

    private Long drillPlanId;


    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getDrillPlanId() {
        return drillPlanId;
    }

    public void setDrillPlanId(Long drillPlanId) {
        this.drillPlanId = drillPlanId;
    }


    @Override
    public String toString() {
        return "EmergencyDrillEvaluationInfo{" +
                "id=" + id +
                ", drillPlanId=" + drillPlanId +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationUserInfo.java

对比新文件
@@ -0,0 +1,107 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("emergency_drill_evaluation_user")
public class EmergencyDrillEvaluationUserInfo {

    @TableId(type = IdType.AUTO)
    private Long id;

    private Boolean delFlag;

    private Date gmtCreate;

    private Date gmtModitify;

    private Long createUid;

    private Long updateUid;

    private Long drillEvaluationId;

    private Long userUid;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Boolean getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(Boolean delFlag) {
        this.delFlag = delFlag;
    }

    public Date getGmtCreate() {
        return gmtCreate;
    }

    public void setGmtCreate(Date gmtCreate) {
        this.gmtCreate = gmtCreate;
    }

    public Date getGmtModitify() {
        return gmtModitify;
    }

    public void setGmtModitify(Date gmtModitify) {
        this.gmtModitify = gmtModitify;
    }

    public Long getCreateUid() {
        return createUid;
    }

    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }

    public Long getUpdateUid() {
        return updateUid;
    }

    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }

    public Long getDrillEvaluationId() {
        return drillEvaluationId;
    }

    public void setDrillEvaluationId(Long drillEvaluationId) {
        this.drillEvaluationId = drillEvaluationId;
    }

    public Long getUserUid() {
        return userUid;
    }

    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }


    @Override
    public String toString() {
        return "EmergencyDrillEvaluationUserInfo{" +
                "id=" + id +
                ", delFlag=" + delFlag +
                ", gmtCreate=" + gmtCreate +
                ", gmtModitify=" + gmtModitify +
                ", createUid=" + createUid +
                ", updateUid=" + updateUid +
                ", drillEvaluationId=" + drillEvaluationId +
                ", userUid=" + userUid +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationUserInfoDO.java

对比新文件
@@ -0,0 +1,51 @@
package com.gkhy.safePlatform.emergency.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("emergency_drill_evaluation_user")
public class EmergencyDrillEvaluationUserInfoDO {

    @TableId(type = IdType.AUTO)
    private Long id;

    private Long drillEvaluationId;

    private Long userUid;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getDrillEvaluationId() {
        return drillEvaluationId;
    }

    public void setDrillEvaluationId(Long drillEvaluationId) {
        this.drillEvaluationId = drillEvaluationId;
    }

    public Long getUserUid() {
        return userUid;
    }

    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationUserInfo{" +
                "id=" + id +
                ", drillEvaluationId=" + drillEvaluationId +
                ", userUid=" + userUid +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java

@@ -40,7 +40,13 @@

    DRILL_PLAN_NULL("D1002" , "应急演练计划不可为空"),

    DRILL_EXECUTE_NOT_EXIST("D1001" , "应急演练实施不存在"),
    DRILL_EXECUTE_NOT_EXIST("D1003" , "应急演练实施不存在"),

    DRILL_EXECUTE_NULL("D1004" , "应急演练实施不可为空"),

    DRILL_EVALUATION_NOT_EXIST("D1004" , "应急演练实施评价不存在"),

    DRILL_EVALUATION_NULL("D1005" , "应急演练实施评价不可为空"),

    ERROR("A3000", "未知错误");


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationFileReqDTO.java

对比新文件
@@ -0,0 +1,55 @@
package com.gkhy.safePlatform.emergency.model.dto.req;


public class EmergencyDrillEvaluationFileReqDTO {

    private Long id;

    private Long drillEvaluationId;

    private String fileUrl;

    private String fileName;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getDrillEvaluationId() {
        return drillEvaluationId;
    }

    public void setDrillEvaluationId(Long drillEvaluationId) {
        this.drillEvaluationId = drillEvaluationId;
    }

    public String getFileUrl() {
        return fileUrl;
    }

    public void setFileUrl(String fileUrl) {
        this.fileUrl = fileUrl;
    }

    public String getFileName() {
        return fileName;
    }

    public void setFileName(String fileName) {
        this.fileName = fileName;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationFileReqDTO{" +
                "id=" + id +
                ", drillEvaluationId=" + drillEvaluationId +
                ", fileUrl='" + fileUrl + '\'' +
                ", fileName='" + fileName + '\'' +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java

对比新文件
@@ -0,0 +1,226 @@
package com.gkhy.safePlatform.emergency.model.dto.req;

import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillEvaluationFileRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillEvaluationUserRespDTO;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

public class EmergencyDrillEvaluationReqDTO {

    private Long id;

    private Long drillPlanId;

    private String suitable;

    private String sufficient;

    private String arrival;

    private String supplies;

    private String protection;

    private String whole;

    private String division;

    private String effect;

    private String report;

    private String safety;

    private String rescue;

    private String evacuate;

    private Boolean needModify;

    private String questionAndImprove;

    private String modifyContent;

    private List<EmergencyDrillEvaluationFileReqDTO> fileList;

    private List<EmergencyDrillEvaluationUserReqDTO> userList;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getDrillPlanId() {
        return drillPlanId;
    }

    public void setDrillPlanId(Long drillPlanId) {
        this.drillPlanId = drillPlanId;
    }

    public String getSuitable() {
        return suitable;
    }

    public void setSuitable(String suitable) {
        this.suitable = suitable;
    }

    public String getSufficient() {
        return sufficient;
    }

    public void setSufficient(String sufficient) {
        this.sufficient = sufficient;
    }

    public String getArrival() {
        return arrival;
    }

    public void setArrival(String arrival) {
        this.arrival = arrival;
    }

    public String getSupplies() {
        return supplies;
    }

    public void setSupplies(String supplies) {
        this.supplies = supplies;
    }

    public String getProtection() {
        return protection;
    }

    public void setProtection(String protection) {
        this.protection = protection;
    }

    public String getWhole() {
        return whole;
    }

    public void setWhole(String whole) {
        this.whole = whole;
    }

    public String getDivision() {
        return division;
    }

    public void setDivision(String division) {
        this.division = division;
    }

    public String getEffect() {
        return effect;
    }

    public void setEffect(String effect) {
        this.effect = effect;
    }

    public String getReport() {
        return report;
    }

    public void setReport(String report) {
        this.report = report;
    }

    public String getSafety() {
        return safety;
    }

    public void setSafety(String safety) {
        this.safety = safety;
    }

    public String getRescue() {
        return rescue;
    }

    public void setRescue(String rescue) {
        this.rescue = rescue;
    }

    public String getEvacuate() {
        return evacuate;
    }

    public void setEvacuate(String evacuate) {
        this.evacuate = evacuate;
    }

    public Boolean getNeedModify() {
        return needModify;
    }

    public void setNeedModify(Boolean needModify) {
        this.needModify = needModify;
    }

    public String getQuestionAndImprove() {
        return questionAndImprove;
    }

    public void setQuestionAndImprove(String questionAndImprove) {
        this.questionAndImprove = questionAndImprove;
    }

    public String getModifyContent() {
        return modifyContent;
    }

    public void setModifyContent(String modifyContent) {
        this.modifyContent = modifyContent;
    }

    public List<EmergencyDrillEvaluationFileReqDTO> getFileList() {
        return fileList;
    }

    public void setFileList(List<EmergencyDrillEvaluationFileReqDTO> fileList) {
        this.fileList = fileList;
    }

    public List<EmergencyDrillEvaluationUserReqDTO> getUserList() {
        return userList;
    }

    public void setUserList(List<EmergencyDrillEvaluationUserReqDTO> userList) {
        this.userList = userList;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationReqDTO{" +
                "id=" + id +
                ", drillPlanId=" + drillPlanId +
                ", suitable='" + suitable + '\'' +
                ", sufficient='" + sufficient + '\'' +
                ", arrival='" + arrival + '\'' +
                ", supplies='" + supplies + '\'' +
                ", protection='" + protection + '\'' +
                ", whole='" + whole + '\'' +
                ", division='" + division + '\'' +
                ", effect='" + effect + '\'' +
                ", report='" + report + '\'' +
                ", safety='" + safety + '\'' +
                ", rescue='" + rescue + '\'' +
                ", evacuate='" + evacuate + '\'' +
                ", needModify=" + needModify +
                ", questionAndImprove='" + questionAndImprove + '\'' +
                ", modifyContent='" + modifyContent + '\'' +
                ", fileList=" + fileList +
                ", userList=" + userList +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationUserReqDTO.java

对比新文件
@@ -0,0 +1,44 @@
package com.gkhy.safePlatform.emergency.model.dto.req;


public class EmergencyDrillEvaluationUserReqDTO {

    private Long id;

    private Long drillEvaluationId;

    private Long userUid;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getDrillEvaluationId() {
        return drillEvaluationId;
    }

    public void setDrillEvaluationId(Long drillEvaluationId) {
        this.drillEvaluationId = drillEvaluationId;
    }

    public Long getUserUid() {
        return userUid;
    }

    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationUserReqDTO{" +
                "id=" + id +
                ", drillEvaluationId=" + drillEvaluationId +
                ", userUid=" + userUid +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java

对比新文件
@@ -0,0 +1,225 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;

import com.fasterxml.jackson.annotation.JsonFormat;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

public class EmergencyDrillEvaluationDetailRespDTO {

    private Long id;

    private Long drillPlanId;

    private String suitable;

    private String sufficient;

    private String arrival;

    private String supplies;

    private String protection;

    private String whole;

    private String division;

    private String effect;

    private String report;

    private String safety;

    private String rescue;

    private String evacuate;

    private Boolean needModify;

    private String questionAndImprove;

    private String modifyContent;

    private List<EmergencyDrillEvaluationFileRespDTO> fileList;

    private List<EmergencyDrillEvaluationUserRespDTO> userList;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getDrillPlanId() {
        return drillPlanId;
    }

    public void setDrillPlanId(Long drillPlanId) {
        this.drillPlanId = drillPlanId;
    }

    public String getSuitable() {
        return suitable;
    }

    public void setSuitable(String suitable) {
        this.suitable = suitable;
    }

    public String getSufficient() {
        return sufficient;
    }

    public void setSufficient(String sufficient) {
        this.sufficient = sufficient;
    }

    public String getArrival() {
        return arrival;
    }

    public void setArrival(String arrival) {
        this.arrival = arrival;
    }

    public String getSupplies() {
        return supplies;
    }

    public void setSupplies(String supplies) {
        this.supplies = supplies;
    }

    public String getProtection() {
        return protection;
    }

    public void setProtection(String protection) {
        this.protection = protection;
    }

    public String getWhole() {
        return whole;
    }

    public void setWhole(String whole) {
        this.whole = whole;
    }

    public String getDivision() {
        return division;
    }

    public void setDivision(String division) {
        this.division = division;
    }

    public String getEffect() {
        return effect;
    }

    public void setEffect(String effect) {
        this.effect = effect;
    }

    public String getReport() {
        return report;
    }

    public void setReport(String report) {
        this.report = report;
    }

    public String getSafety() {
        return safety;
    }

    public void setSafety(String safety) {
        this.safety = safety;
    }

    public String getRescue() {
        return rescue;
    }

    public void setRescue(String rescue) {
        this.rescue = rescue;
    }

    public String getEvacuate() {
        return evacuate;
    }

    public void setEvacuate(String evacuate) {
        this.evacuate = evacuate;
    }

    public Boolean getNeedModify() {
        return needModify;
    }

    public void setNeedModify(Boolean needModify) {
        this.needModify = needModify;
    }

    public String getQuestionAndImprove() {
        return questionAndImprove;
    }

    public void setQuestionAndImprove(String questionAndImprove) {
        this.questionAndImprove = questionAndImprove;
    }

    public String getModifyContent() {
        return modifyContent;
    }

    public void setModifyContent(String modifyContent) {
        this.modifyContent = modifyContent;
    }

    public List<EmergencyDrillEvaluationFileRespDTO> getFileList() {
        return fileList;
    }

    public void setFileList(List<EmergencyDrillEvaluationFileRespDTO> fileList) {
        this.fileList = fileList;
    }

    public List<EmergencyDrillEvaluationUserRespDTO> getUserList() {
        return userList;
    }

    public void setUserList(List<EmergencyDrillEvaluationUserRespDTO> userList) {
        this.userList = userList;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationDetailRespDTO{" +
                "id=" + id +
                ", drillPlanId=" + drillPlanId +
                ", suitable='" + suitable + '\'' +
                ", sufficient='" + sufficient + '\'' +
                ", arrival='" + arrival + '\'' +
                ", supplies='" + supplies + '\'' +
                ", protection='" + protection + '\'' +
                ", whole='" + whole + '\'' +
                ", division='" + division + '\'' +
                ", effect='" + effect + '\'' +
                ", report='" + report + '\'' +
                ", safety='" + safety + '\'' +
                ", rescue='" + rescue + '\'' +
                ", evacuate='" + evacuate + '\'' +
                ", needModify=" + needModify +
                ", questionAndImprove='" + questionAndImprove + '\'' +
                ", modifyContent='" + modifyContent + '\'' +
                ", fileList=" + fileList +
                ", userList=" + userList +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationFileRespDTO.java

对比新文件
@@ -0,0 +1,55 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;


public class EmergencyDrillEvaluationFileRespDTO {

    private Long id;

    private Long drillEvaluationId;

    private String fileUrl;

    private String fileName;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getDrillEvaluationId() {
        return drillEvaluationId;
    }

    public void setDrillEvaluationId(Long drillEvaluationId) {
        this.drillEvaluationId = drillEvaluationId;
    }

    public String getFileUrl() {
        return fileUrl;
    }

    public void setFileUrl(String fileUrl) {
        this.fileUrl = fileUrl;
    }

    public String getFileName() {
        return fileName;
    }

    public void setFileName(String fileName) {
        this.fileName = fileName;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationFileRespDTO{" +
                "id=" + id +
                ", drillEvaluationId=" + drillEvaluationId +
                ", fileUrl='" + fileUrl + '\'' +
                ", fileName='" + fileName + '\'' +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java

对比新文件
@@ -0,0 +1,197 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;

public class EmergencyDrillEvaluationPageRespDTO {

    private Long id;

    private Long drillPlanId;

    private String suitable;

    private String sufficient;

    private String arrival;

    private String supplies;

    private String protection;

    private String whole;

    private String division;

    private String effect;

    private String report;

    private String safety;

    private String rescue;

    private String evacuate;

    private Boolean needModify;

    private String questionAndImprove;

    private String modifyContent;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getDrillPlanId() {
        return drillPlanId;
    }

    public void setDrillPlanId(Long drillPlanId) {
        this.drillPlanId = drillPlanId;
    }

    public String getSuitable() {
        return suitable;
    }

    public void setSuitable(String suitable) {
        this.suitable = suitable;
    }

    public String getSufficient() {
        return sufficient;
    }

    public void setSufficient(String sufficient) {
        this.sufficient = sufficient;
    }

    public String getArrival() {
        return arrival;
    }

    public void setArrival(String arrival) {
        this.arrival = arrival;
    }

    public String getSupplies() {
        return supplies;
    }

    public void setSupplies(String supplies) {
        this.supplies = supplies;
    }

    public String getProtection() {
        return protection;
    }

    public void setProtection(String protection) {
        this.protection = protection;
    }

    public String getWhole() {
        return whole;
    }

    public void setWhole(String whole) {
        this.whole = whole;
    }

    public String getDivision() {
        return division;
    }

    public void setDivision(String division) {
        this.division = division;
    }

    public String getEffect() {
        return effect;
    }

    public void setEffect(String effect) {
        this.effect = effect;
    }

    public String getReport() {
        return report;
    }

    public void setReport(String report) {
        this.report = report;
    }

    public String getSafety() {
        return safety;
    }

    public void setSafety(String safety) {
        this.safety = safety;
    }

    public String getRescue() {
        return rescue;
    }

    public void setRescue(String rescue) {
        this.rescue = rescue;
    }

    public String getEvacuate() {
        return evacuate;
    }

    public void setEvacuate(String evacuate) {
        this.evacuate = evacuate;
    }

    public Boolean getNeedModify() {
        return needModify;
    }

    public void setNeedModify(Boolean needModify) {
        this.needModify = needModify;
    }

    public String getQuestionAndImprove() {
        return questionAndImprove;
    }

    public void setQuestionAndImprove(String questionAndImprove) {
        this.questionAndImprove = questionAndImprove;
    }

    public String getModifyContent() {
        return modifyContent;
    }

    public void setModifyContent(String modifyContent) {
        this.modifyContent = modifyContent;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationInfo{" +
                "id=" + id +
                ", drillPlanId=" + drillPlanId +
                ", suitable='" + suitable + '\'' +
                ", sufficient='" + sufficient + '\'' +
                ", arrival='" + arrival + '\'' +
                ", supplies='" + supplies + '\'' +
                ", protection='" + protection + '\'' +
                ", whole='" + whole + '\'' +
                ", division='" + division + '\'' +
                ", effect='" + effect + '\'' +
                ", report='" + report + '\'' +
                ", safety='" + safety + '\'' +
                ", rescue='" + rescue + '\'' +
                ", evacuate='" + evacuate + '\'' +
                ", needModify=" + needModify +
                ", questionAndImprove='" + questionAndImprove + '\'' +
                ", modifyContent='" + modifyContent + '\'' +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationUserRespDTO.java

对比新文件
@@ -0,0 +1,44 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;


public class EmergencyDrillEvaluationUserRespDTO {

    private Long id;

    private Long drillEvaluationId;

    private Long userUid;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getDrillEvaluationId() {
        return drillEvaluationId;
    }

    public void setDrillEvaluationId(Long drillEvaluationId) {
        this.drillEvaluationId = drillEvaluationId;
    }

    public Long getUserUid() {
        return userUid;
    }

    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationUserReqDTO{" +
                "id=" + id +
                ", drillEvaluationId=" + drillEvaluationId +
                ", userUid=" + userUid +
                '}';
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillEvaluationQuery.java

对比新文件
@@ -0,0 +1,5 @@
package com.gkhy.safePlatform.emergency.query;

public class EmergencyDrillEvaluationQuery {

}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillEvaluationDBQuery.java

对比新文件
@@ -0,0 +1,5 @@
package com.gkhy.safePlatform.emergency.query.db;

public class EmergencyDrillEvaluationDBQuery {

}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillEvaluationFileInfoRepository.java

对比新文件
@@ -0,0 +1,23 @@
package com.gkhy.safePlatform.emergency.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationFileInfoDO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;


@Repository
public interface EmergencyDrillEvaluationFileInfoRepository extends BaseMapper<EmergencyDrillEvaluationFileInfo> {

    void addEmergencyDrillEvaluationFile(EmergencyDrillEvaluationFileInfo emergencyDrillEvaluationFileInfo);

    List<EmergencyDrillEvaluationFileInfoDO> selectEmergencyDrillEvaluationFileByDrillEvaluationId(@Param("drillEvaluationId") Long drillEvaluationId);

    void deleteEmergencyDrillEvaluationFileByIds(List<Long> ids);

    void deleteEmergencyDrillEvaluationFileByDrillEvaluationId(@Param("drillEvaluationId") Long drillEvaluationId);

}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillEvaluationInfoRepository.java

对比新文件
@@ -0,0 +1,26 @@
package com.gkhy.safePlatform.emergency.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillEvaluationDBQuery;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface EmergencyDrillEvaluationInfoRepository extends BaseMapper<EmergencyDrillEvaluationInfo> {

    List<EmergencyDrillEvaluationInfoPageDO> selectEmergencyDrillEvaluationList(Page<EmergencyDrillEvaluationInfoPageDO> page, @Param("query") EmergencyDrillEvaluationDBQuery emergencyDrillEvaluationDBQuery);

    void addEmergencyDrillEvaluation(EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo);

    EmergencyDrillEvaluationInfoDetailDO selectEmergencyDrillEvaluationById(@Param("id") Long id);

    void updateEmergencyDrillEvaluation(EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo);

    void deleteEmergencyDrillEvaluation(@Param("id") Long id);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillEvaluationUserInfoRepository.java

对比新文件
@@ -0,0 +1,23 @@
package com.gkhy.safePlatform.emergency.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationUserInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationUserInfoDO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;


@Repository
public interface EmergencyDrillEvaluationUserInfoRepository extends BaseMapper<EmergencyDrillEvaluationUserInfo> {

    void addEmergencyDrillEvaluationUser(EmergencyDrillEvaluationUserInfo emergencyDrillEvaluationUserInfo);

    List<EmergencyDrillEvaluationUserInfoDO> selectEmergencyDrillEvaluationUserByDrillEvaluationId(@Param("drillEvaluationId") Long drillEvaluationId);

    void deleteEmergencyDrillEvaluationUserByIds(List<Long> ids);

    void deleteEmergencyDrillEvaluationUserByDrillEvaluationId(@Param("drillEvaluationId") Long drillEvaluationId);

}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillEvaluationService.java

对比新文件
@@ -0,0 +1,24 @@
package com.gkhy.safePlatform.emergency.service;

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.EmergencyDrillEvaluationReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillEvaluationDetailRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillEvaluationPageRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillEvaluationQuery;

import java.util.List;

public interface EmergencyDrillEvaluationService {

    SearchResultVO<List<EmergencyDrillEvaluationPageRespDTO>> selectEmergencyDrillEvaluationList(PageQuery<EmergencyDrillEvaluationQuery> query);

    ResultVO addEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO);

    ResultVO<EmergencyDrillEvaluationDetailRespDTO> getEmergencyDrillEvaluationById(Long id);

    ResultVO updateEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO);

    ResultVO batchDeleteEmergencyDrillEvaluation(String ids);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillEvaluationFileInfoService.java

对比新文件
@@ -0,0 +1,19 @@
package com.gkhy.safePlatform.emergency.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationFileInfoDO;

import java.util.List;


public interface EmergencyDrillEvaluationFileInfoService extends IService<EmergencyDrillEvaluationFileInfo> {

    void addEmergencyDrillEvaluationFile(EmergencyDrillEvaluationFileInfo emergencyDrillEvaluationFileInfo);

    List<EmergencyDrillEvaluationFileInfoDO> selectEmergencyDrillEvaluationFileByDrillEvaluationId(Long id);

    void deleteEmergencyDrillEvaluationFileByIds(List<Long> deleteList);

    void deleteEmergencyDrillEvaluationFileByDrillEvaluationId(Long DrillEvaluationId);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillEvaluationInfoService.java

对比新文件
@@ -0,0 +1,24 @@
package com.gkhy.safePlatform.emergency.service.baseService;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillEvaluationDBQuery;

import java.util.List;


public interface EmergencyDrillEvaluationInfoService extends IService<EmergencyDrillEvaluationInfo> {

    List<EmergencyDrillEvaluationInfoPageDO> selectEmergencyDrillEvaluationList(Page<EmergencyDrillEvaluationInfoPageDO> page, EmergencyDrillEvaluationDBQuery emergencyDrillEvaluationDBQuery);

    void addEmergencyDrillEvaluation(EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo);

    EmergencyDrillEvaluationInfoDetailDO selectEmergencyDrillEvaluationById(Long id);

    void updateEmergencyDrillEvaluation(EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo);

    void deleteEmergencyDrillEvaluation(Long DrillEvaluationId);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillEvaluationUserInfoService.java

对比新文件
@@ -0,0 +1,19 @@
package com.gkhy.safePlatform.emergency.service.baseService;

import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationUserInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationUserInfoDO;

import java.util.List;


public interface EmergencyDrillEvaluationUserInfoService extends IService<EmergencyDrillEvaluationUserInfo> {

    void addEmergencyDrillEvaluationUser(EmergencyDrillEvaluationUserInfo emergencyDrillEvaluationUserInfo);

    List<EmergencyDrillEvaluationUserInfoDO> selectEmergencyDrillEvaluationUserByDrillEvaluationId(Long id);

    void deleteEmergencyDrillEvaluationUserByIds(List<Long> deleteList);

    void deleteEmergencyDrillEvaluationUserByDrillEvaluationId(Long DrillEvaluationId);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillEvaluationFileInfoServiceImpl.java

对比新文件
@@ -0,0 +1,40 @@
package com.gkhy.safePlatform.emergency.service.baseService.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationFileInfoDO;
import com.gkhy.safePlatform.emergency.repository.EmergencyDrillEvaluationFileInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillEvaluationFileInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("emergencyDrillEvaluationFileInfoService")
public class EmergencyDrillEvaluationFileInfoServiceImpl extends ServiceImpl<EmergencyDrillEvaluationFileInfoRepository, EmergencyDrillEvaluationFileInfo> implements EmergencyDrillEvaluationFileInfoService {

    @Autowired
    private EmergencyDrillEvaluationFileInfoRepository emergencyDrillEvaluationFileInfoRepository;


    @Override
    public void addEmergencyDrillEvaluationFile(EmergencyDrillEvaluationFileInfo emergencyDrillEvaluationFileInfo) {
        emergencyDrillEvaluationFileInfoRepository.addEmergencyDrillEvaluationFile(emergencyDrillEvaluationFileInfo);
    }

    @Override
    public List<EmergencyDrillEvaluationFileInfoDO> selectEmergencyDrillEvaluationFileByDrillEvaluationId(Long id) {
        return emergencyDrillEvaluationFileInfoRepository.selectEmergencyDrillEvaluationFileByDrillEvaluationId(id);
    }

    @Override
    public void deleteEmergencyDrillEvaluationFileByIds(List<Long> ids) {
        emergencyDrillEvaluationFileInfoRepository.deleteEmergencyDrillEvaluationFileByIds(ids);
    }

    @Override
    public void deleteEmergencyDrillEvaluationFileByDrillEvaluationId(Long DrillEvaluationId) {
        emergencyDrillEvaluationFileInfoRepository.deleteEmergencyDrillEvaluationFileByDrillEvaluationId(DrillEvaluationId);
    }

}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillEvaluationInfoServiceImpl.java

对比新文件
@@ -0,0 +1,48 @@
package com.gkhy.safePlatform.emergency.service.baseService.impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillEvaluationDBQuery;
import com.gkhy.safePlatform.emergency.repository.EmergencyDrillEvaluationInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillEvaluationInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("emergencyDrillEvaluationInfoService")
public class EmergencyDrillEvaluationInfoServiceImpl extends ServiceImpl<EmergencyDrillEvaluationInfoRepository, EmergencyDrillEvaluationInfo> implements EmergencyDrillEvaluationInfoService {

    @Autowired
    private EmergencyDrillEvaluationInfoRepository emergencyDrillEvaluationInfoRepository;

    @Override
    public List<EmergencyDrillEvaluationInfoPageDO> selectEmergencyDrillEvaluationList(Page<EmergencyDrillEvaluationInfoPageDO> page, EmergencyDrillEvaluationDBQuery emergencyDrillEvaluationDBQuery) {
        return emergencyDrillEvaluationInfoRepository.selectEmergencyDrillEvaluationList(page,emergencyDrillEvaluationDBQuery);
    }

    @Override
    public void addEmergencyDrillEvaluation(EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo) {
        emergencyDrillEvaluationInfoRepository.addEmergencyDrillEvaluation(emergencyDrillEvaluationInfo);
    }

    @Override
    public EmergencyDrillEvaluationInfoDetailDO selectEmergencyDrillEvaluationById(Long id) {
        return emergencyDrillEvaluationInfoRepository.selectEmergencyDrillEvaluationById(id);
    }

    @Override
    public void updateEmergencyDrillEvaluation(EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo) {
        emergencyDrillEvaluationInfoRepository.updateEmergencyDrillEvaluation(emergencyDrillEvaluationInfo);
    }

    @Override
    public void deleteEmergencyDrillEvaluation(Long DrillEvaluationId) {
        emergencyDrillEvaluationInfoRepository.deleteEmergencyDrillEvaluation(DrillEvaluationId);
    }


}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillEvaluationUserInfoServiceImpl.java

对比新文件
@@ -0,0 +1,40 @@
package com.gkhy.safePlatform.emergency.service.baseService.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationUserInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationUserInfoDO;
import com.gkhy.safePlatform.emergency.repository.EmergencyDrillEvaluationUserInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillEvaluationUserInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("emergencyDrillEvaluationUserInfoService")
public class EmergencyDrillEvaluationUserInfoServiceImpl extends ServiceImpl<EmergencyDrillEvaluationUserInfoRepository, EmergencyDrillEvaluationUserInfo> implements EmergencyDrillEvaluationUserInfoService {

    @Autowired
    private EmergencyDrillEvaluationUserInfoRepository emergencyDrillEvaluationUserInfoRepository;


    @Override
    public void addEmergencyDrillEvaluationUser(EmergencyDrillEvaluationUserInfo emergencyDrillEvaluationUserInfo) {
        emergencyDrillEvaluationUserInfoRepository.addEmergencyDrillEvaluationUser(emergencyDrillEvaluationUserInfo);
    }

    @Override
    public List<EmergencyDrillEvaluationUserInfoDO> selectEmergencyDrillEvaluationUserByDrillEvaluationId(Long id) {
        return emergencyDrillEvaluationUserInfoRepository.selectEmergencyDrillEvaluationUserByDrillEvaluationId(id);
    }

    @Override
    public void deleteEmergencyDrillEvaluationUserByIds(List<Long> ids) {
        emergencyDrillEvaluationUserInfoRepository.deleteEmergencyDrillEvaluationUserByIds(ids);
    }

    @Override
    public void deleteEmergencyDrillEvaluationUserByDrillEvaluationId(Long DrillEvaluationId) {
        emergencyDrillEvaluationUserInfoRepository.deleteEmergencyDrillEvaluationUserByDrillEvaluationId(DrillEvaluationId);
    }

}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java

对比新文件
@@ -0,0 +1,296 @@
package com.gkhy.safePlatform.emergency.service.impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
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.*;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
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.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 org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@Service("emergencyDrillEvaluationService")
public class EmergencyDrillEvaluationServiceImpl implements EmergencyDrillEvaluationService {

    @Autowired
    private EmergencyDrillEvaluationInfoService emergencyDrillEvaluationInfoService;

    @Autowired
    private EmergencyDrillEvaluationFileInfoService emergencyDrillEvaluationFileInfoService;

    @Autowired
    private EmergencyDrillEvaluationUserInfoService emergencyDrillEvaluationUserInfoService;

    @Autowired
    private EmergencyDrillPlanInfoService emergencyDrillPlanInfoService;


    @Override
    public SearchResultVO<List<EmergencyDrillEvaluationPageRespDTO>> selectEmergencyDrillEvaluationList(PageQuery<EmergencyDrillEvaluationQuery> query) {
        Long pageIndex = query.getPageIndex();
        Long pageSize = query.getPageSize();
        Page<EmergencyDrillEvaluationInfoPageDO> page = new Page<>(pageIndex, pageSize);

        EmergencyDrillEvaluationDBQuery emergencyDrillEvaluationDBQuery = new EmergencyDrillEvaluationDBQuery();
        if (query.getSearchParams() != null) {
            BeanUtils.copyProperties(query.getSearchParams(), emergencyDrillEvaluationDBQuery);
        }
        List<EmergencyDrillEvaluationInfoPageDO> emergencyDrillEvaluationListDoInfoList = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationList(page, emergencyDrillEvaluationDBQuery);
        List<EmergencyDrillEvaluationPageRespDTO> respList = BeanCopyUtils.copyBeanList(emergencyDrillEvaluationListDoInfoList, EmergencyDrillEvaluationPageRespDTO.class);

        return new SearchResultVO<>(
                true,
                pageIndex,
                pageSize,
                page.getTotal(),
                respList,
                ResultCodes.OK
        );
    }

    @Override
    public ResultVO addEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
        // 判断请求中是否存在演练计划id
        if (emergencyDrillEvaluationReqDTO.getDrillPlanId() == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NULL);
        } else {
            EmergencyDrillPlanInfoDetailDO emergencyDrillPlanInfoDetailDO = emergencyDrillPlanInfoService.selectEmergencyDrillPlanById(emergencyDrillEvaluationReqDTO.getDrillPlanId());
            // 判断是否存在该演练计划
            if (emergencyDrillPlanInfoDetailDO == null) {
                throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NOT_EXIST);
            } else {
                Date nowDate = new Date();
                // 新增应急演练实施评价
                EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo = new EmergencyDrillEvaluationInfo();
                BeanUtils.copyProperties(emergencyDrillEvaluationReqDTO, emergencyDrillEvaluationInfo);
                emergencyDrillEvaluationInfo.setDelFlag(false);
                emergencyDrillEvaluationInfo.setCreateUid(uid);
                emergencyDrillEvaluationInfo.setGmtCreate(nowDate);
                emergencyDrillEvaluationInfoService.addEmergencyDrillEvaluation(emergencyDrillEvaluationInfo);
                // 新增急演练实施评价附件表
                if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getFileList())) {
                    addEmergencyDrillEvaluationFile(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getFileList());
                }
                // 新增急演练计划应急人员表
                if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getUserList())) {
                    addEmergencyDrillEvaluationUser(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getUserList());
                }
                return new ResultVO<>(ResultCodes.OK);
            }
        }
    }

    private void addEmergencyDrillEvaluationFile(Long uid, Long DrillEvaluationId, Date nowDate, List<EmergencyDrillEvaluationFileReqDTO> emergencyDrillEvaluationFileReqDTOList) {
        List<EmergencyDrillEvaluationFileInfo> emergencyDrillEvaluationFileInfoList = BeanCopyUtils.copyBeanList(emergencyDrillEvaluationFileReqDTOList, EmergencyDrillEvaluationFileInfo.class);
        emergencyDrillEvaluationFileInfoList.forEach(EmergencyDrillEvaluationFileInfo -> {
            EmergencyDrillEvaluationFileInfo.setDelFlag(false);
            EmergencyDrillEvaluationFileInfo.setCreateUid(uid);
            EmergencyDrillEvaluationFileInfo.setGmtCreate(nowDate);
            EmergencyDrillEvaluationFileInfo.setDrillEvaluationId(DrillEvaluationId);
        });
        for (EmergencyDrillEvaluationFileInfo emergencyDrillEvaluationFileInfo : emergencyDrillEvaluationFileInfoList) {
            emergencyDrillEvaluationFileInfoService.addEmergencyDrillEvaluationFile(emergencyDrillEvaluationFileInfo);
        }
    }

    private void addEmergencyDrillEvaluationUser(Long uid, Long DrillEvaluationId, Date nowDate, List<EmergencyDrillEvaluationUserReqDTO> emergencyDrillEvaluationUserReqDTOList) {
        List<EmergencyDrillEvaluationUserInfo> emergencyDrillEvaluationUserInfoList = BeanCopyUtils.copyBeanList(emergencyDrillEvaluationUserReqDTOList, EmergencyDrillEvaluationUserInfo.class);
        emergencyDrillEvaluationUserInfoList.forEach(EmergencyDrillEvaluationUserInfo -> {
            EmergencyDrillEvaluationUserInfo.setDelFlag(false);
            EmergencyDrillEvaluationUserInfo.setCreateUid(uid);
            EmergencyDrillEvaluationUserInfo.setGmtCreate(nowDate);
            EmergencyDrillEvaluationUserInfo.setDrillEvaluationId(DrillEvaluationId);
        });
        for (EmergencyDrillEvaluationUserInfo emergencyDrillEvaluationUserInfo : emergencyDrillEvaluationUserInfoList) {
            emergencyDrillEvaluationUserInfoService.addEmergencyDrillEvaluationUser(emergencyDrillEvaluationUserInfo);
        }
    }

    @Override
    public ResultVO<EmergencyDrillEvaluationDetailRespDTO> getEmergencyDrillEvaluationById(Long id) {
        EmergencyDrillEvaluationDetailRespDTO emergencyDrillEvaluationDetailRespDTO = new EmergencyDrillEvaluationDetailRespDTO();
        // 查询是否存在
        EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationById(id);
        if (emergencyDrillEvaluationInfoDetailDO == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_NOT_EXIST);
        } 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<EmergencyDrillEvaluationFileInfoDO> emergencyDrillEvaluationFileInfoDOList = emergencyDrillEvaluationFileInfoService.selectEmergencyDrillEvaluationFileByDrillEvaluationId(id);
            if (!CollectionUtils.isEmpty(emergencyDrillEvaluationFileInfoDOList)) {
                List<EmergencyDrillEvaluationFileRespDTO> emergencyUserFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyDrillEvaluationFileInfoDOList, EmergencyDrillEvaluationFileRespDTO.class);
                emergencyDrillEvaluationDetailRespDTO.setFileList(emergencyUserFileRespDTOList);
            }
            return new ResultVO<>(ResultCodes.OK, emergencyDrillEvaluationDetailRespDTO);
        }
    }

    @Override
    public ResultVO updateEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
        Date nowDate = new Date();
        // 查询是否存在
        EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationById(emergencyDrillEvaluationReqDTO.getId());
        if (emergencyDrillEvaluationInfoDetailDO == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_NOT_EXIST);
        } else {
            EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo = new EmergencyDrillEvaluationInfo();
            BeanUtils.copyProperties(emergencyDrillEvaluationReqDTO, emergencyDrillEvaluationInfo);
            emergencyDrillEvaluationInfo.setUpdateUid(uid);
            emergencyDrillEvaluationInfo.setGmtModitify(nowDate);
            emergencyDrillEvaluationInfoService.updateEmergencyDrillEvaluation(emergencyDrillEvaluationInfo);

            // 更新急演练计划附件表
            if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getFileList())) {
                updateEmergencyDrillEvaluationFile(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getFileList());
            }
            // 更新急演练计划应急队伍表
            if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getUserList())) {
                updateEmergencyDrillEvaluationUser(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getUserList());
            }

            return new ResultVO<>(ResultCodes.OK);
        }
    }

    private void updateEmergencyDrillEvaluationFile(Long uid, Long DrillEvaluationId, Date
            nowDate, List<EmergencyDrillEvaluationFileReqDTO> fileReqDTOList) {
        List<EmergencyDrillEvaluationFileInfoDO> emergencyDrillEvaluationFileInfoDOList = emergencyDrillEvaluationFileInfoService.selectEmergencyDrillEvaluationFileByDrillEvaluationId(DrillEvaluationId);
        List<Long> oldIdsList = emergencyDrillEvaluationFileInfoDOList.stream().map(EmergencyDrillEvaluationFileInfoDO::getId).collect(Collectors.toList());
        List<Long> newIdsList = new ArrayList<>();

        //新增的区域集合
        List<EmergencyDrillEvaluationFileInfo> addList = new ArrayList<>();
        //删除的区域集合(id)
        List<Long> deleteList = new ArrayList<>();
        for (EmergencyDrillEvaluationFileReqDTO emergencyDrillEvaluationFileReqDTO : fileReqDTOList) {
            //如果不存在id则表示页面新增的附件
            if (emergencyDrillEvaluationFileReqDTO.getId() == null) {
                EmergencyDrillEvaluationFileInfo emergencyDrillEvaluationFileInfo = new EmergencyDrillEvaluationFileInfo();
                BeanUtils.copyProperties(emergencyDrillEvaluationFileReqDTO, emergencyDrillEvaluationFileInfo);
                emergencyDrillEvaluationFileInfo.setDelFlag(false);
                emergencyDrillEvaluationFileInfo.setGmtCreate(nowDate);
                emergencyDrillEvaluationFileInfo.setCreateUid(uid);
                emergencyDrillEvaluationFileInfo.setDrillEvaluationId(DrillEvaluationId);
                addList.add(emergencyDrillEvaluationFileInfo);
            }
            //如果存在id则判断页面是否删除
            else {
                newIdsList.add(emergencyDrillEvaluationFileReqDTO.getId());
            }
        }
        for (Long oldId : oldIdsList) {
            if (!newIdsList.contains(oldId)) {
                deleteList.add(oldId);
            }
        }
        if (!CollectionUtils.isEmpty(addList)) {
            for (EmergencyDrillEvaluationFileInfo emergencyDrillEvaluationFileInfo : addList) {
                emergencyDrillEvaluationFileInfoService.addEmergencyDrillEvaluationFile(emergencyDrillEvaluationFileInfo);
            }
        }
        if (!CollectionUtils.isEmpty(deleteList)) {
            emergencyDrillEvaluationFileInfoService.deleteEmergencyDrillEvaluationFileByIds(deleteList);
        }
    }

    private void updateEmergencyDrillEvaluationUser(Long uid, Long DrillEvaluationId, Date
            nowDate, List<EmergencyDrillEvaluationUserReqDTO> UserReqDTOList) {
        List<EmergencyDrillEvaluationUserInfoDO> emergencyDrillEvaluationUserInfoDOList = emergencyDrillEvaluationUserInfoService.selectEmergencyDrillEvaluationUserByDrillEvaluationId(DrillEvaluationId);
        List<Long> oldIdsList = emergencyDrillEvaluationUserInfoDOList.stream().map(EmergencyDrillEvaluationUserInfoDO::getId).collect(Collectors.toList());
        List<Long> newIdsList = new ArrayList<>();

        //新增的区域集合
        List<EmergencyDrillEvaluationUserInfo> addList = new ArrayList<>();
        //删除的区域集合(id)
        List<Long> deleteList = new ArrayList<>();
        for (EmergencyDrillEvaluationUserReqDTO emergencyDrillEvaluationUserReqDTO : UserReqDTOList) {
            //如果不存在id则表示页面新增的附件
            if (emergencyDrillEvaluationUserReqDTO.getId() == null) {
                EmergencyDrillEvaluationUserInfo emergencyDrillEvaluationUserInfo = new EmergencyDrillEvaluationUserInfo();
                BeanUtils.copyProperties(emergencyDrillEvaluationUserReqDTO, emergencyDrillEvaluationUserInfo);
                emergencyDrillEvaluationUserInfo.setDelFlag(false);
                emergencyDrillEvaluationUserInfo.setGmtCreate(nowDate);
                emergencyDrillEvaluationUserInfo.setCreateUid(uid);
                emergencyDrillEvaluationUserInfo.setDrillEvaluationId(DrillEvaluationId);
                addList.add(emergencyDrillEvaluationUserInfo);
            }
            //如果存在id则判断页面是否删除
            else {
                newIdsList.add(emergencyDrillEvaluationUserReqDTO.getId());
            }
        }
        for (Long oldId : oldIdsList) {
            if (!newIdsList.contains(oldId)) {
                deleteList.add(oldId);
            }
        }
        if (!CollectionUtils.isEmpty(addList)) {
            for (EmergencyDrillEvaluationUserInfo emergencyDrillEvaluationUserInfo : addList) {
                emergencyDrillEvaluationUserInfoService.addEmergencyDrillEvaluationUser(emergencyDrillEvaluationUserInfo);
            }
        }
        if (!CollectionUtils.isEmpty(deleteList)) {
            emergencyDrillEvaluationUserInfoService.deleteEmergencyDrillEvaluationUserByIds(deleteList);
        }
    }

    @Override
    public ResultVO batchDeleteEmergencyDrillEvaluation(String ids) {
        if (StringUtils.isBlank(ids)) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_NULL);
        } else {
            String[] idArr = ids.split(",");
            for (String id : idArr) {
                deleteEmergencyDrillEvaluation(Long.valueOf(id));
            }
            return new ResultVO(ResultCodes.OK);
        }
    }

    private void deleteEmergencyDrillEvaluation(Long id) {
        //查询是否存在
        EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationById(id);
        if (emergencyDrillEvaluationInfoDetailDO == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_NOT_EXIST);
        } else {
            Long DrillEvaluationId = emergencyDrillEvaluationInfoDetailDO.getId();
            emergencyDrillEvaluationInfoService.deleteEmergencyDrillEvaluation(DrillEvaluationId);
            //删除附件
            emergencyDrillEvaluationFileInfoService.deleteEmergencyDrillEvaluationFileByDrillEvaluationId(DrillEvaluationId);
            //删除应急队伍
            emergencyDrillEvaluationUserInfoService.deleteEmergencyDrillEvaluationUserByDrillEvaluationId(DrillEvaluationId);
        }
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java

@@ -198,7 +198,7 @@
    @Override
    public ResultVO batchDeleteEmergencyDrillExecute(String ids) {
        if (StringUtils.isBlank(ids)) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NOT_EXIST);
            throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NULL);
        } else {
            String[] idArr = ids.split(",");
            for (String id : idArr) {

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java

@@ -264,7 +264,7 @@
    @Override
    public ResultVO batchDeleteEmergencyDrillPlan(String ids) {
        if (StringUtils.isBlank(ids)) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NOT_EXIST);
            throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NULL);
        } else {
            String[] idArr = ids.split(",");
            for (String id : idArr) {

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationFileInfoMapper.xml

对比新文件
@@ -0,0 +1,55 @@
<?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.EmergencyDrillEvaluationFileInfoRepository">

    <insert id="addEmergencyDrillEvaluationFile">
        insert into emergency_drill_evaluation_file
        <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="drillEvaluationId != null ">drill_evaluation_id,</if>
            <if test="fileUrl != null and fileUrl != ''">file_url,</if>
            <if test="fileName != null and fileName != ''">file_name</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="drillEvaluationId != null ">#{drillEvaluationId},</if>
            <if test="fileUrl != null and fileUrl != ''">#{fileUrl},</if>
            <if test="fileName != null and fileName != ''">#{fileName}</if>
        </trim>
    </insert>

    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationFileInfoDO" id="EmergencyDrillEvaluationFileInfoDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="drill_evaluation_id" property="drillEvaluationId" />
        <result column="file_url" property="fileUrl" />
        <result column="file_name" property="fileName" />
    </resultMap>

    <select id="selectEmergencyDrillEvaluationFileByDrillEvaluationId" resultMap="EmergencyDrillEvaluationFileInfoDOResult">
        select id,`drill_evaluation_id`,`file_url`,`file_name` from emergency_drill_evaluation_file where del_flag = 0 and drill_evaluation_id = #{drillEvaluationId}
    </select>

    <update id = "deleteEmergencyDrillEvaluationFileByIds" >
        update emergency_drill_evaluation_file set del_flag = 1 where id in
        <foreach item="id" collection="ids" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>

    <update id="deleteEmergencyDrillEvaluationFileByDrillEvaluationId">
        update emergency_drill_evaluation_file set del_flag = 1 where drill_evaluation_id = #{drillEvaluationId}
    </update>

</mapper>

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml

对比新文件
@@ -0,0 +1,126 @@
<?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.EmergencyDrillEvaluationInfoRepository">

    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfoPageDO"
               id="emergencyDrillEvaluationInfoPageDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="drill_plan_id" property="drillPlanId"/>
    </resultMap>

    <select id="selectEmergencyDrillEvaluationList" resultMap="emergencyDrillEvaluationInfoPageDOResult">
        select id,`drill_plan_id`  from emergency_drill_evaluation where del_flag = 0
    </select>

    <insert id="addEmergencyDrillEvaluation" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfo"
            keyProperty="id" useGeneratedKeys="true">
        insert into emergency_drill_evaluation
        <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="drillPlanId != null ">drill_plan_id,</if>
            <if test="suitable != null and suitable != ''">`suitable`,</if>
            <if test="sufficient != null and sufficient != ''">`sufficient`,</if>
            <if test="arrival != null and arrival != ''">`arrival`,</if>
            <if test="supplies != null and purpose != ''">`supplies`,</if>
            <if test="protection != null and purpose != ''">`protection`,</if>
            <if test="whole != null and whole != ''">`whole`,</if>
            <if test="division != null and division != ''">`division`,</if>
            <if test="effect != null and effect != ''">`effect`,</if>
            <if test="report != null and report != ''">`report`,</if>
            <if test="safety != null and safety != ''">`safety`,</if>
            <if test="rescue != null and rescue != ''">`rescue`,</if>
            <if test="evacuate != null and evacuate != ''">`evacuate`,</if>
            <if test="needModify != null ">`need_modify`,</if>
            <if test="questionAndImprove != null and questionAndImprove != ''">`question_and_improve`,</if>
            <if test="modifyContent != null and modifyContent != ''">`modify_content`,</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="drillPlanId != null ">#{drillPlanId},</if>
            <if test="suitable != null and suitable != ''">#{suitable},</if>
            <if test="sufficient != null and sufficient != ''">#{sufficient},</if>
            <if test="arrival != null and arrival != ''">#{arrival},</if>
            <if test="supplies != null and purpose != ''">#{supplies},</if>
            <if test="protection != null and purpose != ''">#{protection},</if>
            <if test="whole != null and whole != ''">#{whole},</if>
            <if test="division != null and division != ''">#{division},</if>
            <if test="effect != null and effect != ''">#{effect},</if>
            <if test="report != null and report != ''">#{report},</if>
            <if test="safety != null and safety != ''">#{safety},</if>
            <if test="rescue != null and rescue != ''">#{rescue},</if>
            <if test="evacuate != null and evacuate != ''">#{evacuate},</if>
            <if test="needModify != null ">#{needModify},</if>
            <if test="questionAndImprove != null and questionAndImprove != ''">#{questionAndImprove},</if>
            <if test="modifyContent != null and modifyContent != ''">#{modifyContent},</if>
        </trim>
    </insert>


    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfoDetailDO" id="emergencyDrillEvaluationInfoDetailDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="drill_plan_id" property="drillPlanId"/>
        <result column="suitable" property="suitable"/>
        <result column="sufficient" property="sufficient"/>
        <result column="arrival" property="arrival"/>
        <result column="supplies" property="supplies"/>
        <result column="protection" property="protection"/>
        <result column="whole" property="whole"/>
        <result column="division" property="division"/>
        <result column="effect" property="effect"/>
        <result column="report" property="report"/>
        <result column="safety" property="safety"/>
        <result column="rescue" property="rescue"/>
        <result column="evacuate" property="evacuate"/>
        <result column="need_modify" property="needModify"/>
        <result column="question_and_improve" property="questionAndImprove"/>
        <result column="modify_content" property="modifyContent"/>
    </resultMap>

    <select id="selectEmergencyDrillEvaluationById" resultMap="emergencyDrillEvaluationInfoDetailDOResult">
        select id ,`drill_plan_id`,`suitable`,`sufficient`,`arrival`,supplies ,protection ,whole ,division,
         effect ,report ,safety ,rescue ,evacuate ,need_modify ,question_and_improve ,modify_content
        from emergency_drill_evaluation
        where del_flag = 0 and id = #{id}
    </select>

    <update id="updateEmergencyDrillEvaluation" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfo">
        update emergency_drill_evaluation
        <trim prefix="SET" suffixOverrides=",">
            <if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
            <if test="updateUid != null ">update_uid = #{updateUid},</if>
            <if test="drillPlanId != null ">drill_plan_id = #{drillPlanId},</if>
            <if test="suitable != null and suitable != ''">suitable = #{suitable},</if>
            <if test="sufficient != null and sufficient != ''">sufficient = #{sufficient},</if>
            <if test="arrival != null and arrival != ''">arrival = #{arrival},</if>
            <if test="supplies != null and purpose != ''">supplies = #{supplies},</if>
            <if test="protection != null and purpose != ''">protection = #{protection},</if>
            <if test="whole != null and whole != ''">whole = #{whole},</if>
            <if test="division != null and division != ''">division = #{division},</if>
            <if test="effect != null and effect != ''">effect = #{effect},</if>
            <if test="report != null and report != ''">report = #{report},</if>
            <if test="safety != null and safety != ''">safety = #{safety},</if>
            <if test="rescue != null and rescue != ''">rescue = #{rescue},</if>
            <if test="evacuate != null and evacuate != ''">evacuate = #{evacuate},</if>
            <if test="needModify != null ">need_modify = #{needModify},</if>
            <if test="questionAndImprove != null and questionAndImprove != ''">question_and_improve = #{questionAndImprove},</if>
            <if test="modifyContent != null and modifyContent != ''">modify_content = #{modifyContent},</if>
        </trim>
        where id = #{id}
    </update>

    <update id="deleteEmergencyDrillEvaluation">
        update emergency_drill_evaluation set del_flag = 1 where id = #{id}
    </update>
</mapper>

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationUserInfoMapper.xml

对比新文件
@@ -0,0 +1,52 @@
<?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.EmergencyDrillEvaluationUserInfoRepository">

    <insert id="addEmergencyDrillEvaluationUser">
        insert into emergency_drill_evaluation_user
        <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="drillEvaluationId != null ">drill_evaluation_id,</if>
            <if test="userUid != null ">user_uid,</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="drillEvaluationId != null ">#{drillEvaluationId},</if>
            <if test="userUid != null ">#{userUid},</if>
        </trim>
    </insert>

    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationUserInfoDO" id="emergencyDrillEvaluationUserInfoDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="drill_evaluation_id" property="drillEvaluationId" />
        <result column="user_uid" property="userUid" />
    </resultMap>

    <select id="selectEmergencyDrillEvaluationUserByDrillEvaluationId" resultMap="emergencyDrillEvaluationUserInfoDOResult">
        select id,`drill_evaluation_id`,`user_uid` from emergency_drill_evaluation_user where del_flag = 0 and drill_evaluation_id = #{drillEvaluationId}
    </select>

    <update id = "deleteEmergencyDrillEvaluationUserByIds" >
        update emergency_drill_evaluation_user set del_flag = 1 where id in
        <foreach item="id" collection="ids" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>

    <update id="deleteEmergencyDrillEvaluationUserByDrillEvaluationId">
        update emergency_drill_evaluation_user set del_flag = 1 where drill_evaluation_id = #{drillEvaluationId}
    </update>

</mapper>

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml

@@ -68,9 +68,7 @@
    <update id="updateEmergencyDrillExecute" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo">
        update emergency_drill_execute
        <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="status != null ">status = #{status},</if>
            <if test="drillRecordDate != null ">drill_record_date=#{drillRecordDate},</if>

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml

@@ -102,9 +102,7 @@
    <update id="updateEmergencyDrillPlan" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillPlanInfo">
        update emergency_drill_plan
        <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="status != null ">status = #{status},</if>
            <if test="makingPlanDate != null ">making_plan_date=#{makingPlanDate},</if>

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml

@@ -77,9 +77,7 @@
    <update id="updateEmergencyPlan" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfo">
        update emergency_plan
        <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="status != null ">status = #{status},</if>
            <if test="releaseDate != null ">release_date = #{releaseDate},</if>

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml

@@ -54,9 +54,7 @@
    <update id="updateEmergencyPlanLog" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyPlanLogInfo">
        update emergency_plan_log
        <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="planId != null ">plan_id = #{planId},</if>
            <if test="userUid != null ">user_uid = #{userUid},</if>

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml

@@ -73,9 +73,7 @@
    <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>

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml

@@ -62,9 +62,7 @@
            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>