fix

songhuangfeng123

2022-08-06 811378d28db922f1e2945015ac9b0154db46ea54

fix

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

@@ -30,8 +30,29 @@
    private String title;
    //提交人ID/外键
    private Long submitPersonId;
    //提交人名称/外键
    private String submitPersonName;
    //审批人ID/外键
    private Long approvePersonId;
    //审批人名称/外键
    private String approvePersonName;

    public String getSubmitPersonName() {
        return submitPersonName;
    }

    public void setSubmitPersonName(String submitPersonName) {
        this.submitPersonName = submitPersonName;
    }

    public String getApprovePersonName() {
        return approvePersonName;
    }

    public void setApprovePersonName(String approvePersonName) {
        this.approvePersonName = approvePersonName;
    }

    //审批状态 1：未审批 2：审批中 3：审批完成
    private Integer approveStatus;
    //审批意见

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

@@ -28,8 +28,12 @@
    private String title;
    //提交人ID/外键
    private Long submitPersonId;
    //提交人名称/外键
    private String submitPersonName;
    //审批人ID/外键
    private Long approvePersonId;
    //审批人名称/外键
    private String approvePersonName;
    //审批状态 1：未审批 2：审批中 3：审批完成
    private Integer approveStatus;
    //审批意见
@@ -43,6 +47,22 @@
    //关联业务说明
    private String relateDesc;

    public String getSubmitPersonName() {
        return submitPersonName;
    }

    public void setSubmitPersonName(String submitPersonName) {
        this.submitPersonName = submitPersonName;
    }

    public String getApprovePersonName() {
        return approvePersonName;
    }

    public void setApprovePersonName(String approvePersonName) {
        this.approvePersonName = approvePersonName;
    }

    public Long getId() {
        return id;
    }

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

@@ -103,8 +103,6 @@
                    addEmergencyDrillEvaluationUser(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getUserList());
                }

                // 修改实施表的评价状态
                emergencyDrillExecuteInfoService.updateStatusById(emergencyDrillEvaluationReqDTO.getDrillExecuteId());
                return new ResultVO<>(ResultCodes.OK);
            }
        }
@@ -169,17 +167,18 @@
                emergencyDrillEvaluationDetailRespDTO.setExecuteUserList(emergencyUserFileRespDTOList);
            }
            // 演练评价的文件
            List<EmergencyDrillEvaluationFileInfoDO> emergencyDrillEvaluationFileInfoDOList = emergencyDrillEvaluationFileInfoService.selectEmergencyDrillEvaluationFileByDrillEvaluationId(id);
            List<EmergencyDrillEvaluationFileInfoDO> emergencyDrillEvaluationFileInfoDOList = emergencyDrillEvaluationFileInfoService.selectEmergencyDrillEvaluationFileByDrillEvaluationId(emergencyDrillEvaluationDetailRespDTO.getId());
            if (!CollectionUtils.isEmpty(emergencyDrillEvaluationFileInfoDOList)) {
                List<EmergencyDrillEvaluationFileRespDTO> emergencyUserFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyDrillEvaluationFileInfoDOList, EmergencyDrillEvaluationFileRespDTO.class);
                emergencyDrillEvaluationDetailRespDTO.setEvaluationFileList(emergencyUserFileRespDTOList);
            }
            // 演练评价的人员
            List<EmergencyDrillEvaluationUserInfoDO> emergencyDrillEvaluationUserInfoDOList = emergencyDrillEvaluationUserInfoService.selectEmergencyDrillEvaluationUserByDrillEvaluationId(id);
            List<EmergencyDrillEvaluationUserInfoDO> emergencyDrillEvaluationUserInfoDOList = emergencyDrillEvaluationUserInfoService.selectEmergencyDrillEvaluationUserByDrillEvaluationId(emergencyDrillEvaluationDetailRespDTO.getId());
            if (!CollectionUtils.isEmpty(emergencyDrillEvaluationUserInfoDOList)) {
                List<EmergencyDrillEvaluationUserRespDTO> emergencyUserUserRespDTOList = BeanCopyUtils.copyBeanList(emergencyDrillEvaluationUserInfoDOList, EmergencyDrillEvaluationUserRespDTO.class);
                emergencyDrillEvaluationDetailRespDTO.setEvaluationUserList(emergencyUserUserRespDTOList);
            }


            return new ResultVO<>(ResultCodes.OK, emergencyDrillEvaluationDetailRespDTO);
        }
@@ -189,7 +188,7 @@
    public ResultVO updateEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
        Date nowDate = new Date();
        // 查询是否存在
        EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationByExecuteId(emergencyDrillEvaluationReqDTO.getId());
        EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationByExecuteId(emergencyDrillEvaluationReqDTO.getDrillExecuteId());
        if (emergencyDrillEvaluationInfoDetailDO == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_NOT_EXIST);
        } else {
@@ -207,7 +206,8 @@
            if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getUserList())) {
                updateEmergencyDrillEvaluationUser(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getUserList());
            }

            // 修改实施表的评价状态
            emergencyDrillExecuteInfoService.updateStatusById(emergencyDrillEvaluationInfoDetailDO.getDrillExecuteId());
            return new ResultVO<>(ResultCodes.OK);
        }
    }

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

@@ -31,7 +31,7 @@
            LEFT JOIN emergency_plan c ON b.plan_id = c.id
        WHERE
            a.del_flag = 0
        <if test="query.status != null  and query.status != ''">and a.status = #{query.status}</if>
        <if test="query.status != null">and a.status = #{query.status}</if>
    </select>

    <insert id="addEmergencyDrillExecute" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo"

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

@@ -94,8 +94,8 @@
    </resultMap>

    <select id="selectWorkApproveById" resultMap="WorkApproveInfoDetailDOResult">
        select id,gmt_create ,work_name,title,`submit_person_id`,`approve_person_id`,`approve_status`,approve_result,`approve_memo`,sort ,
        `relate_type`,relate_id,`relate_desc`
        select id,`work_name`,`title`,`submit_person_id`,submit_person_name,approve_person_id,approve_person_name,sort ,
        `approve_status`,approve_result ,approve_memo ,gmt_create
        from emergency_work_approve where del_flag = 0 and id = #{id}
    </select>