应急预案名称fix

songhuangfeng123

2022-08-04 b99464b1449c1abec269bc247ee69b016753d598

应急预案名称fix

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

@@ -8,6 +8,16 @@
@TableName("emergency_plan")
public class EmergencyPlanInfoPageDO {

    private  String authorName;

    public String getAuthorName() {
        return authorName;
    }

    public void setAuthorName(String authorName) {
        this.authorName = authorName;
    }

    private Boolean abolishStatus;



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

@@ -3,9 +3,8 @@
public enum EmergencyPlanStatus {

    START(1,"开始"),
    FIRST_LEVEL_APPROEAL(2,"一级审批"),
    SECOND_LEVEL_APPROEAL(3,"二级审批"),
    END(4,"结束");
    SECOND_LEVEL_APPROVAL(2,"审批中"),
    END(3,"结束");

    private Integer status;


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

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

public class EmergencyPlanReqDTO {

    private Boolean abolishStatus;

    public Boolean getAbolishStatus() {
        return abolishStatus;
    }

    public void setAbolishStatus(Boolean abolishStatus) {
        this.abolishStatus = abolishStatus;
    }

    private String authorName;

    public String getAuthorName() {

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

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

public class EmergencyPlanPageRespDTO {

    private  String authorName;

    public String getAuthorName() {
        return authorName;
    }

    public void setAuthorName(String authorName) {
        this.authorName = authorName;
    }

    private Long id;

    private String name ;

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

@@ -11,10 +11,11 @@
        <result column="type" property="type"/>
        <result column="level" property="level"/>
        <result column="release_date" property="releaseDate"/>
        <result column="author_name" property="authorName"/>
    </resultMap>

    <select id="selectEmergencyPlanList" resultMap="emergencyPlanInfoPageDOResult">
        select id,`name`,`status`,`type`,`level`,release_date from emergency_plan
        select id,`name`,`status`,`type`,`level`,release_date,author_name from emergency_plan
        where del_flag = 0 and abolish_status = #{query.abolishStatus}
        <if test="query.name != null  and query.name != ''">and `name` like concat('%', #{query.name}, '%')</if>
        <if test="query.type != null  and query.type != ''">and `type` = #{query.type}</if>