应急评价fix

songhuangfeng123

2022-08-03 d018082465bdb6bdbb956cfd4d80d67ba39232f6

应急评价fix

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

@@ -60,8 +60,8 @@
    /**
     * 应急演练实施评价删除/批量删除
     */
    @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
    public ResultVO batchDeleteEmergencyDrillEvaluation(@PathVariable("ids")String ids){
    @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
    public ResultVO batchDeleteEmergencyDrillEvaluation(@RequestBody Long[] ids){
        return emergencyDrillEvaluationService.batchDeleteEmergencyDrillEvaluation(ids);
    }
}

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

@@ -14,6 +14,27 @@


    // 应急演练计划

    private String emergencyPlanName;

    private String makingUserName;

    public String getEmergencyPlanName() {
        return emergencyPlanName;
    }

    public void setEmergencyPlanName(String emergencyPlanName) {
        this.emergencyPlanName = emergencyPlanName;
    }

    public String getMakingUserName() {
        return makingUserName;
    }

    public void setMakingUserName(String makingUserName) {
        this.makingUserName = makingUserName;
    }

    private Date makingPlanDate;

    private Date drillPlanDate;
@@ -41,6 +62,18 @@
    private String purpose;

    // 应急演练实施

    private String recordUserName;


    public String getRecordUserName() {
        return recordUserName;
    }

    public void setRecordUserName(String recordUserName) {
        this.recordUserName = recordUserName;
    }

    private Long drillPlanId;

    private Date drillRecordDate;

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

@@ -9,6 +9,16 @@
@TableName("emergency_drill_evaluation")
public class EmergencyDrillEvaluationInfoPageDO {

    private String emergencyPlanName;

    public String getEmergencyPlanName() {
        return emergencyPlanName;
    }

    public void setEmergencyPlanName(String emergencyPlanName) {
        this.emergencyPlanName = emergencyPlanName;
    }

    private String drillName;

    private String drillAddress;

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

@@ -9,6 +9,16 @@
@TableName("emergency_drill_evaluation_user")
public class EmergencyDrillEvaluationUserInfo {

    private  String userName;

    public String getUserName() {
        return userName;
    }

    public void setUserName(String userName) {
        this.userName = userName;
    }

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


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

@@ -9,6 +9,16 @@
@TableName("emergency_drill_evaluation_user")
public class EmergencyDrillEvaluationUserInfoDO {

    private  String userName;

    public String getUserName() {
        return userName;
    }

    public void setUserName(String userName) {
        this.userName = userName;
    }

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


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

@@ -3,6 +3,16 @@

public class EmergencyDrillEvaluationUserReqDTO {

    private  String userName;

    public String getUserName() {
        return userName;
    }

    public void setUserName(String userName) {
        this.userName = userName;
    }

    private Long id;

    private Long drillEvaluationId;

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

@@ -9,6 +9,26 @@
public class EmergencyDrillEvaluationDetailRespDTO {

    // 应急演练计划
    private String emergencyPlanName;

    private String makingUserName;

    public String getEmergencyPlanName() {
        return emergencyPlanName;
    }

    public void setEmergencyPlanName(String emergencyPlanName) {
        this.emergencyPlanName = emergencyPlanName;
    }

    public String getMakingUserName() {
        return makingUserName;
    }

    public void setMakingUserName(String makingUserName) {
        this.makingUserName = makingUserName;
    }

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

@@ -41,7 +61,28 @@

    private List<EmergencyDrillPlanUserRespDTO> planUserList;

    private List<EmergencyDrillPlanUserRespDTO> planChargeUserList;

    public List<EmergencyDrillPlanUserRespDTO> getPlanChargeUserList() {
        return planChargeUserList;
    }

    public void setPlanChargeUserList(List<EmergencyDrillPlanUserRespDTO> planChargeUserList) {
        this.planChargeUserList = planChargeUserList;
    }

    // 应急演练实施

    private String recordUserName;

    public String getRecordUserName() {
        return recordUserName;
    }

    public void setRecordUserName(String recordUserName) {
        this.recordUserName = recordUserName;
    }

    private Long drillPlanId;

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

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

@@ -6,6 +6,16 @@

public class EmergencyDrillEvaluationPageRespDTO {

    private String emergencyPlanName;

    public String getEmergencyPlanName() {
        return emergencyPlanName;
    }

    public void setEmergencyPlanName(String emergencyPlanName) {
        this.emergencyPlanName = emergencyPlanName;
    }

    private String drillName;

    private String drillAddress;

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

@@ -3,6 +3,16 @@

public class EmergencyDrillEvaluationUserRespDTO {

    private  String userName;

    public String getUserName() {
        return userName;
    }

    public void setUserName(String userName) {
        this.userName = userName;
    }

    private Long id;

    private Long drillEvaluationId;

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

@@ -20,5 +20,5 @@

    ResultVO updateEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO);

    ResultVO batchDeleteEmergencyDrillEvaluation(String ids);
    ResultVO batchDeleteEmergencyDrillEvaluation(Long[] ids);
}

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

@@ -152,8 +152,12 @@
            // 演练计划的人员
            List<EmergencyDrillPlanUserInfoDO> planUserInfoDOList = emergencyDrillPlanUserInfoService.selectEmergencyDrillPlanUserByDrillPlanId(emergencyDrillEvaluationDetailRespDTO.getDrillPlanId());
            if (!CollectionUtils.isEmpty(planUserInfoDOList)) {
                List<EmergencyDrillPlanUserRespDTO> emergencyUserUserRespDTOList = BeanCopyUtils.copyBeanList(planUserInfoDOList, EmergencyDrillPlanUserRespDTO.class);
                emergencyDrillEvaluationDetailRespDTO.setPlanUserList(emergencyUserUserRespDTOList);
                List<EmergencyDrillPlanUserRespDTO> emergencyDrillPlanUserRespDTOList = BeanCopyUtils.copyBeanList(planUserInfoDOList, EmergencyDrillPlanUserRespDTO.class);

                List<EmergencyDrillPlanUserRespDTO> planUserList = emergencyDrillPlanUserRespDTOList.stream().filter(user -> user.getType()==1 ).collect(Collectors.toList());
                List<EmergencyDrillPlanUserRespDTO> planChargeUserList = emergencyDrillPlanUserRespDTOList.stream().filter(user -> user.getType()==2 ).collect(Collectors.toList());
                emergencyDrillEvaluationDetailRespDTO.setPlanUserList(planUserList);
                emergencyDrillEvaluationDetailRespDTO.setPlanChargeUserList(planChargeUserList);
            }
            // 演练实施的人员
            List<EmergencyDrillExecuteUserInfoDO> executeUserList = emergencyDrillExecuteUserInfoService.selectEmergencyDrillExecuteUserByDrillExecuteId(emergencyDrillEvaluationDetailRespDTO.getDrillExecuteId());
@@ -288,13 +292,13 @@
    }

    @Override
    public ResultVO batchDeleteEmergencyDrillEvaluation(String ids) {
        if (StringUtils.isBlank(ids)) {
    public ResultVO batchDeleteEmergencyDrillEvaluation(Long[] ids) {

        if (ids == null ||  ids.length==0){
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_NULL);
        } else {
            String[] idArr = ids.split(",");
            for (String id : idArr) {
                deleteEmergencyDrillEvaluation(Long.valueOf(id));
            for (Long id : ids){
                deleteEmergencyDrillEvaluation(id);
            }
            return new ResultVO(ResultCodes.OK);
        }

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

@@ -13,16 +13,19 @@
    <select id="selectEmergencyDrillEvaluationList" resultMap="emergencyDrillEvaluationInfoPageDOResult">
    SELECT
        a.id,
            a.drill_execute_id,
        c.drill_name AS drillName,
        c.drill_address AS drillAddress,
        c.drill_way AS drillWay,
        c.drill_level AS drillLevel,
        c.drill_plan_date AS drillPlanDate,
        b.`drill_record_date` AS drillRecordDate
            b.`drill_record_date` AS drillRecordDate,
            d.`name` AS emergencyPlanName
    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
            LEFT JOIN emergency_plan d ON c.plan_id = d.id
    WHERE
        a.del_flag = 0
    </select>
@@ -122,11 +125,13 @@
        a.modify_content,
        b.drill_record_date AS drillRecordDate,
        b.record_user_uid AS recordUserUid,
        b.record_user_name AS recordUserName,
        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_user_name AS makingUserName,
        c.making_department_id AS makingDepartmentId,
        c.department_id AS departmentId,
        c.drill_expense AS drillExpense,
@@ -136,11 +141,13 @@
        c.drill_way AS drillWay,
        c.insurance_measures AS insuranceMeasures,
        c.remark AS remark,
        c.purpose AS purpose
        c.purpose AS purpose,
        d.`name` AS emergencyPlanName
    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
        LEFT JOIN emergency_plan d ON c.plan_id = d.id
    WHERE
        a.del_flag = 0
    AND a.id = #{id}

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

@@ -15,6 +15,7 @@
            <if test="updateUid != null ">update_uid,</if>
            <if test="drillEvaluationId != null ">drill_evaluation_id,</if>
            <if test="userUid != null ">user_uid,</if>
            <if test="userName != null and userName != ''">user_name,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null ">#{id},</if>
@@ -25,6 +26,7 @@
            <if test="updateUid != null ">#{updateUid},</if>
            <if test="drillEvaluationId != null ">#{drillEvaluationId},</if>
            <if test="userUid != null ">#{userUid},</if>
            <if test="userName != null and userName != ''">#{userName},</if>
        </trim>
    </insert>

@@ -32,10 +34,11 @@
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="drill_evaluation_id" property="drillEvaluationId" />
        <result column="user_uid" property="userUid" />
        <result column="user_name" property="userName" />
    </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 id,`drill_evaluation_id`,`user_uid`,user_name from emergency_drill_evaluation_user where del_flag = 0 and drill_evaluation_id = #{drillEvaluationId}
    </select>

    <update id = "deleteEmergencyDrillEvaluationUserByIds" >

 incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentExpressInfoMapper.xml

@@ -19,6 +19,7 @@
    <select id="selectAccidentExpressList" resultMap="AccidentExpressInfoPageDOResult">
        select id,`gmt_moditify`,`create_uid`,`accident_cause`,`occurrence_time`,occurrence_place ,accident_department_id ,accident_name ,create_name
          from accident_express where del_flag = 0
        <if test="query.accidentName != null  and query.accidentName != ''">and `accident_name` like concat('%', #{query.accidentName}, '%')</if>
    </select>

    <insert id="addAccidentExpress" parameterType="com.gkhy.safePlatform.incidentManage.entity.AccidentExpressInfo"