应急评价详情fix

songhuangfeng123

2022-08-01 3705ec13069cb71c8d7369e9bb58f73f271b792d

应急评价详情fix

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

@@ -3,10 +3,191 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteUserRespDTO;

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

@TableName("emergency_drill_evaluation")
public class EmergencyDrillEvaluationInfoDetailDO {


    // 应急演练计划
    private Date makingPlanDate;

    private Date drillPlanDate;

    private Long makingUserUid;

    private Long makingDepartmentId;

    private Long departmentId;

    private BigDecimal drillExpense;

    private String drillLevel;

    private String drillAddress;

    private String drillName;

    private String drillWay;

    private String insuranceMeasures;

    private String remark;

    private String purpose;

    // 应急演练实施
    private Long drillPlanId;

    private Date drillRecordDate;

    private Long recordUserUid;

    private String processDesc;

    private List<EmergencyDrillExecuteUserRespDTO> userList;

    public Date getMakingPlanDate() {
        return makingPlanDate;
    }

    public void setMakingPlanDate(Date makingPlanDate) {
        this.makingPlanDate = makingPlanDate;
    }

    public Date getDrillPlanDate() {
        return drillPlanDate;
    }

    public void setDrillPlanDate(Date drillPlanDate) {
        this.drillPlanDate = drillPlanDate;
    }

    public Long getMakingUserUid() {
        return makingUserUid;
    }

    public void setMakingUserUid(Long makingUserUid) {
        this.makingUserUid = makingUserUid;
    }

    public Long getMakingDepartmentId() {
        return makingDepartmentId;
    }

    public void setMakingDepartmentId(Long makingDepartmentId) {
        this.makingDepartmentId = makingDepartmentId;
    }

    public Long getDepartmentId() {
        return departmentId;
    }

    public void setDepartmentId(Long departmentId) {
        this.departmentId = departmentId;
    }

    public BigDecimal getDrillExpense() {
        return drillExpense;
    }

    public void setDrillExpense(BigDecimal drillExpense) {
        this.drillExpense = drillExpense;
    }

    public String getDrillLevel() {
        return drillLevel;
    }

    public void setDrillLevel(String drillLevel) {
        this.drillLevel = drillLevel;
    }

    public String getDrillAddress() {
        return drillAddress;
    }

    public void setDrillAddress(String drillAddress) {
        this.drillAddress = drillAddress;
    }

    public String getDrillName() {
        return drillName;
    }

    public void setDrillName(String drillName) {
        this.drillName = drillName;
    }

    public String getDrillWay() {
        return drillWay;
    }

    public void setDrillWay(String drillWay) {
        this.drillWay = drillWay;
    }

    public String getInsuranceMeasures() {
        return insuranceMeasures;
    }

    public void setInsuranceMeasures(String insuranceMeasures) {
        this.insuranceMeasures = insuranceMeasures;
    }

    public String getRemark() {
        return remark;
    }

    public void setRemark(String remark) {
        this.remark = remark;
    }

    public String getPurpose() {
        return purpose;
    }

    public void setPurpose(String purpose) {
        this.purpose = purpose;
    }

    public Date getDrillRecordDate() {
        return drillRecordDate;
    }

    public void setDrillRecordDate(Date drillRecordDate) {
        this.drillRecordDate = drillRecordDate;
    }

    public Long getRecordUserUid() {
        return recordUserUid;
    }

    public void setRecordUserUid(Long recordUserUid) {
        this.recordUserUid = recordUserUid;
    }

    public String getProcessDesc() {
        return processDesc;
    }

    public void setProcessDesc(String processDesc) {
        this.processDesc = processDesc;
    }

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

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

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

@@ -178,26 +359,11 @@
        this.modifyContent = modifyContent;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationInfo{" +
                "id=" + id +
                ", drillExecuteId=" + drillExecuteId +
                ", 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 + '\'' +
                '}';
    public Long getDrillPlanId() {
        return drillPlanId;
    }

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

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

@@ -8,6 +8,52 @@

public class EmergencyDrillEvaluationDetailRespDTO {

    // 应急演练计划
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date makingPlanDate;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date drillPlanDate;

    private Long makingUserUid;

    private Long makingDepartmentId;

    private Long departmentId;

    private BigDecimal drillExpense;

    private String drillLevel;

    private String drillAddress;

    private String drillName;

    private String drillWay;

    private String insuranceMeasures;

    private String remark;

    private String purpose;

    private List<EmergencyDrillPlanFileRespDTO> planFileList;

    private List<EmergencyDrillPlanUserRespDTO> planUserList;

    // 应急演练实施
    private Long drillPlanId;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date drillRecordDate;

    private Long recordUserUid;

    private String processDesc;

    private List<EmergencyDrillExecuteUserRespDTO> executeUserList;

    // 评价
    private Long id;

    private Long drillExecuteId;
@@ -42,9 +88,161 @@

    private String modifyContent;

    private List<EmergencyDrillEvaluationFileRespDTO> fileList;
    private List<EmergencyDrillEvaluationFileRespDTO> evaluationFileList;

    private List<EmergencyDrillEvaluationUserRespDTO> userList;
    private List<EmergencyDrillEvaluationUserRespDTO> evaluationUserList;

    public Date getMakingPlanDate() {
        return makingPlanDate;
    }

    public void setMakingPlanDate(Date makingPlanDate) {
        this.makingPlanDate = makingPlanDate;
    }

    public Date getDrillPlanDate() {
        return drillPlanDate;
    }

    public void setDrillPlanDate(Date drillPlanDate) {
        this.drillPlanDate = drillPlanDate;
    }

    public Long getMakingUserUid() {
        return makingUserUid;
    }

    public void setMakingUserUid(Long makingUserUid) {
        this.makingUserUid = makingUserUid;
    }

    public Long getMakingDepartmentId() {
        return makingDepartmentId;
    }

    public void setMakingDepartmentId(Long makingDepartmentId) {
        this.makingDepartmentId = makingDepartmentId;
    }

    public Long getDepartmentId() {
        return departmentId;
    }

    public void setDepartmentId(Long departmentId) {
        this.departmentId = departmentId;
    }

    public BigDecimal getDrillExpense() {
        return drillExpense;
    }

    public void setDrillExpense(BigDecimal drillExpense) {
        this.drillExpense = drillExpense;
    }

    public String getDrillLevel() {
        return drillLevel;
    }

    public void setDrillLevel(String drillLevel) {
        this.drillLevel = drillLevel;
    }

    public String getDrillAddress() {
        return drillAddress;
    }

    public void setDrillAddress(String drillAddress) {
        this.drillAddress = drillAddress;
    }

    public String getDrillName() {
        return drillName;
    }

    public void setDrillName(String drillName) {
        this.drillName = drillName;
    }

    public String getDrillWay() {
        return drillWay;
    }

    public void setDrillWay(String drillWay) {
        this.drillWay = drillWay;
    }

    public String getInsuranceMeasures() {
        return insuranceMeasures;
    }

    public void setInsuranceMeasures(String insuranceMeasures) {
        this.insuranceMeasures = insuranceMeasures;
    }

    public String getRemark() {
        return remark;
    }

    public void setRemark(String remark) {
        this.remark = remark;
    }

    public String getPurpose() {
        return purpose;
    }

    public void setPurpose(String purpose) {
        this.purpose = purpose;
    }

    public List<EmergencyDrillPlanFileRespDTO> getPlanFileList() {
        return planFileList;
    }

    public void setPlanFileList(List<EmergencyDrillPlanFileRespDTO> planFileList) {
        this.planFileList = planFileList;
    }

    public List<EmergencyDrillPlanUserRespDTO> getPlanUserList() {
        return planUserList;
    }

    public void setPlanUserList(List<EmergencyDrillPlanUserRespDTO> planUserList) {
        this.planUserList = planUserList;
    }

    public Date getDrillRecordDate() {
        return drillRecordDate;
    }

    public void setDrillRecordDate(Date drillRecordDate) {
        this.drillRecordDate = drillRecordDate;
    }

    public Long getRecordUserUid() {
        return recordUserUid;
    }

    public void setRecordUserUid(Long recordUserUid) {
        this.recordUserUid = recordUserUid;
    }

    public String getProcessDesc() {
        return processDesc;
    }

    public void setProcessDesc(String processDesc) {
        this.processDesc = processDesc;
    }

    public List<EmergencyDrillExecuteUserRespDTO> getExecuteUserList() {
        return executeUserList;
    }

    public void setExecuteUserList(List<EmergencyDrillExecuteUserRespDTO> executeUserList) {
        this.executeUserList = executeUserList;
    }

    public Long getId() {
        return id;
@@ -182,44 +380,27 @@
        this.modifyContent = modifyContent;
    }

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

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

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

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

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationDetailRespDTO{" +
                "id=" + id +
                ", drillExecuteId=" + drillExecuteId +
                ", 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 +
                '}';
    public Long getDrillPlanId() {
        return drillPlanId;
    }

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

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

@@ -13,10 +13,7 @@
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.model.dto.resp.*;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillEvaluationQuery;
import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillEvaluationDBQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyDrillEvaluationService;
@@ -46,6 +43,14 @@
    @Autowired
    private EmergencyDrillExecuteInfoService emergencyDrillExecuteInfoService;

    @Autowired
    private EmergencyDrillExecuteUserInfoService emergencyDrillExecuteUserInfoService;

    @Autowired
    private EmergencyDrillPlanFileInfoService emergencyDrillPlanFileInfoService;

    @Autowired
    private EmergencyDrillPlanUserInfoService emergencyDrillPlanUserInfoService;

    @Override
    public SearchResultVO<List<EmergencyDrillEvaluationPageRespDTO>> selectEmergencyDrillEvaluationList(PageQuery<EmergencyDrillEvaluationQuery> query) {
@@ -138,18 +143,37 @@
        } 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<EmergencyDrillPlanFileInfoDO> planFileInfoDOList = emergencyDrillPlanFileInfoService.selectEmergencyDrillPlanFileByDrillPlanId(emergencyDrillEvaluationDetailRespDTO.getDrillPlanId());
            if (!CollectionUtils.isEmpty(planFileInfoDOList)) {
                List<EmergencyDrillPlanFileRespDTO> emergencyUserFileRespDTOList = BeanCopyUtils.copyBeanList(planFileInfoDOList, EmergencyDrillPlanFileRespDTO.class);
                emergencyDrillEvaluationDetailRespDTO.setPlanFileList(emergencyUserFileRespDTOList);
            }
            // 查找对应的附件
            // 演练计划的人员
            List<EmergencyDrillPlanUserInfoDO> planUserInfoDOList = emergencyDrillPlanUserInfoService.selectEmergencyDrillPlanUserByDrillPlanId(emergencyDrillEvaluationDetailRespDTO.getDrillPlanId());
            if (!CollectionUtils.isEmpty(planUserInfoDOList)) {
                List<EmergencyDrillPlanUserRespDTO> emergencyUserUserRespDTOList = BeanCopyUtils.copyBeanList(planUserInfoDOList, EmergencyDrillPlanUserRespDTO.class);
                emergencyDrillEvaluationDetailRespDTO.setPlanUserList(emergencyUserUserRespDTOList);
            }
            // 演练实施的人员
            List<EmergencyDrillExecuteUserInfoDO> executeUserList = emergencyDrillExecuteUserInfoService.selectEmergencyDrillExecuteUserByDrillExecuteId(emergencyDrillEvaluationDetailRespDTO.getDrillExecuteId());
            if (!CollectionUtils.isEmpty(executeUserList)) {
                List<EmergencyDrillExecuteUserRespDTO> emergencyUserFileRespDTOList = BeanCopyUtils.copyBeanList(executeUserList, EmergencyDrillExecuteUserRespDTO.class);
                emergencyDrillEvaluationDetailRespDTO.setExecuteUserList(emergencyUserFileRespDTOList);
            }
            // 演练评价的文件
            List<EmergencyDrillEvaluationFileInfoDO> emergencyDrillEvaluationFileInfoDOList = emergencyDrillEvaluationFileInfoService.selectEmergencyDrillEvaluationFileByDrillEvaluationId(id);
            if (!CollectionUtils.isEmpty(emergencyDrillEvaluationFileInfoDOList)) {
                List<EmergencyDrillEvaluationFileRespDTO> emergencyUserFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyDrillEvaluationFileInfoDOList, EmergencyDrillEvaluationFileRespDTO.class);
                emergencyDrillEvaluationDetailRespDTO.setFileList(emergencyUserFileRespDTOList);
                emergencyDrillEvaluationDetailRespDTO.setEvaluationFileList(emergencyUserFileRespDTOList);
            }
            // 演练评价的人员
            List<EmergencyDrillEvaluationUserInfoDO> emergencyDrillEvaluationUserInfoDOList = emergencyDrillEvaluationUserInfoService.selectEmergencyDrillEvaluationUserByDrillEvaluationId(id);
            if (!CollectionUtils.isEmpty(emergencyDrillEvaluationUserInfoDOList)) {
                List<EmergencyDrillEvaluationUserRespDTO> emergencyUserUserRespDTOList = BeanCopyUtils.copyBeanList(emergencyDrillEvaluationUserInfoDOList, EmergencyDrillEvaluationUserRespDTO.class);
                emergencyDrillEvaluationDetailRespDTO.setEvaluationUserList(emergencyUserUserRespDTOList);
            }

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

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

@@ -102,10 +102,48 @@
    </resultMap>

    <select id="selectEmergencyDrillEvaluationById" resultMap="emergencyDrillEvaluationInfoDetailDOResult">
        select id ,`drill_execute_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
        a.id,
        a.`drill_execute_id`,
        a.`suitable`,
        a.`sufficient`,
        a.`arrival`,
        a.supplies,
        a.protection,
        a.whole,
        a.division,
        a.effect,
        a.report,
        a.safety,
        a.rescue,
        a.evacuate,
        a.need_modify,
        a.question_and_improve,
        a.modify_content,
        b.drill_record_date AS drillRecordDate,
        b.record_user_uid AS recordUserUid,
        b.process_desc AS processDesc,
        b.drill_plan_id AS drillPlanId,
        c.making_plan_date AS makingPlanDate,
        c.drill_plan_date AS drillPlanDate,
        c.making_user_uid AS makingUserUid,
        c.making_department_id AS makingDepartmentId,
        c.department_id AS departmentId,
        c.drill_expense AS drillExpense,
        c.drill_level AS drillLevel,
        c.drill_address AS drillAddress,
        c.drill_name AS drillName,
        c.drill_way AS drillWay,
        c.insurance_measures AS insuranceMeasures,
        c.remark AS remark,
        c.purpose AS purpose
    FROM
        emergency_drill_evaluation a
        LEFT JOIN emergency_drill_execute b ON a.drill_execute_id = b.id
        LEFT JOIN emergency_drill_plan c ON b.drill_plan_id = c.id
    WHERE
        a.del_flag = 0
    AND a.id = #{id}
    </select>

    <update id="updateEmergencyDrillEvaluation" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfo">