应急计划发布fix

songhuangfeng123

2022-08-03 44163ffec2f7a1f4c428cebc2aa5577f1f45e0b5

应急计划发布fix

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

@@ -10,6 +10,17 @@
@TableName("emergency_drill_plan")
public class EmergencyDrillPlanInfo {

    private String makingUserName;


    public String getMakingUserName() {
        return makingUserName;
    }

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

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


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

@@ -10,6 +10,26 @@
@TableName("emergency_drill_plan")
public class EmergencyDrillPlanInfoDetailDO {

    private String planName;

    public String getPlanName() {
        return planName;
    }

    public void setPlanName(String planName) {
        this.planName = planName;
    }

    private String makingUserName;

    public String getMakingUserName() {
        return makingUserName;
    }

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

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


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

@@ -9,6 +9,16 @@
@TableName("emergency_drill_plan_user")
public class EmergencyDrillPlanUserInfo {

    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/EmergencyDrillPlanUserInfoDO.java

@@ -9,6 +9,16 @@
@TableName("emergency_drill_plan_user")
public class EmergencyDrillPlanUserInfoDO {

    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/EmergencyDrillPlanReqDTO.java

@@ -8,6 +8,17 @@

public class EmergencyDrillPlanReqDTO {

    private String makingUserName;

    public String getMakingUserName() {
        return makingUserName;
    }

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


    private Long id;

    private Integer status;

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

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

public class EmergencyDrillPlanUserReqDTO {

    private String userName;

    public String getUserName() {
        return userName;
    }

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

    private Long id;

    private Long drillPlanId;

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

@@ -8,6 +8,26 @@

public class EmergencyDrillPlanDetailRespDTO {

    private String planName;

    public String getPlanName() {
        return planName;
    }

    public void setPlanName(String planName) {
        this.planName = planName;
    }

    private String makingUserName;

    public String getMakingUserName() {
        return makingUserName;
    }

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

    private Long id;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -49,6 +69,16 @@

    private List<EmergencyDrillPlanUserRespDTO> userList;

    private List<EmergencyDrillPlanUserRespDTO> chargeUserList;

    public List<EmergencyDrillPlanUserRespDTO> getChargeUserList() {
        return chargeUserList;
    }

    public void setChargeUserList(List<EmergencyDrillPlanUserRespDTO> chargeUserList) {
        this.chargeUserList = chargeUserList;
    }

    public Long getId() {
        return id;
    }

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

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

public class EmergencyDrillPlanUserRespDTO {

    private String userName;

    public String getUserName() {
        return userName;
    }

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

    private Long id;

    private Long drillPlanId;

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

@@ -140,7 +140,12 @@
            List<EmergencyDrillPlanUserInfoDO> emergencyDrillPlanUserInfoDOList = emergencyDrillPlanUserInfoService.selectEmergencyDrillPlanUserByDrillPlanId(id);
            if (!CollectionUtils.isEmpty(emergencyDrillPlanUserInfoDOList)) {
                List<EmergencyDrillPlanUserRespDTO> emergencyUserUserRespDTOList = BeanCopyUtils.copyBeanList(emergencyDrillPlanUserInfoDOList, EmergencyDrillPlanUserRespDTO.class);
                emergencyDrillPlanDetailRespDTO.setUserList(emergencyUserUserRespDTOList);

                List<EmergencyDrillPlanUserRespDTO> userList = emergencyUserUserRespDTOList.stream().filter(user -> user.getType()==1).collect(Collectors.toList());
                List<EmergencyDrillPlanUserRespDTO> chargeUserList = emergencyUserUserRespDTOList.stream().filter(user -> user.getType()==2).collect(Collectors.toList());

                emergencyDrillPlanDetailRespDTO.setUserList(userList);
                emergencyDrillPlanDetailRespDTO.setChargeUserList(chargeUserList);
            }
            // 查找对应的附件
            List<EmergencyDrillPlanFileInfoDO> emergencyDrillPlanFileInfoDOList = emergencyDrillPlanFileInfoService.selectEmergencyDrillPlanFileByDrillPlanId(id);

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

@@ -35,6 +35,7 @@
            <if test="makingPlanDate != null ">making_plan_date,</if>
            <if test="drillPlanDate != null ">drill_plan_date,</if>
            <if test="makingUserUid != null ">making_user_uid,</if>
            <if test="makingUserName != null and makingUserName != ''">`making_user_name`,</if>
            <if test="makingDepartmentId != null ">making_department_id,</if>
            <if test="planId != null ">plan_id,</if>
            <if test="departmentId != null ">department_id,</if>
@@ -58,6 +59,7 @@
            <if test="makingPlanDate != null ">#{makingPlanDate},</if>
            <if test="drillPlanDate != null ">#{drillPlanDate},</if>
            <if test="makingUserUid != null ">#{makingUserUid},</if>
            <if test="makingUserName != null and makingUserName != ''">#{makingUserName},</if>
            <if test="makingDepartmentId != null ">#{makingDepartmentId},</if>
            <if test="planId != null ">#{planId},</if>
            <if test="departmentId != null ">#{departmentId},</if>
@@ -81,6 +83,7 @@
        <result column="making_plan_date" property="makingPlanDate"/>
        <result column="drill_plan_date" property="drillPlanDate"/>
        <result column="making_user_uid" property="makingUserUid"/>
        <result column="making_user_name" property="makingUserName"/>
        <result column="making_department_id" property="makingDepartmentId"/>
        <result column="plan_id" property="planId"/>
        <result column="department_id" property="departmentId"/>
@@ -95,10 +98,32 @@
    </resultMap>

    <select id="selectEmergencyDrillPlanById" resultMap="emergencyDrillPlanInfoDetailDOResult">
        select id ,`status`,`gmt_moditify`,`making_plan_date`,`drill_plan_date`,making_user_uid ,making_department_id ,plan_id ,department_id,
         drill_expense ,drill_name ,drill_address ,drill_way ,drill_level ,insurance_measures ,remark ,purpose
        from emergency_drill_plan
        where del_flag = 0 and id = #{id}
    SELECT
        a.id,
        a.`status`,
        a.`gmt_moditify`,
        a.`making_plan_date`,
        a.`drill_plan_date`,
        a.making_user_uid,
        a.making_user_name,
        a.making_department_id,
        a.plan_id,
        a.department_id,
        a.drill_expense,
        a.drill_name,
        a.drill_address,
        a.drill_way,
        a.drill_level,
        a.insurance_measures,
        a.remark,
        a.purpose,
        b.`name` AS planName
    FROM
        emergency_drill_plan a
        LEFT JOIN emergency_plan b ON a.plan_id = b.id
    WHERE
        a.del_flag = 0
        AND a.id = #{id}
    </select>

    <update id="updateEmergencyDrillPlan" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillPlanInfo">
@@ -110,6 +135,7 @@
            <if test="makingPlanDate != null ">making_plan_date=#{makingPlanDate},</if>
            <if test="drillPlanDate != null ">drill_plan_date=#{drillPlanDate},</if>
            <if test="makingUserUid != null ">making_user_uid=#{makingUserUid},</if>
            <if test="makingUserName != null and makingUserName != ''">making_user_name=#{makingUserName},</if>
            <if test="makingDepartmentId != null ">making_department_id=#{makingDepartmentId},</if>
            <if test="planId != null ">plan_id=#{planId},</if>
            <if test="departmentId != null ">department_id=#{departmentId},</if>

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

@@ -15,6 +15,7 @@
            <if test="updateUid != null ">update_uid,</if>
            <if test="drillPlanId != null ">drill_plan_id,</if>
            <if test="userUid != null ">user_uid,</if>
            <if test="userName != null and userName != ''">user_name,</if>
            <if test="type != null ">type</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -26,6 +27,7 @@
            <if test="updateUid != null ">#{updateUid},</if>
            <if test="drillPlanId != null ">#{drillPlanId},</if>
            <if test="userUid != null ">#{userUid},</if>
            <if test="userName != null and userName != ''">#{userName},</if>
            <if test="type != null ">#{type}</if>
        </trim>
    </insert>
@@ -34,11 +36,12 @@
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="drill_plan_id" property="drillPlanId" />
        <result column="user_uid" property="userUid" />
        <result column="user_name" property="userName" />
        <result column="type" property="type" />
    </resultMap>

    <select id="selectEmergencyDrillPlanUserByDrillPlanId" resultMap="emergencyDrillPlanUserInfoDOResult">
        select id,`drill_plan_id`,`user_uid`,`type` from emergency_drill_plan_user where del_flag = 0 and drill_plan_id = #{drillPlanId}
        select id,`drill_plan_id`,`user_uid`,user_name,`type` from emergency_drill_plan_user where del_flag = 0 and drill_plan_id = #{drillPlanId}
    </select>

    <update id = "deleteEmergencyDrillPlanUserByIds" >