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

@@ -24,29 +24,29 @@

    private Long drillExecuteId;

    private String suitable;
    private Byte suitable;

    private String sufficient;
    private Byte sufficient;

    private String arrival;
    private Byte arrival;

    private String supplies;
    private Byte supplies;

    private String protection;
    private Byte protection;

    private String whole;
    private Byte whole;

    private String division;
    private Byte division;

    private String effect;
    private Byte effect;

    private String report;
    private Byte report;

    private String safety;
    private Byte safety;

    private String rescue;
    private Byte rescue;

    private String evacuate;
    private Byte evacuate;

    private Boolean needModify;

@@ -110,99 +110,99 @@
        this.drillExecuteId = drillExecuteId;
    }

    public String getSuitable() {
    public Byte getSuitable() {
        return suitable;
    }

    public void setSuitable(String suitable) {
    public void setSuitable(Byte suitable) {
        this.suitable = suitable;
    }

    public String getSufficient() {
    public Byte getSufficient() {
        return sufficient;
    }

    public void setSufficient(String sufficient) {
    public void setSufficient(Byte sufficient) {
        this.sufficient = sufficient;
    }

    public String getArrival() {
    public Byte getArrival() {
        return arrival;
    }

    public void setArrival(String arrival) {
    public void setArrival(Byte arrival) {
        this.arrival = arrival;
    }

    public String getSupplies() {
    public Byte getSupplies() {
        return supplies;
    }

    public void setSupplies(String supplies) {
    public void setSupplies(Byte supplies) {
        this.supplies = supplies;
    }

    public String getProtection() {
    public Byte getProtection() {
        return protection;
    }

    public void setProtection(String protection) {
    public void setProtection(Byte protection) {
        this.protection = protection;
    }

    public String getWhole() {
    public Byte getWhole() {
        return whole;
    }

    public void setWhole(String whole) {
    public void setWhole(Byte whole) {
        this.whole = whole;
    }

    public String getDivision() {
    public Byte getDivision() {
        return division;
    }

    public void setDivision(String division) {
    public void setDivision(Byte division) {
        this.division = division;
    }

    public String getEffect() {
    public Byte getEffect() {
        return effect;
    }

    public void setEffect(String effect) {
    public void setEffect(Byte effect) {
        this.effect = effect;
    }

    public String getReport() {
    public Byte getReport() {
        return report;
    }

    public void setReport(String report) {
    public void setReport(Byte report) {
        this.report = report;
    }

    public String getSafety() {
    public Byte getSafety() {
        return safety;
    }

    public void setSafety(String safety) {
    public void setSafety(Byte safety) {
        this.safety = safety;
    }

    public String getRescue() {
    public Byte getRescue() {
        return rescue;
    }

    public void setRescue(String rescue) {
    public void setRescue(Byte rescue) {
        this.rescue = rescue;
    }

    public String getEvacuate() {
    public Byte getEvacuate() {
        return evacuate;
    }

    public void setEvacuate(String evacuate) {
    public void setEvacuate(Byte evacuate) {
        this.evacuate = evacuate;
    }

@@ -230,31 +230,4 @@
        this.modifyContent = modifyContent;
    }

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationInfo{" +
                "id=" + id +
                ", delFlag=" + delFlag +
                ", gmtCreate=" + gmtCreate +
                ", gmtModitify=" + gmtModitify +
                ", createUid=" + createUid +
                ", updateUid=" + updateUid +
                ", 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 + '\'' +
                '}';
    }
}

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

@@ -47,13 +47,13 @@

    private BigDecimal drillExpense;

    private String drillLevel;
    private Byte drillLevel;

    private String drillAddress;

    private String drillName;

    private String drillWay;
    private Byte drillWay;

    private String insuranceMeasures;

@@ -132,11 +132,11 @@
        this.drillExpense = drillExpense;
    }

    public String getDrillLevel() {
    public Byte getDrillLevel() {
        return drillLevel;
    }

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

@@ -156,11 +156,11 @@
        this.drillName = drillName;
    }

    public String getDrillWay() {
    public Byte getDrillWay() {
        return drillWay;
    }

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

@@ -226,35 +226,43 @@

    private Long drillExecuteId;

    private String suitable;
    private Byte suitable;

    private String sufficient;
    private Byte sufficient;

    private String arrival;
    private Byte arrival;

    private String supplies;
    private Byte supplies;

    private String protection;
    private Byte protection;

    private String whole;
    private Byte whole;

    private String division;
    private Byte division;

    private String effect;
    private Byte effect;

    private String report;
    private Byte report;

    private String safety;
    private Byte safety;

    private String rescue;
    private Byte rescue;

    private String evacuate;
    private Byte evacuate;

    private Boolean needModify;

    private String questionAndImprove;

    private String modifyContent;

    public Long getDrillPlanId() {
        return drillPlanId;
    }

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

    public Long getId() {
        return id;
@@ -272,99 +280,99 @@
        this.drillExecuteId = drillExecuteId;
    }

    public String getSuitable() {
    public Byte getSuitable() {
        return suitable;
    }

    public void setSuitable(String suitable) {
    public void setSuitable(Byte suitable) {
        this.suitable = suitable;
    }

    public String getSufficient() {
    public Byte getSufficient() {
        return sufficient;
    }

    public void setSufficient(String sufficient) {
    public void setSufficient(Byte sufficient) {
        this.sufficient = sufficient;
    }

    public String getArrival() {
    public Byte getArrival() {
        return arrival;
    }

    public void setArrival(String arrival) {
    public void setArrival(Byte arrival) {
        this.arrival = arrival;
    }

    public String getSupplies() {
    public Byte getSupplies() {
        return supplies;
    }

    public void setSupplies(String supplies) {
    public void setSupplies(Byte supplies) {
        this.supplies = supplies;
    }

    public String getProtection() {
    public Byte getProtection() {
        return protection;
    }

    public void setProtection(String protection) {
    public void setProtection(Byte protection) {
        this.protection = protection;
    }

    public String getWhole() {
    public Byte getWhole() {
        return whole;
    }

    public void setWhole(String whole) {
    public void setWhole(Byte whole) {
        this.whole = whole;
    }

    public String getDivision() {
    public Byte getDivision() {
        return division;
    }

    public void setDivision(String division) {
    public void setDivision(Byte division) {
        this.division = division;
    }

    public String getEffect() {
    public Byte getEffect() {
        return effect;
    }

    public void setEffect(String effect) {
    public void setEffect(Byte effect) {
        this.effect = effect;
    }

    public String getReport() {
    public Byte getReport() {
        return report;
    }

    public void setReport(String report) {
    public void setReport(Byte report) {
        this.report = report;
    }

    public String getSafety() {
    public Byte getSafety() {
        return safety;
    }

    public void setSafety(String safety) {
    public void setSafety(Byte safety) {
        this.safety = safety;
    }

    public String getRescue() {
    public Byte getRescue() {
        return rescue;
    }

    public void setRescue(String rescue) {
    public void setRescue(Byte rescue) {
        this.rescue = rescue;
    }

    public String getEvacuate() {
    public Byte getEvacuate() {
        return evacuate;
    }

    public void setEvacuate(String evacuate) {
    public void setEvacuate(Byte evacuate) {
        this.evacuate = evacuate;
    }

@@ -390,13 +398,5 @@

    public void setModifyContent(String modifyContent) {
        this.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/entity/EmergencyDrillEvaluationInfoPageDO.java

@@ -23,9 +23,9 @@

    private String drillAddress;

    private String drillWay;
    private Byte drillWay;

    private String drillLevel;
    private Byte drillLevel;

    private Date drillPlanDate;

@@ -47,19 +47,19 @@
        this.drillAddress = drillAddress;
    }

    public String getDrillWay() {
    public Byte getDrillWay() {
        return drillWay;
    }

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

    public String getDrillLevel() {
    public Byte getDrillLevel() {
        return drillLevel;
    }

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


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

@@ -14,9 +14,9 @@

    private String drillAddress;

    private String drillWay;
    private Byte drillWay;

    private String drillLevel;
    private Byte drillLevel;

    private Date drillPlanDate;

@@ -38,19 +38,19 @@
        this.drillAddress = drillAddress;
    }

    public String getDrillWay() {
    public Byte getDrillWay() {
        return drillWay;
    }

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

    public String getDrillLevel() {
    public Byte getDrillLevel() {
        return drillLevel;
    }

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


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

@@ -50,13 +50,13 @@

    private BigDecimal drillExpense;

    private String drillLevel;
    private Byte drillLevel;

    private String drillAddress;

    private String drillName;

    private String drillWay;
    private Byte drillWay;

    private String insuranceMeasures;

@@ -176,11 +176,11 @@
        this.drillExpense = drillExpense;
    }

    public String getDrillLevel() {
    public Byte getDrillLevel() {
        return drillLevel;
    }

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

@@ -200,11 +200,11 @@
        this.drillName = drillName;
    }

    public String getDrillWay() {
    public Byte getDrillWay() {
        return drillWay;
    }

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


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

@@ -51,13 +51,13 @@

    private BigDecimal drillExpense;

    private String drillLevel;
    private Byte drillLevel;

    private String drillAddress;

    private String drillName;

    private String drillWay;
    private Byte drillWay;

    private String insuranceMeasures;

@@ -137,11 +137,11 @@
        this.drillExpense = drillExpense;
    }

    public String getDrillLevel() {
    public Byte getDrillLevel() {
        return drillLevel;
    }

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

@@ -161,11 +161,11 @@
        this.drillName = drillName;
    }

    public String getDrillWay() {
    public Byte getDrillWay() {
        return drillWay;
    }

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


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

@@ -16,9 +16,9 @@

    private String drillAddress;

    private String drillWay;
    private Byte drillWay;

    private String drillLevel;
    private Byte drillLevel;

    private Date drillPlanDate;

@@ -48,19 +48,19 @@
        this.drillAddress = drillAddress;
    }

    public String getDrillWay() {
    public Byte getDrillWay() {
        return drillWay;
    }

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

    public String getDrillLevel() {
    public Byte getDrillLevel() {
        return drillLevel;
    }

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


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

@@ -52,9 +52,9 @@

    private Boolean associatedDanger;

    private String type;
    private Byte type;

    private String level;
    private Byte level;

    private String name ;

@@ -146,19 +146,19 @@
        this.associatedDanger = associatedDanger;
    }

    public String getType() {
    public Byte getType() {
        return type;
    }

    public void setType(String type) {
    public void setType(Byte type) {
        this.type = type;
    }

    public String getLevel() {
    public Byte getLevel() {
        return level;
    }

    public void setLevel(String level) {
    public void setLevel(Byte level) {
        this.level = level;
    }


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

@@ -32,9 +32,9 @@

    private Boolean associatedDanger;

    private String type;
    private Byte type;

    private String level;
    private Byte level;

    private String name ;

@@ -86,19 +86,19 @@
        this.associatedDanger = associatedDanger;
    }

    public String getType() {
    public Byte getType() {
        return type;
    }

    public void setType(String type) {
    public void setType(Byte type) {
        this.type = type;
    }

    public String getLevel() {
    public Byte getLevel() {
        return level;
    }

    public void setLevel(String level) {
    public void setLevel(Byte level) {
        this.level = level;
    }


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

@@ -35,9 +35,9 @@

    private Integer status ;

    private String type;
    private Byte type;

    private String level;
    private Byte level;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date releaseDate;
@@ -66,19 +66,19 @@
        this.status = status;
    }

    public String getType() {
    public Byte getType() {
        return type;
    }

    public void setType(String type) {
    public void setType(Byte type) {
        this.type = type;
    }

    public String getLevel() {
    public Byte getLevel() {
        return level;
    }

    public void setLevel(String level) {
    public void setLevel(Byte level) {
        this.level = level;
    }


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

@@ -27,8 +27,8 @@
    private Long departmentId;
    private Long principalUserUid;
    private String principalUserName;
    private String status;
    private String classification;
    private Byte status;
    private Byte classification;
    private String name;
    private String number;
    private String model;
@@ -159,19 +159,19 @@
        this.principalUserUid = principalUserUid;
    }

    public String getStatus() {
    public Byte getStatus() {
        return status;
    }

    public void setStatus(String status) {
    public void setStatus(Byte status) {
        this.status = status;
    }

    public String getClassification() {
    public Byte getClassification() {
        return classification;
    }

    public void setClassification(String classification) {
    public void setClassification(Byte classification) {
        this.classification = classification;
    }


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

@@ -30,8 +30,8 @@
    private Integer usePeriod;
    private Long departmentId;
    private Long principalUserUid;
    private String status;
    private String classification;
    private Byte status;
    private Byte classification;
    private String name;
    private String number;
    private String model;
@@ -122,19 +122,19 @@
        this.principalUserUid = principalUserUid;
    }

    public String getStatus() {
    public Byte getStatus() {
        return status;
    }

    public void setStatus(String status) {
    public void setStatus(Byte status) {
        this.status = status;
    }

    public String getClassification() {
    public Byte getClassification() {
        return classification;
    }

    public void setClassification(String classification) {
    public void setClassification(Byte classification) {
        this.classification = classification;
    }


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

@@ -36,7 +36,7 @@

    private Long principalDepartmentId;

    private String teamLevel;
    private Byte teamLevel;

    private String teamName;

@@ -110,11 +110,11 @@
        this.principalDepartmentId = principalDepartmentId;
    }

    public String getTeamLevel() {
    public Byte getTeamLevel() {
        return teamLevel;
    }

    public void setTeamLevel(String teamLevel) {
    public void setTeamLevel(Byte teamLevel) {
        this.teamLevel = teamLevel;
    }


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

@@ -27,7 +27,7 @@

    private Long principalDepartmentId;

    private String teamLevel;
    private Byte teamLevel;

    private String teamName;

@@ -61,11 +61,11 @@
        this.principalDepartmentId = principalDepartmentId;
    }

    public String getTeamLevel() {
    public Byte getTeamLevel() {
        return teamLevel;
    }

    public void setTeamLevel(String teamLevel) {
    public void setTeamLevel(Byte teamLevel) {
        this.teamLevel = teamLevel;
    }


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

@@ -10,7 +10,7 @@
    @TableId(type = IdType.AUTO)
    private Long id;

    private String teamLevel;
    private Byte teamLevel;

    private String teamName;

@@ -26,11 +26,11 @@
        this.id = id;
    }

    public String getTeamLevel() {
    public Byte getTeamLevel() {
        return teamLevel;
    }

    public void setTeamLevel(String teamLevel) {
    public void setTeamLevel(Byte teamLevel) {
        this.teamLevel = teamLevel;
    }


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

@@ -2,7 +2,7 @@

public enum ApproveStatus {

    // 应急预案
    // 审批中应急预案业务类型为1
    EMERGENCY(1);

    private Integer status;

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

对比新文件
@@ -0,0 +1,46 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillEvaluationArrivalEnum {

    ARRIVAL_ONE((byte) 1, "迅速准确，基本按时到位"),
    ARRIVAL_TWO((byte) 2, "未按时到位");

    private Byte code;
    private String value;

    DrillEvaluationArrivalEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillEvaluationArrivalEnum> toMap() {
        Map<Byte, DrillEvaluationArrivalEnum> map = new HashMap();
        for (DrillEvaluationArrivalEnum teamLevelEnum : DrillEvaluationArrivalEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillEvaluationArrivalEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,48 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillEvaluationDivisionEnum {

    DIVISION_ONE((byte) 1, "安全，快速"),
    DIVISION_TWO((byte) 2, "安全，不快速"),
    DIVISION_THREE((byte) 3, "不安全，快速"),
    DIVISION_FOUR((byte) 4, "不安全，不快速");

    private Byte code;
    private String value;

    DrillEvaluationDivisionEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillEvaluationDivisionEnum> toMap() {
        Map<Byte, DrillEvaluationDivisionEnum> map = new HashMap();
        for (DrillEvaluationDivisionEnum teamLevelEnum : DrillEvaluationDivisionEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillEvaluationDivisionEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,46 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillEvaluationEffectEnum {

    EFFECT_ONE((byte) 1, "基本达到目的，部分环节有待改进"),
    EFFECT_TWO((byte) 2, "为达到目的");

    private Byte code;
    private String value;

    DrillEvaluationEffectEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillEvaluationEffectEnum> toMap() {
        Map<Byte, DrillEvaluationEffectEnum> map = new HashMap();
        for (DrillEvaluationEffectEnum teamLevelEnum : DrillEvaluationEffectEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillEvaluationEffectEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,46 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillEvaluationEvacuateEnum {

    EVACUATE_ONE((byte) 1, "按要求配合"),
    EVACUATE_TWO((byte) 2, "未按要求配合");

    private Byte code;
    private String value;

    DrillEvaluationEvacuateEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillEvaluationEvacuateEnum> toMap() {
        Map<Byte, DrillEvaluationEvacuateEnum> map = new HashMap();
        for (DrillEvaluationEvacuateEnum teamLevelEnum : DrillEvaluationEvacuateEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillEvaluationEvacuateEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,46 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillEvaluationProtectionEnum {

    PROTECTION_ONE((byte) 1, "全部人员防护到位"),
    PROTECTION_TWO((byte) 2, "人员未防护到位");

    private Byte code;
    private String value;

    DrillEvaluationProtectionEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillEvaluationProtectionEnum> toMap() {
        Map<Byte, DrillEvaluationProtectionEnum> map = new HashMap();
        for (DrillEvaluationProtectionEnum teamLevelEnum : DrillEvaluationProtectionEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillEvaluationProtectionEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,46 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillEvaluationReportEnum {

    REPORT_ONE((byte) 1, "报告及时"),
    REPORT_TWO((byte) 2, "报告不及时");

    private Byte code;
    private String value;

    DrillEvaluationReportEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillEvaluationReportEnum> toMap() {
        Map<Byte, DrillEvaluationReportEnum> map = new HashMap();
        for (DrillEvaluationReportEnum teamLevelEnum : DrillEvaluationReportEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillEvaluationReportEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,46 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillEvaluationRescueEnum {

    RESCUE_ONE((byte) 1, "按要求协作"),
    RESCUE_TWO((byte) 2, "未按要求协作");

    private Byte code;
    private String value;

    DrillEvaluationRescueEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillEvaluationRescueEnum> toMap() {
        Map<Byte, DrillEvaluationRescueEnum> map = new HashMap();
        for (DrillEvaluationRescueEnum teamLevelEnum : DrillEvaluationRescueEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillEvaluationRescueEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,46 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillEvaluationSafetyEnum {

    SAFETY_ONE((byte) 1, "按要求协作"),
    SAFETY_TWO((byte) 2, "未按要求协作");

    private Byte code;
    private String value;

    DrillEvaluationSafetyEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillEvaluationSafetyEnum> toMap() {
        Map<Byte, DrillEvaluationSafetyEnum> map = new HashMap();
        for (DrillEvaluationSafetyEnum teamLevelEnum : DrillEvaluationSafetyEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillEvaluationSafetyEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,47 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillEvaluationSufficientEnum {

    SUFFICIENT_ONE((byte) 1, "完全满足应急要求"),
    SUFFICIENT_TWO((byte) 2, "不完全满足应急要求"),
    SUFFICIENT_THREE((byte) 3, "完全不满足应急要求");

    private Byte code;
    private String value;

    DrillEvaluationSufficientEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillEvaluationSufficientEnum> toMap() {
        Map<Byte, DrillEvaluationSufficientEnum> map = new HashMap();
        for (DrillEvaluationSufficientEnum teamLevelEnum : DrillEvaluationSufficientEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillEvaluationSufficientEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,46 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillEvaluationSuitableEnum {

    SUITABLE_ONE((byte) 1, "全部能够执行"),
    SUITABLE_TWO((byte) 2, "全部不能够执行");

    private Byte code;
    private String value;

    DrillEvaluationSuitableEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillEvaluationSuitableEnum> toMap() {
        Map<Byte, DrillEvaluationSuitableEnum> map = new HashMap();
        for (DrillEvaluationSuitableEnum teamLevelEnum : DrillEvaluationSuitableEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillEvaluationSuitableEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,47 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillEvaluationSuppliesEnum {

    SUPPLIES_ONE((byte) 1, "现场物资成分，全部有效"),
    SUPPLIES_TWO((byte) 2, "现场物资不充分"),
    SUPPLIES_THREE((byte) 3, "现场没有物资");

    private Byte code;
    private String value;

    DrillEvaluationSuppliesEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillEvaluationSuppliesEnum> toMap() {
        Map<Byte, DrillEvaluationSuppliesEnum> map = new HashMap();
        for (DrillEvaluationSuppliesEnum teamLevelEnum : DrillEvaluationSuppliesEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillEvaluationSuppliesEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,46 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillEvaluationWholeEnum {

    WHOLE_ONE((byte) 1, "协调基本顺利，能够满足要求"),
    WHOLE_TWO((byte) 2, "协调不顺利");

    private Byte code;
    private String value;

    DrillEvaluationWholeEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillEvaluationWholeEnum> toMap() {
        Map<Byte, DrillEvaluationWholeEnum> map = new HashMap();
        for (DrillEvaluationWholeEnum teamLevelEnum : DrillEvaluationWholeEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillEvaluationWholeEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,47 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillPlanLevelEnum {

    LEVEL_ONE((byte) 1, "公司级"),
    LEVEL_TWO((byte) 2, "分厂级"),
    LEVEL_THREE((byte) 3, "车间级");

    private Byte code;
    private String value;

    DrillPlanLevelEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillPlanLevelEnum> toMap() {
        Map<Byte, DrillPlanLevelEnum> map = new HashMap();
        for (DrillPlanLevelEnum teamLevelEnum : DrillPlanLevelEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillPlanLevelEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,47 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum DrillPlanWayEnum {

    WAY_ONE((byte) 1, "综合"),
    WAY_TWO((byte) 2, "桌面"),
    WAY_THREE((byte) 3, "专项");

    private Byte code;
    private String value;

    DrillPlanWayEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, DrillPlanWayEnum> toMap() {
        Map<Byte, DrillPlanWayEnum> map = new HashMap();
        for (DrillPlanWayEnum teamLevelEnum : DrillPlanWayEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static DrillPlanWayEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

文件已删除

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

对比新文件
@@ -0,0 +1,47 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum EmergencyPlanLevelEnum {

    LEVEL_ONE((byte) 1, "公司级"),
    LEVEL_TWO((byte) 2, "分厂级"),
    LEVEL_THREE((byte) 3, "车间级");

    private Byte code;
    private String value;

    EmergencyPlanLevelEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, EmergencyPlanLevelEnum> toMap() {
        Map<Byte, EmergencyPlanLevelEnum> map = new HashMap();
        for (EmergencyPlanLevelEnum teamLevelEnum : EmergencyPlanLevelEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static EmergencyPlanLevelEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

文件已删除

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

对比新文件
@@ -0,0 +1,48 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum EmergencyPlanTypeEnum {

    TYPE_ONE((byte) 1, "综合应急预案"),
    TYPE_TWO((byte) 2, "现场处置预案"),
    TYPE_THREE((byte) 3, "专项应急预案"),
    TYPE_FOUR((byte) 4, "其他预案");

    private Byte code;
    private String value;

    EmergencyPlanTypeEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, EmergencyPlanTypeEnum> toMap() {
        Map<Byte, EmergencyPlanTypeEnum> map = new HashMap();
        for (EmergencyPlanTypeEnum teamLevelEnum : EmergencyPlanTypeEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static EmergencyPlanTypeEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

@@ -2,6 +2,8 @@

public enum EmergencyResultCodes {

    TEAM_ENUM_LEVEL_NOT_EXIST("T1000", "应急队伍队伍级别参数异常"),

    TEAM_NAME_NULL("T1001", "应急队伍名称不可为空"),

    TEAM_LEVEL_NULL("T1002", "应急队伍级别不可为空"),
@@ -36,21 +38,55 @@

    PLAN_LOG_NOT_EXIST("P1003" , "应急预案启动记录不存在"),

    PLAN_NAME_NULL("P1004" , "应急预案预案名称不可为空"),

    PLAN_ENUM_TYPE_NOT_EXIST("P1005" , "应急预案预案类型异常"),

    PLAN_ENUM_LEVEL_NOT_EXIST("P1006" , "应急预案预案级别异常"),

    DRILL_PLAN_NOT_EXIST("D1001" , "应急演练计划不存在"),

    DRILL_PLAN_NULL("D1002" , "应急演练计划不可为空"),

    DRILL_PLAN_NAME_NULL("D1009" , "应急演练计划演练名称不可为空"),

    DRILL_EXECUTE_NOT_EXIST("D1003" , "应急演练实施不存在"),

    DRILL_EXECUTE_NULL("D1004" , "应急演练实施不可为空"),

    DRILL_PLAN_ENUM_WAY_NOT_EXIST("D1007" , "应急演练计划演练方式类型异常"),

    DRILL_PLAN_ENUM_LEVEL_NOT_EXIST("D1008" , "应急演练计划演练级别类型异常"),

    DRILL_EVALUATION_NOT_EXIST("D1005" , "应急演练实施评价不存在"),

    DRILL_EVALUATION_NULL("D1006" , "应急演练实施评价不可为空"),

    DRILL_EVALUATION_ENUM_SUITABLE_NOT_EXIST("D1009" , "应急演练实施评价适应性类型异常"),
    DRILL_EVALUATION_ENUM_SUFFICIENT_NOT_EXIST("D1009" , "应急演练实施评价充分性类型异常"),
    DRILL_EVALUATION_ENUM_ARRIVAL_NOT_EXIST("D1009" , "应急演练实施评价人员到位情况类型异常"),
    DRILL_EVALUATION_ENUM_SUPPLIES_NOT_EXIST("D1009" , "应急演练实施评价物资到位情况-现场物资类型异常"),
    DRILL_EVALUATION_ENUM_PROTECTION_NOT_EXIST("D1009" , "应急演练实施评价物资到位情况-个人防护类型异常"),
    DRILL_EVALUATION_ENUM_WHOLE_NOT_EXIST("D1009" , "应急演练实施评价协调组织情况-整体组织类型异常"),
    DRILL_EVALUATION_ENUM_DIVISION_NOT_EXIST("D1009" , "应急演练实施评价协调组织情况-疏散组分工类型异常"),
    DRILL_EVALUATION_ENUM_EFFECT_NOT_EXIST("D1009" , "应急演练实施评价实战效果评价类型异常"),
    DRILL_EVALUATION_ENUM_REPORT_NOT_EXIST("D1009" , "应急演练实施评价支援部门和协作有效性-报告上级类型异常"),
    DRILL_EVALUATION_ENUM_SAFETY_NOT_EXIST("D1009" , "应急演练实施评价支援部门和协作有效性-安全部门类型异常"),
    DRILL_EVALUATION_ENUM_RESCUE_NOT_EXIST("D1009" , "应急演练实施评价支援部门和协作有效性-救援后勤部门类型异常"),
    DRILL_EVALUATION_ENUM_EVACUATE_NOT_EXIST("D1009" , "应急演练实施评价支援部门和协作有效性-警戒撤离配合类型异常"),




    SUPPLIES_NULL("S1001" , "应急物资不可为空"),

    SUPPLIES_NOT_EXIST("S1002" , "应急物资不存在"),

    SUPPLIES_NAME_NOT_EXIST("S1002" , "应急物资物资名称不可为空"),

    SUPPLIES_ENUM_CLASSIFICATION_NOT_EXIST("S1011" , "应急物资物资分类类型异常"),

    SUPPLIES_ENUM_STATUS_NOT_EXIST("S1012" , "应急物资物资状态类型异常"),

    SUPPLIES_INSPECT_NULL("S1003" , "应急物资检查不可为空"),

@@ -72,6 +108,8 @@

    YEAR_NULL("Y1001" , "年份不能为空"),



    ERROR("A3000", "未知错误");

    private String code;

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

对比新文件
@@ -0,0 +1,50 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum EmergencySuppliesClassificationEnum {

    CLASSIFICATION_ONE((byte) 1, "事故气体吸收装置"),
    CLASSIFICATION_TWO((byte) 2, "通讯设施"),
    CLASSIFICATION_THREE((byte) 3, "交通运输工具"),
    CLASSIFICATION_FOUR((byte) 4, "照明装置"),
    CLASSIFICATION_FIVE((byte) 5, "防护器材"),
    CLASSIFICATION_SIX((byte) 6, "其他");

    private Byte code;
    private String value;

    EmergencySuppliesClassificationEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, EmergencySuppliesClassificationEnum> toMap() {
        Map<Byte, EmergencySuppliesClassificationEnum> map = new HashMap();
        for (EmergencySuppliesClassificationEnum teamLevelEnum : EmergencySuppliesClassificationEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static EmergencySuppliesClassificationEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,46 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum EmergencySuppliesStatusEnum {

    STATUS_ONE((byte) 1, "完好"),
    STATUS_TWO((byte) 2, "维修");

    private Byte code;
    private String value;

    EmergencySuppliesStatusEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, EmergencySuppliesStatusEnum> toMap() {
        Map<Byte, EmergencySuppliesStatusEnum> map = new HashMap();
        for (EmergencySuppliesStatusEnum teamLevelEnum : EmergencySuppliesStatusEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static EmergencySuppliesStatusEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

对比新文件
@@ -0,0 +1,50 @@
package com.gkhy.safePlatform.emergency.enums;

import java.util.HashMap;
import java.util.Map;

public enum TeamLevelEnum {

    LEVEL_ONE((byte) 1, "公司"),
    LEVEL_TWO((byte) 2, "厂房"),
    LEVEL_THREE((byte) 3, "车间"),
    LEVEL_FOUR((byte) 4, "工序"),
    LEVEL_FIVE((byte) 5, "班组");


    private Byte code;
    private String value;

    TeamLevelEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, TeamLevelEnum> toMap() {
        Map<Byte, TeamLevelEnum> map = new HashMap();
        for (TeamLevelEnum teamLevelEnum : TeamLevelEnum.values()) {
            map.put(teamLevelEnum.getCode(), teamLevelEnum);
        }
        return map;
    }
    public static TeamLevelEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

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

@@ -14,29 +14,29 @@
    // 应急演练实施的id  帮助数据进行筛选
    private Long drillExecuteId;

    private String suitable;
    private Byte suitable;

    private String sufficient;
    private Byte sufficient;

    private String arrival;
    private Byte arrival;

    private String supplies;
    private Byte supplies;

    private String protection;
    private Byte protection;

    private String whole;
    private Byte whole;

    private String division;
    private Byte division;

    private String effect;
    private Byte effect;

    private String report;
    private Byte report;

    private String safety;
    private Byte safety;

    private String rescue;
    private Byte rescue;

    private String evacuate;
    private Byte evacuate;

    private Boolean needModify;

@@ -47,6 +47,7 @@
    private List<EmergencyDrillEvaluationFileReqDTO> fileList;

    private List<EmergencyDrillEvaluationUserReqDTO> userList;


    public Long getId() {
        return id;
@@ -64,99 +65,99 @@
        this.drillExecuteId = drillExecuteId;
    }

    public String getSuitable() {
    public Byte getSuitable() {
        return suitable;
    }

    public void setSuitable(String suitable) {
    public void setSuitable(Byte suitable) {
        this.suitable = suitable;
    }

    public String getSufficient() {
    public Byte getSufficient() {
        return sufficient;
    }

    public void setSufficient(String sufficient) {
    public void setSufficient(Byte sufficient) {
        this.sufficient = sufficient;
    }

    public String getArrival() {
    public Byte getArrival() {
        return arrival;
    }

    public void setArrival(String arrival) {
    public void setArrival(Byte arrival) {
        this.arrival = arrival;
    }

    public String getSupplies() {
    public Byte getSupplies() {
        return supplies;
    }

    public void setSupplies(String supplies) {
    public void setSupplies(Byte supplies) {
        this.supplies = supplies;
    }

    public String getProtection() {
    public Byte getProtection() {
        return protection;
    }

    public void setProtection(String protection) {
    public void setProtection(Byte protection) {
        this.protection = protection;
    }

    public String getWhole() {
    public Byte getWhole() {
        return whole;
    }

    public void setWhole(String whole) {
    public void setWhole(Byte whole) {
        this.whole = whole;
    }

    public String getDivision() {
    public Byte getDivision() {
        return division;
    }

    public void setDivision(String division) {
    public void setDivision(Byte division) {
        this.division = division;
    }

    public String getEffect() {
    public Byte getEffect() {
        return effect;
    }

    public void setEffect(String effect) {
    public void setEffect(Byte effect) {
        this.effect = effect;
    }

    public String getReport() {
    public Byte getReport() {
        return report;
    }

    public void setReport(String report) {
    public void setReport(Byte report) {
        this.report = report;
    }

    public String getSafety() {
    public Byte getSafety() {
        return safety;
    }

    public void setSafety(String safety) {
    public void setSafety(Byte safety) {
        this.safety = safety;
    }

    public String getRescue() {
    public Byte getRescue() {
        return rescue;
    }

    public void setRescue(String rescue) {
    public void setRescue(Byte rescue) {
        this.rescue = rescue;
    }

    public String getEvacuate() {
    public Byte getEvacuate() {
        return evacuate;
    }

    public void setEvacuate(String evacuate) {
    public void setEvacuate(Byte evacuate) {
        this.evacuate = evacuate;
    }

@@ -198,30 +199,5 @@

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

    @Override
    public String toString() {
        return "EmergencyDrillEvaluationReqDTO{" +
                "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 +
                '}';
    }
}

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

@@ -39,13 +39,13 @@

    private BigDecimal drillExpense;

    private String drillLevel;
    private Byte drillLevel;

    private String drillAddress;

    private String drillName;

    private String drillWay;
    private Byte drillWay;

    private String insuranceMeasures;

@@ -129,11 +129,11 @@
        this.drillExpense = drillExpense;
    }

    public String getDrillLevel() {
    public Byte getDrillLevel() {
        return drillLevel;
    }

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

@@ -153,11 +153,11 @@
        this.drillName = drillName;
    }

    public String getDrillWay() {
    public Byte getDrillWay() {
        return drillWay;
    }

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


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

@@ -30,9 +30,9 @@

    private Boolean associatedDanger;

    private String type;
    private Byte type;

    private String level;
    private Byte level;

    private String name ;

@@ -92,19 +92,19 @@
        this.associatedDanger = associatedDanger;
    }

    public String getType() {
    public Byte getType() {
        return type;
    }

    public void setType(String type) {
    public void setType(Byte type) {
        this.type = type;
    }

    public String getLevel() {
    public Byte getLevel() {
        return level;
    }

    public void setLevel(String level) {
    public void setLevel(Byte level) {
        this.level = level;
    }


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

@@ -33,8 +33,8 @@
    private Integer usePeriod;
    private Long departmentId;
    private Long principalUserUid;
    private String status;
    private String classification;
    private Byte status;
    private Byte classification;
    private String name;
    private String number;
    private String model;
@@ -125,19 +125,19 @@
        this.principalUserUid = principalUserUid;
    }

    public String getStatus() {
    public Byte getStatus() {
        return status;
    }

    public void setStatus(String status) {
    public void setStatus(Byte status) {
        this.status = status;
    }

    public String getClassification() {
    public Byte getClassification() {
        return classification;
    }

    public void setClassification(String classification) {
    public void setClassification(Byte classification) {
        this.classification = classification;
    }


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

@@ -20,7 +20,7 @@

    private Long principalDepartmentId;

    private String teamLevel;
    private Byte teamLevel;

    private String teamName;

@@ -58,11 +58,11 @@
        this.principalDepartmentId = principalDepartmentId;
    }

    public String getTeamLevel() {
    public Byte getTeamLevel() {
        return teamLevel;
    }

    public void setTeamLevel(String teamLevel) {
    public void setTeamLevel(Byte teamLevel) {
        this.teamLevel = teamLevel;
    }


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

@@ -43,13 +43,13 @@

    private BigDecimal drillExpense;

    private String drillLevel;
    private Byte drillLevel;

    private String drillAddress;

    private String drillName;

    private String drillWay;
    private Byte drillWay;

    private String insuranceMeasures;

@@ -99,29 +99,29 @@

    private Long drillExecuteId;

    private String suitable;
    private Byte suitable;

    private String sufficient;
    private Byte sufficient;

    private String arrival;
    private Byte arrival;

    private String supplies;
    private Byte supplies;

    private String protection;
    private Byte protection;

    private String whole;
    private Byte whole;

    private String division;
    private Byte division;

    private String effect;
    private Byte effect;

    private String report;
    private Byte report;

    private String safety;
    private Byte safety;

    private String rescue;
    private Byte rescue;

    private String evacuate;
    private Byte evacuate;

    private Boolean needModify;

@@ -181,11 +181,11 @@
        this.drillExpense = drillExpense;
    }

    public String getDrillLevel() {
    public Byte getDrillLevel() {
        return drillLevel;
    }

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

@@ -205,11 +205,11 @@
        this.drillName = drillName;
    }

    public String getDrillWay() {
    public Byte getDrillWay() {
        return drillWay;
    }

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

@@ -301,99 +301,99 @@
        this.drillExecuteId = drillExecuteId;
    }

    public String getSuitable() {
    public Byte getSuitable() {
        return suitable;
    }

    public void setSuitable(String suitable) {
    public void setSuitable(Byte suitable) {
        this.suitable = suitable;
    }

    public String getSufficient() {
    public Byte getSufficient() {
        return sufficient;
    }

    public void setSufficient(String sufficient) {
    public void setSufficient(Byte sufficient) {
        this.sufficient = sufficient;
    }

    public String getArrival() {
    public Byte getArrival() {
        return arrival;
    }

    public void setArrival(String arrival) {
    public void setArrival(Byte arrival) {
        this.arrival = arrival;
    }

    public String getSupplies() {
    public Byte getSupplies() {
        return supplies;
    }

    public void setSupplies(String supplies) {
    public void setSupplies(Byte supplies) {
        this.supplies = supplies;
    }

    public String getProtection() {
    public Byte getProtection() {
        return protection;
    }

    public void setProtection(String protection) {
    public void setProtection(Byte protection) {
        this.protection = protection;
    }

    public String getWhole() {
    public Byte getWhole() {
        return whole;
    }

    public void setWhole(String whole) {
    public void setWhole(Byte whole) {
        this.whole = whole;
    }

    public String getDivision() {
    public Byte getDivision() {
        return division;
    }

    public void setDivision(String division) {
    public void setDivision(Byte division) {
        this.division = division;
    }

    public String getEffect() {
    public Byte getEffect() {
        return effect;
    }

    public void setEffect(String effect) {
    public void setEffect(Byte effect) {
        this.effect = effect;
    }

    public String getReport() {
    public Byte getReport() {
        return report;
    }

    public void setReport(String report) {
    public void setReport(Byte report) {
        this.report = report;
    }

    public String getSafety() {
    public Byte getSafety() {
        return safety;
    }

    public void setSafety(String safety) {
    public void setSafety(Byte safety) {
        this.safety = safety;
    }

    public String getRescue() {
    public Byte getRescue() {
        return rescue;
    }

    public void setRescue(String rescue) {
    public void setRescue(Byte rescue) {
        this.rescue = rescue;
    }

    public String getEvacuate() {
    public Byte getEvacuate() {
        return evacuate;
    }

    public void setEvacuate(String evacuate) {
    public void setEvacuate(Byte evacuate) {
        this.evacuate = evacuate;
    }


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

@@ -20,9 +20,9 @@

    private String drillAddress;

    private String drillWay;
    private Byte drillWay;

    private String drillLevel;
    private Byte drillLevel;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillPlanDate;
@@ -46,19 +46,19 @@
        this.drillAddress = drillAddress;
    }

    public String getDrillWay() {
    public Byte getDrillWay() {
        return drillWay;
    }

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

    public String getDrillLevel() {
    public Byte getDrillLevel() {
        return drillLevel;
    }

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


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

@@ -10,9 +10,9 @@

    private String drillAddress;

    private String drillWay;
    private Byte drillWay;

    private String drillLevel;
    private Byte drillLevel;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillPlanDate;
@@ -35,19 +35,19 @@
        this.drillAddress = drillAddress;
    }

    public String getDrillWay() {
    public Byte getDrillWay() {
        return drillWay;
    }

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

    public String getDrillLevel() {
    public Byte getDrillLevel() {
        return drillLevel;
    }

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


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

@@ -51,13 +51,13 @@

    private BigDecimal drillExpense;

    private String drillLevel;
    private Byte drillLevel;

    private String drillAddress;

    private String drillName;

    private String drillWay;
    private Byte drillWay;

    private String insuranceMeasures;

@@ -159,11 +159,11 @@
        this.drillExpense = drillExpense;
    }

    public String getDrillLevel() {
    public Byte getDrillLevel() {
        return drillLevel;
    }

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

@@ -183,11 +183,11 @@
        this.drillName = drillName;
    }

    public String getDrillWay() {
    public Byte getDrillWay() {
        return drillWay;
    }

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


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

@@ -12,9 +12,9 @@

    private String drillAddress;

    private String drillWay;
    private Byte drillWay;

    private String drillLevel;
    private Byte drillLevel;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillPlanDate;
@@ -46,19 +46,19 @@
        this.drillAddress = drillAddress;
    }

    public String getDrillWay() {
    public Byte getDrillWay() {
        return drillWay;
    }

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

    public String getDrillLevel() {
    public Byte getDrillLevel() {
        return drillLevel;
    }

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


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

@@ -30,9 +30,9 @@

    private Boolean associatedDanger;

    private String type;
    private Byte type;

    private String level;
    private Byte level;

    private String name ;

@@ -92,19 +92,19 @@
        this.associatedDanger = associatedDanger;
    }

    public String getType() {
    public Byte getType() {
        return type;
    }

    public void setType(String type) {
    public void setType(Byte type) {
        this.type = type;
    }

    public String getLevel() {
    public Byte getLevel() {
        return level;
    }

    public void setLevel(String level) {
    public void setLevel(Byte level) {
        this.level = level;
    }


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

@@ -66,9 +66,9 @@

    private Integer status ;

    private String type;
    private Byte type;

    private String level;
    private Byte level;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date releaseDate;
@@ -98,19 +98,19 @@
        this.status = status;
    }

    public String getType() {
    public Byte getType() {
        return type;
    }

    public void setType(String type) {
    public void setType(Byte type) {
        this.type = type;
    }

    public String getLevel() {
    public Byte getLevel() {
        return level;
    }

    public void setLevel(String level) {
    public void setLevel(Byte level) {
        this.level = level;
    }


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

@@ -58,8 +58,8 @@
    private Integer usePeriod;
    private Long departmentId;
    private Long principalUserUid;
    private String status;
    private String classification;
    private Byte status;
    private Byte classification;
    private String name;
    private String number;
    private String model;
@@ -150,19 +150,19 @@
        this.principalUserUid = principalUserUid;
    }

    public String getStatus() {
    public Byte getStatus() {
        return status;
    }

    public void setStatus(String status) {
    public void setStatus(Byte status) {
        this.status = status;
    }

    public String getClassification() {
    public Byte getClassification() {
        return classification;
    }

    public void setClassification(String classification) {
    public void setClassification(Byte classification) {
        this.classification = classification;
    }


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

@@ -21,7 +21,7 @@

    private Long principalDepartmentId;

    private String teamLevel;
    private Byte teamLevel;

    private String teamName;

@@ -59,11 +59,11 @@
        this.principalDepartmentId = principalDepartmentId;
    }

    public String getTeamLevel() {
    public Byte getTeamLevel() {
        return teamLevel;
    }

    public void setTeamLevel(String teamLevel) {
    public void setTeamLevel(Byte teamLevel) {
        this.teamLevel = teamLevel;
    }


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

@@ -7,7 +7,7 @@

    private Long id;

    private String teamLevel;
    private Byte teamLevel;

    private String teamName;

@@ -25,11 +25,11 @@
        this.id = id;
    }

    public String getTeamLevel() {
    public Byte getTeamLevel() {
        return teamLevel;
    }

    public void setTeamLevel(String teamLevel) {
    public void setTeamLevel(Byte teamLevel) {
        this.teamLevel = teamLevel;
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java

@@ -14,7 +14,7 @@

    private String name ;

    private String type ;
    private Byte type ;

    public String getName() {
        return name;
@@ -24,11 +24,11 @@
        this.name = name;
    }

    public String getType() {
    public Byte getType() {
        return type;
    }

    public void setType(String type) {
    public void setType(Byte type) {
        this.type = type;
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java

@@ -4,7 +4,7 @@

    private String teamName ;

    private String teamLevel ;
    private Byte teamLevel ;

    public String getTeamName() {
        return teamName;
@@ -14,11 +14,11 @@
        this.teamName = teamName;
    }

    public String getTeamLevel() {
    public Byte getTeamLevel() {
        return teamLevel;
    }

    public void setTeamLevel(String teamLevel) {
    public void setTeamLevel(Byte teamLevel) {
        this.teamLevel = teamLevel;
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyPlanDBQuery.java

@@ -4,7 +4,7 @@

    private String name ;

    private String type ;
    private Byte type ;

    private Boolean abolishStatus;

@@ -24,11 +24,11 @@
        this.name = name;
    }

    public String getType() {
    public Byte getType() {
        return type;
    }

    public void setType(String type) {
    public void setType(Byte type) {
        this.type = type;
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyTeamDBQuery.java

@@ -4,7 +4,7 @@

    private String teamName ;

    private String teamLevel ;
    private Byte teamLevel ;

    public String getTeamName() {
        return teamName;
@@ -14,11 +14,11 @@
        this.teamName = teamName;
    }

    public String getTeamLevel() {
    public Byte getTeamLevel() {
        return teamLevel;
    }

    public void setTeamLevel(String teamLevel) {
    public void setTeamLevel(Byte teamLevel) {
        this.teamLevel = teamLevel;
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java

@@ -5,8 +5,6 @@
import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO;
import com.gkhy.safePlatform.emergency.enums.ApproveStatus;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanPageRespDTO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyWorkApproveDBQuery;

import java.util.List;

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

@@ -8,7 +8,7 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.enums.*;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillEvaluationFileReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillEvaluationReqDTO;
@@ -77,6 +77,9 @@

    @Override
    public ResultVO addEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
        // 验证枚举
        checkEnum(emergencyDrillEvaluationReqDTO);

        // 判断请求中是否存在演练计划id
        if (emergencyDrillEvaluationReqDTO.getDrillExecuteId() == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NULL);
@@ -186,6 +189,8 @@

    @Override
    public ResultVO updateEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
        // 验证枚举
        checkEnum(emergencyDrillEvaluationReqDTO);
        Date nowDate = new Date();
        // 查询是否存在
        EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationByExecuteId(emergencyDrillEvaluationReqDTO.getDrillExecuteId());
@@ -322,4 +327,49 @@
            emergencyDrillEvaluationUserInfoService.deleteEmergencyDrillEvaluationUserByDrillEvaluationId(DrillEvaluationId);
        }
    }


    /**
     *
     * 枚举类验证
     * @param emergencyDrillEvaluationReqDTO
     */
    public void checkEnum(EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
        if (DrillEvaluationSuitableEnum.getByCode(emergencyDrillEvaluationReqDTO.getSuitable()) == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_SUITABLE_NOT_EXIST);
        }
        if (DrillEvaluationSufficientEnum.getByCode(emergencyDrillEvaluationReqDTO.getSufficient()) == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_SUFFICIENT_NOT_EXIST);
        }
        if (DrillEvaluationArrivalEnum.getByCode(emergencyDrillEvaluationReqDTO.getArrival()) == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_ARRIVAL_NOT_EXIST);
        }
        if (DrillEvaluationSuppliesEnum.getByCode(emergencyDrillEvaluationReqDTO.getSupplies()) == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_SUPPLIES_NOT_EXIST);
        }
        if (DrillEvaluationProtectionEnum.getByCode(emergencyDrillEvaluationReqDTO.getProtection()) == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_PROTECTION_NOT_EXIST);
        }
        if (DrillEvaluationWholeEnum.getByCode(emergencyDrillEvaluationReqDTO.getWhole()) == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_WHOLE_NOT_EXIST);
        }
        if (DrillEvaluationDivisionEnum.getByCode(emergencyDrillEvaluationReqDTO.getDivision()) == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_DIVISION_NOT_EXIST);
        }
        if (DrillEvaluationEffectEnum.getByCode(emergencyDrillEvaluationReqDTO.getEffect()) == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_EFFECT_NOT_EXIST);
        }
        if (DrillEvaluationReportEnum.getByCode(emergencyDrillEvaluationReqDTO.getReport()) == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_REPORT_NOT_EXIST);
        }
        if (DrillEvaluationSafetyEnum.getByCode(emergencyDrillEvaluationReqDTO.getSafety()) == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_SAFETY_NOT_EXIST);
        }
        if (DrillEvaluationRescueEnum.getByCode(emergencyDrillEvaluationReqDTO.getRescue()) == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_RESCUE_NOT_EXIST);
        }
        if (DrillEvaluationEvacuateEnum.getByCode(emergencyDrillEvaluationReqDTO.getEvacuate()) == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_EVACUATE_NOT_EXIST);
        }
    }
}

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

@@ -1,5 +1,6 @@
package com.gkhy.safePlatform.emergency.service.impl;

import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
@@ -7,6 +8,8 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.enums.DrillPlanLevelEnum;
import com.gkhy.safePlatform.emergency.enums.DrillPlanWayEnum;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.*;
@@ -66,6 +69,11 @@

    @Override
    public ResultVO addEmergencyDrillPlan(Long uid, EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO) {
        // 验证必填
        checkRequired(emergencyDrillPlanReqDTO);
        // 验证枚举
        checkEnum(emergencyDrillPlanReqDTO);

        // 判断请求中是否存在应急预案id
        if (emergencyDrillPlanReqDTO.getPlanId() == null) {
            throw new EmergencyException(EmergencyResultCodes.PLAN_NULL);
@@ -156,6 +164,12 @@

    @Override
    public ResultVO updateEmergencyDrillPlan(Long uid, EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO) {

        // 验证必填
        checkRequired(emergencyDrillPlanReqDTO);
        // 验证枚举
        checkEnum(emergencyDrillPlanReqDTO);

        Date nowDate = new Date();
        // 查询是否存在
        EmergencyDrillPlanInfoDetailDO emergencyDrillPlanInfoDetailDO = emergencyDrillPlanInfoService.selectEmergencyDrillPlanById(emergencyDrillPlanReqDTO.getId());
@@ -290,4 +304,28 @@
            emergencyDrillPlanUserInfoService.deleteEmergencyDrillPlanUserByDrillPlanId(DrillPlanId);
        }
    }


    /**
     * 验证必填项
     * @return
     */
    private void checkRequired(EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO) {
        //名称
        if (StringUtils.isBlank(emergencyDrillPlanReqDTO.getDrillName())) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NAME_NULL);
        }
    }

    /**
     * 验证枚举
     */
    private void checkEnum(EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO){
        if (DrillPlanWayEnum.getByCode(emergencyDrillPlanReqDTO.getDrillWay())==null){
            throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_ENUM_WAY_NOT_EXIST);
        }
        if (DrillPlanLevelEnum.getByCode(emergencyDrillPlanReqDTO.getDrillLevel())==null){
            throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_ENUM_LEVEL_NOT_EXIST);
        }
    }
}

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

@@ -6,10 +6,12 @@
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.commons.utils.StringUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.enums.ApproveStatus;
import com.gkhy.safePlatform.emergency.enums.EmergencyPlanTypeEnum;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.*;
@@ -95,6 +97,13 @@

    @Override
    public ResultVO addEmergencyPlan(Long uid, EmergencyPlanReqDTO emergencyPlanReqDTO) {
        // 验证必填
        checkRequired(emergencyPlanReqDTO);
        // 验证枚举
        checkEnum(emergencyPlanReqDTO);



        Date nowDate = new Date();
        // 新增应急预案
        EmergencyPlanInfo emergencyPlanInfo = new EmergencyPlanInfo();
@@ -232,6 +241,11 @@

    @Override
    public ResultVO updateEmergencyPlan(Long uid, EmergencyPlanReqDTO emergencyPlanReqDTO) {
        // 验证必填
        checkRequired(emergencyPlanReqDTO);
        // 验证枚举
        checkEnum(emergencyPlanReqDTO);

        Date nowDate = new Date();
        // 查询是否存在
        EmergencyPlanInfoDetailDO emergencyPlanInfoDetailDO = emergencyPlanInfoService.selectEmergencyPlanById(emergencyPlanReqDTO.getId());
@@ -462,4 +476,28 @@
            emergencyPlanTeamInfoService.deleteEmergencyPlanTeamByPlanId(PlanId);
        }
    }

    /**
     * 验证必填项
     * @return
     */
    private void checkRequired(EmergencyPlanReqDTO emergencyPlanReqDTO) {
        //名称
        if (StringUtils.isBlank(emergencyPlanReqDTO.getName())) {
            throw new EmergencyException(EmergencyResultCodes.PLAN_NAME_NULL);
        }
    }

    /**
     * 验证枚举
     */
    private void checkEnum(EmergencyPlanReqDTO emergencyPlanReqDTO){
        if (EmergencyPlanTypeEnum.getByCode(emergencyPlanReqDTO.getType())==null){
            throw new EmergencyException(EmergencyResultCodes.PLAN_ENUM_TYPE_NOT_EXIST);
        }
        if (EmergencyPlanTypeEnum.getByCode(emergencyPlanReqDTO.getLevel())==null){
            throw new EmergencyException(EmergencyResultCodes.PLAN_ENUM_LEVEL_NOT_EXIST);
        }
    }

}

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

@@ -1,5 +1,6 @@
package com.gkhy.safePlatform.emergency.service.impl;

import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepInfoRPCRespDTO;
@@ -10,6 +11,8 @@
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.enums.EmergencySuppliesClassificationEnum;
import com.gkhy.safePlatform.emergency.enums.EmergencySuppliesStatusEnum;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.*;
import com.gkhy.safePlatform.emergency.model.dto.resp.*;
@@ -96,6 +99,12 @@

    @Override
    public ResultVO addEmergencySupplies(Long uid, EmergencySuppliesReqDTO emergencySuppliesReqDTO) {

        // 验证必填
        checkRequired(emergencySuppliesReqDTO);
        //验证枚举
        checkEnum(emergencySuppliesReqDTO);

        Date nowDate = new Date();
        // 新增应急物资
        EmergencySuppliesInfo emergencySuppliesInfo = new EmergencySuppliesInfo();
@@ -153,6 +162,11 @@

    @Override
    public ResultVO updateEmergencySupplies(Long uid, EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
        // 验证必填
        checkRequired(emergencySuppliesReqDTO);
        //验证枚举
        checkEnum(emergencySuppliesReqDTO);

        Date nowDate = new Date();
        // 查询是否存在
        EmergencySuppliesInfoDetailDO emergencySuppliesInfoDetailDO = emergencySuppliesInfoService.selectEmergencySuppliesById(emergencySuppliesReqDTO.getId());
@@ -198,4 +212,27 @@

        }
    }

    /**
     * 验证必填项
     * @return
     */
    private void checkRequired(EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
        //名称
        if (StringUtils.isBlank(emergencySuppliesReqDTO.getName())) {
            throw new EmergencyException(EmergencyResultCodes.SUPPLIES_NAME_NOT_EXIST);
        }
    }

    /**
     * 验证枚举
     */
    private void checkEnum(EmergencySuppliesReqDTO emergencySuppliesReqDTO){
        if (EmergencySuppliesClassificationEnum.getByCode(emergencySuppliesReqDTO.getClassification())==null){
            throw new EmergencyException(EmergencyResultCodes.SUPPLIES_ENUM_CLASSIFICATION_NOT_EXIST);
        }
        if (EmergencySuppliesStatusEnum.getByCode(emergencySuppliesReqDTO.getStatus())==null){
            throw new EmergencyException(EmergencyResultCodes.SUPPLIES_ENUM_STATUS_NOT_EXIST);
        }
    }
}

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

@@ -8,6 +8,7 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.enums.TeamLevelEnum;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamFileReqDTO;
@@ -85,6 +86,8 @@
    public ResultVO<EmergencyTeamDetailRespDTO> addEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
        //必填项验证
        checkRequired(emergencyTeamReqDTO);
        // 验证枚举
        checkEnum(emergencyTeamReqDTO);

        Date nowDate = new Date();
        //1.新增应急队伍
@@ -161,6 +164,8 @@

    @Override
    public ResultVO updateEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
        // 验证枚举
        checkEnum(emergencyTeamReqDTO);
        Date nowDate = new Date();
        //查询是否存在
        EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(emergencyTeamReqDTO.getId());
@@ -317,7 +322,7 @@
            throw new EmergencyException(EmergencyResultCodes.TEAM_NAME_NULL);
        }
        //级别
        if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamLevel())) {
        if (emergencyTeamReqDTO.getTeamLevel() == null) {
            throw new EmergencyException(EmergencyResultCodes.TEAM_LEVEL_NULL);
        }
        //负责人
@@ -363,4 +368,13 @@
        }
    }

    /**
     * 枚举验证
     */
    private void checkEnum(EmergencyTeamReqDTO emergencyTeamReqDTO) {
        if (TeamLevelEnum.getByCode(emergencyTeamReqDTO.getTeamLevel()) == null) {
            throw new EmergencyException(EmergencyResultCodes.TEAM_ENUM_LEVEL_NOT_EXIST);
        }
    }

}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentExpressInfo.java

@@ -40,7 +40,7 @@

    private Boolean casualties;

    private String accidentCause;
    private Byte accidentCause;

    private Date occurrenceTime;

@@ -130,11 +130,11 @@
        this.casualties = casualties;
    }

    public String getAccidentCause() {
    public Byte getAccidentCause() {
        return accidentCause;
    }

    public void setAccidentCause(String accidentCause) {
    public void setAccidentCause(Byte accidentCause) {
        this.accidentCause = accidentCause;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentExpressInfoDetailDO.java

@@ -21,7 +21,7 @@

    private Boolean casualties;

    private String accidentCause;
    private Byte accidentCause;

    private Date occurrenceTime;

@@ -74,11 +74,11 @@
        this.casualties = casualties;
    }

    public String getAccidentCause() {
    public Byte getAccidentCause() {
        return accidentCause;
    }

    public void setAccidentCause(String accidentCause) {
    public void setAccidentCause(Byte accidentCause) {
        this.accidentCause = accidentCause;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentExpressInfoPageDO.java

@@ -26,7 +26,7 @@

    private Long createUid;

    private String accidentCause;
    private Byte accidentCause;

    private Date occurrenceTime;

@@ -61,11 +61,11 @@
    }


    public String getAccidentCause() {
    public Byte getAccidentCause() {
        return accidentCause;
    }

    public void setAccidentCause(String accidentCause) {
    public void setAccidentCause(Byte accidentCause) {
        this.accidentCause = accidentCause;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfo.java

@@ -45,9 +45,9 @@

    private Long accidentExpressId;

    private String accidentType;
    private Byte accidentType;

    private String accidentGrade;
    private Byte accidentGrade;

    private BigDecimal economicLoss;

@@ -61,7 +61,7 @@

    private Date reportDeadline;

    private String accidentLevel;
    private Byte accidentLevel;

    private String accidentDelayApply;

@@ -137,19 +137,19 @@
        this.accidentExpressId = accidentExpressId;
    }

    public String getAccidentType() {
    public Byte getAccidentType() {
        return accidentType;
    }

    public void setAccidentType(String accidentType) {
    public void setAccidentType(Byte accidentType) {
        this.accidentType = accidentType;
    }

    public String getAccidentGrade() {
    public Byte getAccidentGrade() {
        return accidentGrade;
    }

    public void setAccidentGrade(String accidentGrade) {
    public void setAccidentGrade(Byte accidentGrade) {
        this.accidentGrade = accidentGrade;
    }

@@ -201,11 +201,11 @@
        this.reportDeadline = reportDeadline;
    }

    public String getAccidentLevel() {
    public Byte getAccidentLevel() {
        return accidentLevel;
    }

    public void setAccidentLevel(String accidentLevel) {
    public void setAccidentLevel(Byte accidentLevel) {
        this.accidentLevel = accidentLevel;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoDetailDO.java

@@ -44,9 +44,9 @@

    private Long accidentExpressId;

    private String accidentType;
    private Byte accidentType;

    private String accidentGrade;
    private Byte accidentGrade;

    private BigDecimal economicLoss;

@@ -60,7 +60,7 @@

    private Date reportDeadline;

    private String accidentLevel;
    private Byte accidentLevel;

    private String accidentDelayApply;

@@ -96,19 +96,19 @@
        this.accidentExpressId = accidentExpressId;
    }

    public String getAccidentType() {
    public Byte getAccidentType() {
        return accidentType;
    }

    public void setAccidentType(String accidentType) {
    public void setAccidentType(Byte accidentType) {
        this.accidentType = accidentType;
    }

    public String getAccidentGrade() {
    public Byte getAccidentGrade() {
        return accidentGrade;
    }

    public void setAccidentGrade(String accidentGrade) {
    public void setAccidentGrade(Byte accidentGrade) {
        this.accidentGrade = accidentGrade;
    }

@@ -160,11 +160,11 @@
        this.reportDeadline = reportDeadline;
    }

    public String getAccidentLevel() {
    public Byte getAccidentLevel() {
        return accidentLevel;
    }

    public void setAccidentLevel(String accidentLevel) {
    public void setAccidentLevel(Byte accidentLevel) {
        this.accidentLevel = accidentLevel;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoPageDO.java

@@ -32,9 +32,9 @@

    private Long accidentExpressId;

    private String accidentType;
    private Byte accidentType;

    private String accidentGrade;
    private Byte accidentGrade;

    public Long getId() {
        return id;
@@ -52,11 +52,11 @@
        this.accidentExpressId = accidentExpressId;
    }

    public String getAccidentType() {
    public Byte getAccidentType() {
        return accidentType;
    }

    public void setAccidentType(String accidentType) {
    public void setAccidentType(Byte accidentType) {
        this.accidentType = accidentType;
    }

@@ -70,11 +70,11 @@
                '}';
    }

    public String getAccidentGrade() {
    public Byte getAccidentGrade() {
        return accidentGrade;
    }

    public void setAccidentGrade(String accidentGrade) {
    public void setAccidentGrade(Byte accidentGrade) {
        this.accidentGrade = accidentGrade;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/WorkInjuryDeclarationInfo.java

@@ -31,7 +31,7 @@

    private Long accidentExpressId;

    private String workInjuryType;
    private Byte workInjuryType;

    private Date declareDate;

@@ -127,11 +127,11 @@
        this.accidentExpressId = accidentExpressId;
    }

    public String getWorkInjuryType() {
    public Byte getWorkInjuryType() {
        return workInjuryType;
    }

    public void setWorkInjuryType(String workInjuryType) {
    public void setWorkInjuryType(Byte workInjuryType) {
        this.workInjuryType = workInjuryType;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/WorkInjuryDeclarationInfoDetailDO.java

@@ -42,7 +42,7 @@

    private Long accidentExpressId;

    private String workInjuryType;
    private Byte workInjuryType;

    private Date declareDate;

@@ -98,11 +98,11 @@
        this.accidentExpressId = accidentExpressId;
    }

    public String getWorkInjuryType() {
    public Byte getWorkInjuryType() {
        return workInjuryType;
    }

    public void setWorkInjuryType(String workInjuryType) {
    public void setWorkInjuryType(Byte workInjuryType) {
        this.workInjuryType = workInjuryType;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/WorkInjuryDeclarationInfoPageDO.java

@@ -38,7 +38,7 @@

    private Long accidentExpressId;

    private String workInjuryType;
    private Byte workInjuryType;

    private Date declareDate;

@@ -77,11 +77,11 @@
        this.accidentExpressId = accidentExpressId;
    }

    public String getWorkInjuryType() {
    public Byte getWorkInjuryType() {
        return workInjuryType;
    }

    public void setWorkInjuryType(String workInjuryType) {
    public void setWorkInjuryType(Byte workInjuryType) {
        this.workInjuryType = workInjuryType;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/AccidentExpressEnum.java

对比新文件
@@ -0,0 +1,46 @@
package com.gkhy.safePlatform.incidentManage.enums;

import java.util.HashMap;
import java.util.Map;

public enum AccidentExpressEnum {

    HUMAN_UNSAFE_BEHAVIOR((byte) 1, "人的不安全行为"),
    MATTER_UNSAFE_BEHAVIOR((byte) 2, "物的不安全状态");

    private Byte code;
    private String value;

    AccidentExpressEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, AccidentExpressEnum> toMap() {
        Map<Byte, AccidentExpressEnum> map = new HashMap();
        for (AccidentExpressEnum accidentExpressEnum : AccidentExpressEnum.values()) {
            map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
        }
        return map;
    }
    public static AccidentExpressEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/AccidentReportGradeEnum.java

对比新文件
@@ -0,0 +1,50 @@
package com.gkhy.safePlatform.incidentManage.enums;

import java.util.HashMap;
import java.util.Map;

public enum AccidentReportGradeEnum {


    GRADE_ONE((byte) 1, "一级"),
    GRADE_TWO((byte) 2, "二级"),
    GRADE_THREE((byte) 3, "三级"),
    GRADE_FOUR((byte) 4, "四级");


    private Byte code;
    private String value;

    AccidentReportGradeEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, AccidentReportGradeEnum> toMap() {
        Map<Byte, AccidentReportGradeEnum> map = new HashMap();
        for (AccidentReportGradeEnum accidentExpressEnum : AccidentReportGradeEnum.values()) {
            map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
        }
        return map;
    }
    public static AccidentReportGradeEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/AccidentReportLevelEnum.java

对比新文件
@@ -0,0 +1,50 @@
package com.gkhy.safePlatform.incidentManage.enums;

import java.util.HashMap;
import java.util.Map;

public enum AccidentReportLevelEnum {

    LEVEL_ONE((byte) 1, "特大事故"),
    LEVEL_TWO((byte) 2, "重大事故"),
    LEVEL_THREE((byte) 3, "较大事故"),
    LEVEL_FOUR((byte) 4, "一般事故"),
    LEVEL_FIVE((byte) 5, "未遂事故");


    private Byte code;
    private String value;

    AccidentReportLevelEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, AccidentReportLevelEnum> toMap() {
        Map<Byte, AccidentReportLevelEnum> map = new HashMap();
        for (AccidentReportLevelEnum accidentExpressEnum : AccidentReportLevelEnum.values()) {
            map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
        }
        return map;
    }
    public static AccidentReportLevelEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/AccidentReportTypeEnum.java

对比新文件
@@ -0,0 +1,50 @@
package com.gkhy.safePlatform.incidentManage.enums;

import java.util.HashMap;
import java.util.Map;

public enum AccidentReportTypeEnum {

    TYPE_ONE((byte) 1, "人员伤亡事故"),
    TYPE_TWO((byte) 2, "火灾爆炸事故"),
    TYPE_THREE((byte) 3, "危险品泄露事故"),
    TYPE_FOUR((byte) 4, "设备事故"),
    TYPE_FIVE((byte) 5, "工艺事故");


    private Byte code;
    private String value;

    AccidentReportTypeEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, AccidentReportTypeEnum> toMap() {
        Map<Byte, AccidentReportTypeEnum> map = new HashMap();
        for (AccidentReportTypeEnum accidentExpressEnum : AccidentReportTypeEnum.values()) {
            map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
        }
        return map;
    }
    public static AccidentReportTypeEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/AccidentResultCodes.java

@@ -4,7 +4,6 @@

    ACCIDENT_EXPRESS_NULL("A1001", "事故快报不可为空"),
    ACCIDENT_EXPRESS_NOT_EXIST("A1002", "事故快报不存在"),

    EXPRESS_NAME_NULL("E1001","事故快报名称不能为空"),
    EXPRESS_DEPARTMENT_NULL("E1002","事故快报事故部门不能为空"),
    EXPRESS_TIME_NULL("E1003","事故快报发生时间不能为空"),
@@ -14,11 +13,11 @@
    EXPRESS_BRIEF_PROCESS_NULL("E1007","事故快报事故简要经过不能为空"),
    EXPRESS_CASE_PRELIMINARY_ANALYSIS_NULL("E1008","事故快报事故原因初步分析不能为空"),
    EXPRESS_EMERGENCY_PRECAUTIONS_NULL("E1009","事故快报应急防范措施不能为空"),
    EXPRESS_ENUMS_CAUSE_NOT_EXIST("E1010","事故快报事故原因参数异常"),


    ACCIDENT_REPORT_NULL("A1003", "事故报告不可为空"),
    ACCIDENT_REPORT_NOT_EXIST("A1004", "事故报告不存在"),

    REPORT_TYPE_NULL("R1001","事故报告事故类型不能为空"),
    REPORT_GRADE_NULL("R1002","事故报告事故等级不能为空"),
    REPORT_ECONOMIC_LOSS_NULL("R1003","事故报告经济损失不能为空"),
@@ -30,15 +29,19 @@
    REPORT_ACCIDENT_HANDLING_NULL("R1009","事故报告事故处理不能为空"),
    REPORT_FILL_IN_USER_UID_NULL("R1010","事故报告填写人不能为空"),
    REPORT_FILL_IN_TIME_NULL("R1011","事故报告填写日期不能为空"),
    REPORT_ENUMS_TYPE_NOT_EXIST("E1012","事故报告事故类别参数异常"),
    REPORT_ENUMS_GRADE_NOT_EXIST("E1013","事故报告事故等级参数异常"),
    REPORT_ENUMS_LEVEL_NOT_EXIST("E1014","事故报告事故级别参数异常"),


    WORK_INJURY_DECLARATION_NULL("W1001", "工伤申报不可为空"),
    WORK_INJURY_DECLARATION_NOT_EXIST("W1002", "工伤申报不存在"),

    WORK_INJURY_DECLARATION_USERNAME_NULL("W1003", "申报人名称不可为空"),
    WORK_INJURY_DECLARATION_GENDER_NULL("W1003", "申报人名称不可为空"),
    WORK_INJURY_DECLARATION_USERNAME_NOT_EXIST("W1005", "申报人部门不可为空"),
    WORK_INJURY_DECLARATION_TYPE_NULL("W1006", "工伤类型不可为空"),
    WORK_INJURY_DECLARATION_Date_NULL("W1006", "申报日期不可为空"),
    WORK_INJURY_DECLARATION_DATA_NULL("W1006", "申报日期不可为空"),
    WORK_INJURY_DECLARATION_ENUMS_TYPE_NOT_EXIST("W1007","工伤申报工伤类型参数异常"),

    CASE_NULL("C1001", "事故案例不可为空"),
    CASE_NOT_EXIST("C1002", "事故案例不存在"),
@@ -47,6 +50,8 @@

    YEAR_NULL("Y1001" , "年份不能为空"),



    ERROR("A3000", "未知错误");

    private String code;

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/WorkInjuryTypeEnum.java

对比新文件
@@ -0,0 +1,47 @@
package com.gkhy.safePlatform.incidentManage.enums;

import java.util.HashMap;
import java.util.Map;

public enum WorkInjuryTypeEnum {

    TYPE_TWO((byte) 1, "轻伤"),
    TYPE_THREE((byte) 2, "重伤");


    private Byte code;
    private String value;

    WorkInjuryTypeEnum(Byte code, String value) {
        this.code = code;
        this.value = value;
    }

    public Byte getCode() {
        return code;
    }

    public void setCode(Byte code) {
        this.code = code;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
    public static Map<Byte, WorkInjuryTypeEnum> toMap() {
        Map<Byte, WorkInjuryTypeEnum> map = new HashMap();
        for (WorkInjuryTypeEnum accidentExpressEnum : WorkInjuryTypeEnum.values()) {
            map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
        }
        return map;
    }
    public static WorkInjuryTypeEnum getByCode(Byte code){
        return toMap().get(code);
    }
}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java

@@ -27,7 +27,7 @@

    private Boolean casualties;

    private String accidentCause;
    private Byte accidentCause;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date occurrenceTime;
@@ -81,11 +81,11 @@
        this.casualties = casualties;
    }

    public String getAccidentCause() {
    public Byte getAccidentCause() {
        return accidentCause;
    }

    public void setAccidentCause(String accidentCause) {
    public void setAccidentCause(Byte accidentCause) {
        this.accidentCause = accidentCause;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java

@@ -32,9 +32,9 @@

    private Long accidentExpressId;

    private String accidentType;
    private Byte accidentType;

    private String accidentGrade;
    private Byte accidentGrade;

    private BigDecimal economicLoss;

@@ -49,7 +49,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date reportDeadline;

    private String accidentLevel;
    private Byte accidentLevel;

    private String accidentDelayApply;

@@ -88,19 +88,19 @@
        this.accidentExpressId = accidentExpressId;
    }

    public String getAccidentType() {
    public Byte getAccidentType() {
        return accidentType;
    }

    public void setAccidentType(String accidentType) {
    public void setAccidentType(Byte accidentType) {
        this.accidentType = accidentType;
    }

    public String getAccidentGrade() {
    public Byte getAccidentGrade() {
        return accidentGrade;
    }

    public void setAccidentGrade(String accidentGrade) {
    public void setAccidentGrade(Byte accidentGrade) {
        this.accidentGrade = accidentGrade;
    }

@@ -152,11 +152,11 @@
        this.reportDeadline = reportDeadline;
    }

    public String getAccidentLevel() {
    public Byte getAccidentLevel() {
        return accidentLevel;
    }

    public void setAccidentLevel(String accidentLevel) {
    public void setAccidentLevel(Byte accidentLevel) {
        this.accidentLevel = accidentLevel;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java

@@ -18,7 +18,7 @@

    private Long accidentExpressId;

    private String workInjuryType;
    private Byte workInjuryType;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date declareDate;
@@ -77,11 +77,11 @@
        this.accidentExpressId = accidentExpressId;
    }

    public String getWorkInjuryType() {
    public Byte getWorkInjuryType() {
        return workInjuryType;
    }

    public void setWorkInjuryType(String workInjuryType) {
    public void setWorkInjuryType(Byte workInjuryType) {
        this.workInjuryType = workInjuryType;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentExpressDetailRespDTO.java

@@ -19,7 +19,7 @@

    private Boolean casualties;

    private String accidentCause;
    private Byte accidentCause;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date occurrenceTime;
@@ -73,11 +73,11 @@
        this.casualties = casualties;
    }

    public String getAccidentCause() {
    public Byte getAccidentCause() {
        return accidentCause;
    }

    public void setAccidentCause(String accidentCause) {
    public void setAccidentCause(Byte accidentCause) {
        this.accidentCause = accidentCause;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentExpressPageRespDTO.java

@@ -36,7 +36,7 @@

    private Long createUid;

    private String accidentCause;
    private Byte accidentCause;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date occurrenceTime;
@@ -72,11 +72,11 @@
    }


    public String getAccidentCause() {
    public Byte getAccidentCause() {
        return accidentCause;
    }

    public void setAccidentCause(String accidentCause) {
    public void setAccidentCause(Byte accidentCause) {
        this.accidentCause = accidentCause;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java

@@ -84,9 +84,9 @@

    private Long accidentExpressId;

    private String accidentType;
    private Byte accidentType;

    private String accidentGrade;
    private Byte accidentGrade;

    private BigDecimal economicLoss;

@@ -101,7 +101,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date reportDeadline;

    private String accidentLevel;
    private Byte accidentLevel;

    private String accidentDelayApply;

@@ -140,19 +140,19 @@
        this.accidentExpressId = accidentExpressId;
    }

    public String getAccidentType() {
    public Byte getAccidentType() {
        return accidentType;
    }

    public void setAccidentType(String accidentType) {
    public void setAccidentType(Byte accidentType) {
        this.accidentType = accidentType;
    }

    public String getAccidentGrade() {
    public Byte getAccidentGrade() {
        return accidentGrade;
    }

    public void setAccidentGrade(String accidentGrade) {
    public void setAccidentGrade(Byte accidentGrade) {
        this.accidentGrade = accidentGrade;
    }

@@ -204,11 +204,11 @@
        this.reportDeadline = reportDeadline;
    }

    public String getAccidentLevel() {
    public Byte getAccidentLevel() {
        return accidentLevel;
    }

    public void setAccidentLevel(String accidentLevel) {
    public void setAccidentLevel(Byte accidentLevel) {
        this.accidentLevel = accidentLevel;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportPageRespDTO.java

@@ -64,9 +64,9 @@

    private Long accidentExpressId;

    private String accidentType;
    private Byte accidentType;

    private String accidentGrade;
    private Byte accidentGrade;

    public Long getId() {
        return id;
@@ -92,19 +92,19 @@
        this.accidentExpressId = accidentExpressId;
    }

    public String getAccidentType() {
    public Byte getAccidentType() {
        return accidentType;
    }

    public void setAccidentType(String accidentType) {
    public void setAccidentType(Byte accidentType) {
        this.accidentType = accidentType;
    }

    public String getAccidentGrade() {
    public Byte getAccidentGrade() {
        return accidentGrade;
    }

    public void setAccidentGrade(String accidentGrade) {
    public void setAccidentGrade(Byte accidentGrade) {
        this.accidentGrade = accidentGrade;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/WorkInjuryDeclarationDetailRespDTO.java

@@ -40,7 +40,7 @@

    private Long accidentExpressId;

    private String workInjuryType;
    private Byte workInjuryType;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date declareDate;
@@ -99,11 +99,11 @@
        this.accidentExpressId = accidentExpressId;
    }

    public String getWorkInjuryType() {
    public Byte getWorkInjuryType() {
        return workInjuryType;
    }

    public void setWorkInjuryType(String workInjuryType) {
    public void setWorkInjuryType(Byte workInjuryType) {
        this.workInjuryType = workInjuryType;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/WorkInjuryDeclarationPageRespDTO.java

@@ -35,7 +35,7 @@

    private Long accidentExpressId;

    private String workInjuryType;
    private Byte workInjuryType;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date declareDate;
@@ -74,11 +74,11 @@
        this.accidentExpressId = accidentExpressId;
    }

    public String getWorkInjuryType() {
    public Byte getWorkInjuryType() {
        return workInjuryType;
    }

    public void setWorkInjuryType(String workInjuryType) {
    public void setWorkInjuryType(Byte workInjuryType) {
        this.workInjuryType = workInjuryType;
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java

@@ -12,6 +12,7 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.incidentManage.entity.*;
import com.gkhy.safePlatform.incidentManage.enums.AccidentExpressEnum;
import com.gkhy.safePlatform.incidentManage.enums.AccidentResultCodes;
import com.gkhy.safePlatform.incidentManage.exception.AccidentException;
import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentExpressCasualtyReqDTO;
@@ -68,7 +69,7 @@

        Map<Long, String> depPool = new HashMap<>();

        respList.forEach(AccidentExpressPageRespDTO ->{
        respList.forEach(AccidentExpressPageRespDTO -> {
            // 设置部门名称
            if (!depPool.containsKey(AccidentExpressPageRespDTO.getAccidentDepartmentId())) {
                ResultVO<DepInfoRPCRespDTO> rpcResult = accountDepartmentService.getDepInfoByDepId(AccidentExpressPageRespDTO.getAccidentDepartmentId());
@@ -78,7 +79,8 @@

                        depPool.put(dep.getDepId(), dep.getDepName());
                    }
                }}
                }
            }

            String depName = depPool.get(AccidentExpressPageRespDTO.getAccidentDepartmentId());
            AccidentExpressPageRespDTO.setDeptName(depName);
@@ -87,7 +89,7 @@
        return new SearchResultVO<>(
                true,
                pageIndex,
                pageSize,page.getPages(),
                pageSize, page.getPages(),
                page.getTotal(),
                respList,
                ResultCodes.OK
@@ -101,6 +103,9 @@
        //必填项验证
        checkRequired(accidentExpressReqDTO);

        //枚举验证
        checkEnum(accidentExpressReqDTO);

        Date nowDate = new Date();
        //1.新增事故快报
        AccidentExpressInfo accidentExpressInfo = new AccidentExpressInfo();
@@ -111,16 +116,16 @@
        accidentExpressInfo.setGmtCreate(nowDate);
        accidentExpressInfoService.addAccidentExpress(accidentExpressInfo);
        //2.新增事故快报附件
        if (!CollectionUtils.isEmpty(accidentExpressReqDTO.getFileList())){
            addAccidentExpressFile(accidentExpressInfo.getId(),uid,nowDate,accidentExpressReqDTO.getFileList());
        if (!CollectionUtils.isEmpty(accidentExpressReqDTO.getFileList())) {
            addAccidentExpressFile(accidentExpressInfo.getId(), uid, nowDate, accidentExpressReqDTO.getFileList());
        }

        AccidentExpressDetailRespDTO accidentExpressDetailRespDTO = new AccidentExpressDetailRespDTO();
        BeanUtils.copyProperties(accidentExpressInfo,accidentExpressDetailRespDTO);
        return new ResultVO<>(ResultCodes.OK,accidentExpressDetailRespDTO);
        BeanUtils.copyProperties(accidentExpressInfo, accidentExpressDetailRespDTO);
        return new ResultVO<>(ResultCodes.OK, accidentExpressDetailRespDTO);
    }

    private void  addAccidentExpressFile(Long accidentExpressId ,Long uid , Date nowDate , List<AccidentExpressFileReqDTO> AccidentExpressFileReqDTOList){
    private void addAccidentExpressFile(Long accidentExpressId, Long uid, Date nowDate, List<AccidentExpressFileReqDTO> AccidentExpressFileReqDTOList) {
        List<AccidentExpressFileInfo> fileInfoList = BeanCopyUtils.copyBeanList(AccidentExpressFileReqDTOList, AccidentExpressFileInfo.class);
        fileInfoList.forEach(AccidentExpressFileInfo -> {
            AccidentExpressFileInfo.setAccidentExpressId(accidentExpressId);
@@ -128,7 +133,7 @@
            AccidentExpressFileInfo.setCreateUid(uid);
            AccidentExpressFileInfo.setGmtCreate(nowDate);
        });
        for (AccidentExpressFileInfo AccidentExpressFileInfo :fileInfoList){
        for (AccidentExpressFileInfo AccidentExpressFileInfo : fileInfoList) {
            accidentExpressFileInfoService.addAccidentExpressFile(AccidentExpressFileInfo);
        }
    }
@@ -138,40 +143,46 @@
        AccidentExpressDetailRespDTO AccidentExpressDetailRespDTO = new AccidentExpressDetailRespDTO();
        //查询是否存在
        AccidentExpressInfoDetailDO AccidentExpressInfoDetailDO = accidentExpressInfoService.selectAccidentExpressById(id);
        if (AccidentExpressInfoDetailDO==null){
        if (AccidentExpressInfoDetailDO == null) {
            throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NOT_EXIST);
        }else{
            BeanUtils.copyProperties(AccidentExpressInfoDetailDO,AccidentExpressDetailRespDTO);
        } else {
            BeanUtils.copyProperties(AccidentExpressInfoDetailDO, AccidentExpressDetailRespDTO);
            //查找对应的附件
            List<AccidentExpressFileInfoDO> AccidentExpressFileInfoDOList = accidentExpressFileInfoService.selectByAccidentExpressId(id);
            if (!CollectionUtils.isEmpty(AccidentExpressFileInfoDOList)){
                List<AccidentExpressFileRespDTO> accidentExpressFileRespDTOList = BeanCopyUtils.copyBeanList(AccidentExpressFileInfoDOList , AccidentExpressFileRespDTO.class);
            if (!CollectionUtils.isEmpty(AccidentExpressFileInfoDOList)) {
                List<AccidentExpressFileRespDTO> accidentExpressFileRespDTOList = BeanCopyUtils.copyBeanList(AccidentExpressFileInfoDOList, AccidentExpressFileRespDTO.class);
                AccidentExpressDetailRespDTO.setFileList(accidentExpressFileRespDTOList);
            }
            return new ResultVO<>(ResultCodes.OK ,AccidentExpressDetailRespDTO);
            return new ResultVO<>(ResultCodes.OK, AccidentExpressDetailRespDTO);
        }
    }

    @Override
    public ResultVO updateAccidentExpress(Long uid, AccidentExpressReqDTO accidentExpressReqDTO) {

        //必填项验证
        checkRequired(accidentExpressReqDTO);
        //枚举验证
        checkEnum(accidentExpressReqDTO);

        Date nowDate = new Date();
        //查询是否存在
        AccidentExpressInfoDetailDO AccidentExpressInfoDetailDO = accidentExpressInfoService.selectAccidentExpressById(accidentExpressReqDTO.getId());
        if (AccidentExpressInfoDetailDO==null){
        if (AccidentExpressInfoDetailDO == null) {
            throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NOT_EXIST);
        }else{
        } else {
            AccidentExpressInfo accidentExpressInfo = new AccidentExpressInfo();
            BeanUtils.copyProperties(accidentExpressReqDTO,accidentExpressInfo);
            BeanUtils.copyProperties(accidentExpressReqDTO, accidentExpressInfo);
            accidentExpressInfo.setUpdateUid(uid);
            accidentExpressInfo.setGmtModitify(nowDate);
            accidentExpressInfoService.updateAccidentExpress(accidentExpressInfo);
            //修改事故快报附件
            updateAccidentExpressFile(uid,accidentExpressReqDTO.getId(),nowDate,accidentExpressReqDTO.getFileList());
            updateAccidentExpressFile(uid, accidentExpressReqDTO.getId(), nowDate, accidentExpressReqDTO.getFileList());
            return new ResultVO(ResultCodes.OK);
        }
    }

    private void updateAccidentExpressFile(Long uid ,Long accidentExpressId ,Date nowDate,List<AccidentExpressFileReqDTO> AccidentExpressFileReqDTOList){
    private void updateAccidentExpressFile(Long uid, Long accidentExpressId, Date nowDate, List<AccidentExpressFileReqDTO> AccidentExpressFileReqDTOList) {

        List<AccidentExpressFileInfoDO> accidentExpressFileInfoDOList = accidentExpressFileInfoService.selectByAccidentExpressId(accidentExpressId);
        List<Long> oldIdsList = accidentExpressFileInfoDOList.stream().map(AccidentExpressFileInfoDO::getId).collect(Collectors.toList());
@@ -181,11 +192,11 @@
        List<AccidentExpressFileInfo> addList = new ArrayList<>();
        //删除的附件集合(id)
        List<Long> deleteList = new ArrayList<>();
        for (AccidentExpressFileReqDTO AccidentExpressFileReqDTO : AccidentExpressFileReqDTOList){
        for (AccidentExpressFileReqDTO AccidentExpressFileReqDTO : AccidentExpressFileReqDTOList) {
            //如果不存在id则表示页面新增的附件
            if (AccidentExpressFileReqDTO.getId() == null){
            if (AccidentExpressFileReqDTO.getId() == null) {
                AccidentExpressFileInfo AccidentExpressFileInfo = new AccidentExpressFileInfo();
                BeanUtils.copyProperties(AccidentExpressFileReqDTO,AccidentExpressFileInfo);
                BeanUtils.copyProperties(AccidentExpressFileReqDTO, AccidentExpressFileInfo);
                AccidentExpressFileInfo.setDelFlag(false);
                AccidentExpressFileInfo.setGmtCreate(nowDate);
                AccidentExpressFileInfo.setCreateUid(uid);
@@ -193,21 +204,21 @@
                addList.add(AccidentExpressFileInfo);
            }
            //如果存在id则判断页面是否删除
            else{
            else {
                newIdsList.add(AccidentExpressFileReqDTO.getId());
            }
        }
        for (Long oldId : oldIdsList){
            if (!newIdsList.contains(oldId)){
        for (Long oldId : oldIdsList) {
            if (!newIdsList.contains(oldId)) {
                deleteList.add(oldId);
            }
        }
        if (!CollectionUtils.isEmpty(addList)){
            for (AccidentExpressFileInfo AccidentExpressFileInfo : addList){
        if (!CollectionUtils.isEmpty(addList)) {
            for (AccidentExpressFileInfo AccidentExpressFileInfo : addList) {
                accidentExpressFileInfoService.addAccidentExpressFile(AccidentExpressFileInfo);
            }
        }
        if (!CollectionUtils.isEmpty(deleteList)){
        if (!CollectionUtils.isEmpty(deleteList)) {
            accidentExpressFileInfoService.deleteAccidentExpressFileByIds(deleteList);
        }
    }
@@ -215,10 +226,10 @@

    @Override
    public ResultVO batchDeleteAccidentExpress(Long[] ids) {
        if (ids == null ||  ids.length==0){
        if (ids == null || ids.length == 0) {
            throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NULL);
        }else{
            for (Long id : ids){
        } else {
            for (Long id : ids) {
                deleteAccidentExpress(id);
            }
            return new ResultVO(ResultCodes.OK);
@@ -228,9 +239,9 @@
    private void deleteAccidentExpress(Long id) {
        //查询是否存在
        AccidentExpressInfoDetailDO AccidentExpressInfoDetailDO = accidentExpressInfoService.selectAccidentExpressById(id);
        if (AccidentExpressInfoDetailDO==null){
        if (AccidentExpressInfoDetailDO == null) {
            throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NOT_EXIST);
        }else{
        } else {
            accidentExpressInfoService.deleteAccidentExpressById(id);
            //删除附件
            accidentExpressFileInfoService.deleteAccidentExpressFileByAccidentExpressId(id);
@@ -242,17 +253,17 @@
    @Override
    public ResultVO selectAccidentExpressCasualtyList(Long accidentExpressId) {
        List<AccidentExpressCasualtyInfoDO> accidentExpressCasualtyInfoDOList = accidentExpressCasualtyInfoService.selectByAccidentExpressId(accidentExpressId);
        List<AccidentExpressCasualtyRespDTO> respList =BeanCopyUtils.copyBeanList(accidentExpressCasualtyInfoDOList, AccidentExpressCasualtyRespDTO.class);
        return new ResultVO<>(ResultCodes.OK,respList);
        List<AccidentExpressCasualtyRespDTO> respList = BeanCopyUtils.copyBeanList(accidentExpressCasualtyInfoDOList, AccidentExpressCasualtyRespDTO.class);
        return new ResultVO<>(ResultCodes.OK, respList);
    }

    @Override
    public ResultVO addAccidentExpressCasualty(Long uid, AccidentExpressCasualtyReqDTO accidentExpressCasualtyReqDTO) {
        if (accidentExpressCasualtyReqDTO.getAccidentExpressId()==null){
        if (accidentExpressCasualtyReqDTO.getAccidentExpressId() == null) {
            throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NULL);
        }else{
        } else {
            AccidentExpressCasualtyInfo accidentExpressCasualtyInfo = new AccidentExpressCasualtyInfo();
            BeanUtils.copyProperties(accidentExpressCasualtyReqDTO,accidentExpressCasualtyInfo);
            BeanUtils.copyProperties(accidentExpressCasualtyReqDTO, accidentExpressCasualtyInfo);
            accidentExpressCasualtyInfo.setDelFlag(false);
            accidentExpressCasualtyInfo.setGmtCreate(new Date());
            accidentExpressCasualtyInfo.setCreateUid(uid);
@@ -268,48 +279,59 @@
    }



    /**
     * 验证必填项
     *
     * @return
     */
    private void checkRequired(AccidentExpressReqDTO AccidentExpressReqDTO) {
    private void checkRequired(AccidentExpressReqDTO accidentExpressReqDTO) {
        //名称
        if (StringUtils.isBlank(AccidentExpressReqDTO.getAccidentName())) {
        if (StringUtils.isBlank(accidentExpressReqDTO.getAccidentName())) {
            throw new AccidentException(AccidentResultCodes.EXPRESS_NAME_NULL);
        }
        //部门
        if (AccidentExpressReqDTO.getAccidentDepartmentId()==null) {
        if (accidentExpressReqDTO.getAccidentDepartmentId() == null) {
            throw new AccidentException(AccidentResultCodes.EXPRESS_DEPARTMENT_NULL);
        }
        //发生时间
        if (AccidentExpressReqDTO.getOccurrenceTime() == null ) {
        if (accidentExpressReqDTO.getOccurrenceTime() == null) {
            throw new AccidentException(AccidentResultCodes.EXPRESS_TIME_NULL);
        }
        //发生地点
        if (StringUtils.isBlank(AccidentExpressReqDTO.getOccurrencePlace())) {
        if (StringUtils.isBlank(accidentExpressReqDTO.getOccurrencePlace())) {
            throw new AccidentException(AccidentResultCodes.EXPRESS_PLACE_NULL);
        }
        //事故原因
        if (StringUtils.isBlank(AccidentExpressReqDTO.getAccidentCause())) {
        if (accidentExpressReqDTO.getAccidentCause() == null) {
            throw new AccidentException(AccidentResultCodes.EXPRESS_CAUSE_NULL);
        }
        //是否有伤亡
        if (AccidentExpressReqDTO.getCasualties()==null) {
        if (accidentExpressReqDTO.getCasualties() == null) {
            throw new AccidentException(AccidentResultCodes.EXPRESS_CASUALTIES_NULL);
        }
        //简要经过
        if (StringUtils.isBlank(AccidentExpressReqDTO.getAccidentBriefProcess())) {
        if (StringUtils.isBlank(accidentExpressReqDTO.getAccidentBriefProcess())) {
            throw new AccidentException(AccidentResultCodes.EXPRESS_BRIEF_PROCESS_NULL);
        }
        //初步分析
        if (StringUtils.isBlank(AccidentExpressReqDTO.getAccidentCausesPreliminaryAnalysis())) {
        if (StringUtils.isBlank(accidentExpressReqDTO.getAccidentCausesPreliminaryAnalysis())) {
            throw new AccidentException(AccidentResultCodes.EXPRESS_CASE_PRELIMINARY_ANALYSIS_NULL);
        }
        //应急防范措施
        if (StringUtils.isBlank(AccidentExpressReqDTO.getEmergencyPrecautions())) {
        if (StringUtils.isBlank(accidentExpressReqDTO.getEmergencyPrecautions())) {
            throw new AccidentException(AccidentResultCodes.EXPRESS_EMERGENCY_PRECAUTIONS_NULL);
        }
    }

    /**
     *
     * 枚举验证
     *
     */
    private void checkEnum(AccidentExpressReqDTO accidentExpressReqDTO){
        if (AccidentExpressEnum.getByCode(accidentExpressReqDTO.getAccidentCause())==null){
            throw new AccidentException(AccidentResultCodes.EXPRESS_ENUMS_CAUSE_NOT_EXIST);
        }
    }

}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java

@@ -10,6 +10,9 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.incidentManage.entity.*;
import com.gkhy.safePlatform.incidentManage.enums.AccidentReportGradeEnum;
import com.gkhy.safePlatform.incidentManage.enums.AccidentReportLevelEnum;
import com.gkhy.safePlatform.incidentManage.enums.AccidentReportTypeEnum;
import com.gkhy.safePlatform.incidentManage.enums.AccidentResultCodes;
import com.gkhy.safePlatform.incidentManage.exception.AccidentException;
import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentReportFileReqDTO;
@@ -99,6 +102,8 @@
    public ResultVO addAccidentReport(Long uid, AccidentReportReqDTO accidentReportReqDTO) {
        //必填项验证
        checkRequired(accidentReportReqDTO);
        // 验证枚举
        checkEnum(accidentReportReqDTO);

        Date nowDate = new Date();
        //1.新增事故报告
@@ -157,6 +162,9 @@

    @Override
    public ResultVO updateAccidentReport(Long uid, AccidentReportReqDTO accidentReportReqDTO) {
        // 验证枚举
        checkEnum(accidentReportReqDTO);

        Date nowDate = new Date();
        //查询是否存在
        AccidentReportInfoDetailDO AccidentReportInfoDetailDO = accidentReportInfoService.selectAccidentReportById(accidentReportReqDTO.getId());
@@ -218,11 +226,11 @@

    @Override
    public ResultVO batchDeleteAccidentReport(Long[] ids) {
        if (ids == null ||  ids.length==0){
        if (ids == null || ids.length == 0) {
            throw new AccidentException(AccidentResultCodes.ACCIDENT_REPORT_NULL);
        } else {

            for (Long id : ids){
            for (Long id : ids) {
                deleteAccidentReport(id);
            }
            return new ResultVO(ResultCodes.OK);
@@ -248,64 +256,79 @@
     *
     * @return
     */
    private void checkRequired(AccidentReportReqDTO AccidentReportReqDTO) {
    private void checkRequired(AccidentReportReqDTO accidentReportReqDTO) {
        //事故快报
        if (AccidentReportReqDTO.getAccidentExpressId() == null) {
        if (accidentReportReqDTO.getAccidentExpressId() == null) {
            throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NULL);
        }
        AccidentExpressInfoDetailDO accidentExpressInfo = accidentExpressInfoService.selectAccidentExpressById(AccidentReportReqDTO.getAccidentExpressId());
        AccidentExpressInfoDetailDO accidentExpressInfo = accidentExpressInfoService.selectAccidentExpressById(accidentReportReqDTO.getAccidentExpressId());
        if (accidentExpressInfo == null) {
            throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NOT_EXIST);
        }

        //事故类型
        if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentType())) {
        if (accidentReportReqDTO.getAccidentType() == null) {
            throw new AccidentException(AccidentResultCodes.REPORT_TYPE_NULL);
        }
        //事故等级
        if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentGrade())) {
        if (accidentReportReqDTO.getAccidentGrade() == null) {
            throw new AccidentException(AccidentResultCodes.REPORT_GRADE_NULL);
        }
        //经济损失
        if (AccidentReportReqDTO.getEconomicLoss() == null) {
        if (accidentReportReqDTO.getEconomicLoss() == null) {
            throw new AccidentException(AccidentResultCodes.REPORT_ECONOMIC_LOSS_NULL);
        }
        //要求报告完成期限
        if (AccidentReportReqDTO.getReportDeadline() == null) {
        if (accidentReportReqDTO.getReportDeadline() == null) {
            throw new AccidentException(AccidentResultCodes.REPORT_REPORT_DEADLINE_NULL);
        }
        //事故级别
        if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentLevel())) {
        if (accidentReportReqDTO.getAccidentLevel() == null) {
            throw new AccidentException(AccidentResultCodes.REPORT_LEVEL_NULL);
        }
        //原因综合分析（直接）
        if (StringUtils.isBlank(AccidentReportReqDTO.getComprehensiveAnalysisDirect())) {
        if (StringUtils.isBlank(accidentReportReqDTO.getComprehensiveAnalysisDirect())) {
            throw new AccidentException(AccidentResultCodes.REPORT_COMPREHENSIVE_ANALYSIS_DIRECT_NULL);
        }
        //原因综合分析（直接）
        if (StringUtils.isBlank(AccidentReportReqDTO.getComprehensiveAnalysisDirect())) {
        if (StringUtils.isBlank(accidentReportReqDTO.getComprehensiveAnalysisDirect())) {
            throw new AccidentException(AccidentResultCodes.REPORT_COMPREHENSIVE_ANALYSIS_DIRECT_NULL);
        }
        //原因综合分析（间接）
        if (StringUtils.isBlank(AccidentReportReqDTO.getComprehensiveAnalysisIndirect())) {
        if (StringUtils.isBlank(accidentReportReqDTO.getComprehensiveAnalysisIndirect())) {
            throw new AccidentException(AccidentResultCodes.REPORT_COMPREHENSIVE_ANALYSIS_INDIRECT_NULL);
        }
        //整改措施
        if (StringUtils.isBlank(AccidentReportReqDTO.getRectificationMeasures())) {
        if (StringUtils.isBlank(accidentReportReqDTO.getRectificationMeasures())) {
            throw new AccidentException(AccidentResultCodes.REPORT_RECTIFICATION_MEASURES_NULL);
        }
        //事故处理
        if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentHandling())) {
        if (StringUtils.isBlank(accidentReportReqDTO.getAccidentHandling())) {
            throw new AccidentException(AccidentResultCodes.REPORT_ACCIDENT_HANDLING_NULL);
        }
        //填写人
        if (AccidentReportReqDTO.getFillInUserUid() == null) {
        if (accidentReportReqDTO.getFillInUserUid() == null) {
            throw new AccidentException(AccidentResultCodes.REPORT_FILL_IN_USER_UID_NULL);
        }
        //填写日期
        if (AccidentReportReqDTO.getFillInTime() == null) {
        if (accidentReportReqDTO.getFillInTime() == null) {
            throw new AccidentException(AccidentResultCodes.REPORT_FILL_IN_TIME_NULL);
        }
    }

    /**
     * 枚举验证
     */
    private void checkEnum(AccidentReportReqDTO accidentExpressReqDTO) {
        if (AccidentReportTypeEnum.getByCode(accidentExpressReqDTO.getAccidentType()) == null) {
            throw new AccidentException(AccidentResultCodes.REPORT_ENUMS_TYPE_NOT_EXIST);
        }
        if (AccidentReportGradeEnum.getByCode(accidentExpressReqDTO.getAccidentGrade()) == null) {
            throw new AccidentException(AccidentResultCodes.REPORT_ENUMS_GRADE_NOT_EXIST);
        }
        if (AccidentReportLevelEnum.getByCode(accidentExpressReqDTO.getAccidentLevel()) == null) {
            throw new AccidentException(AccidentResultCodes.REPORT_ENUMS_LEVEL_NOT_EXIST);
        }
    }

}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/WorkInjuryDeclarationServiceImpl.java

@@ -11,6 +11,7 @@
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.incidentManage.entity.*;
import com.gkhy.safePlatform.incidentManage.enums.AccidentResultCodes;
import com.gkhy.safePlatform.incidentManage.enums.WorkInjuryTypeEnum;
import com.gkhy.safePlatform.incidentManage.exception.AccidentException;
import com.gkhy.safePlatform.incidentManage.model.dto.req.WorkInjuryDeclarationFileReqDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.req.WorkInjuryDeclarationReqDTO;
@@ -86,7 +87,7 @@
        return new SearchResultVO<>(
                true,
                pageIndex,
                pageSize,page.getPages(),
                pageSize, page.getPages(),
                page.getTotal(),
                respList,
                ResultCodes.OK
@@ -107,13 +108,13 @@
        WorkInjuryDeclarationInfo.setGmtCreate(nowDate);
        workInjuryDeclarationInfoService.addWorkInjuryDeclaration(WorkInjuryDeclarationInfo);
        //2.新增工伤申报附件
        if (!CollectionUtils.isEmpty(WorkInjuryDeclarationReqDTO.getFileList())){
            addWorkInjuryDeclarationFile(WorkInjuryDeclarationInfo.getId(),uid,nowDate,WorkInjuryDeclarationReqDTO.getFileList());
        if (!CollectionUtils.isEmpty(WorkInjuryDeclarationReqDTO.getFileList())) {
            addWorkInjuryDeclarationFile(WorkInjuryDeclarationInfo.getId(), uid, nowDate, WorkInjuryDeclarationReqDTO.getFileList());
        }
        return new ResultVO(ResultCodes.OK);
    }

    private void  addWorkInjuryDeclarationFile(Long WorkInjuryDeclarationId ,Long uid , Date nowDate , List<WorkInjuryDeclarationFileReqDTO> WorkInjuryDeclarationFileReqDTOList){
    private void addWorkInjuryDeclarationFile(Long WorkInjuryDeclarationId, Long uid, Date nowDate, List<WorkInjuryDeclarationFileReqDTO> WorkInjuryDeclarationFileReqDTOList) {
        List<WorkInjuryDeclarationFileInfo> fileInfoList = BeanCopyUtils.copyBeanList(WorkInjuryDeclarationFileReqDTOList, WorkInjuryDeclarationFileInfo.class);
        fileInfoList.forEach(WorkInjuryDeclarationFileInfo -> {
            WorkInjuryDeclarationFileInfo.setWorkInjuryDeclarationId(WorkInjuryDeclarationId);
@@ -121,7 +122,7 @@
            WorkInjuryDeclarationFileInfo.setCreateUid(uid);
            WorkInjuryDeclarationFileInfo.setGmtCreate(nowDate);
        });
        for (WorkInjuryDeclarationFileInfo WorkInjuryDeclarationFileInfo :fileInfoList){
        for (WorkInjuryDeclarationFileInfo WorkInjuryDeclarationFileInfo : fileInfoList) {
            workInjuryDeclarationFileInfoService.addWorkInjuryDeclarationFile(WorkInjuryDeclarationFileInfo);
        }
    }
@@ -131,17 +132,17 @@
        WorkInjuryDeclarationDetailRespDTO WorkInjuryDeclarationDetailRespDTO = new WorkInjuryDeclarationDetailRespDTO();
        //查询是否存在
        WorkInjuryDeclarationInfoDetailDO WorkInjuryDeclarationInfoDetailDO = workInjuryDeclarationInfoService.selectWorkInjuryDeclarationById(id);
        if (WorkInjuryDeclarationInfoDetailDO==null){
        if (WorkInjuryDeclarationInfoDetailDO == null) {
            throw new AccidentException(AccidentResultCodes.WORK_INJURY_DECLARATION_NOT_EXIST);
        }else{
            BeanUtils.copyProperties(WorkInjuryDeclarationInfoDetailDO,WorkInjuryDeclarationDetailRespDTO);
        } else {
            BeanUtils.copyProperties(WorkInjuryDeclarationInfoDetailDO, WorkInjuryDeclarationDetailRespDTO);
            //查找对应的附件
            List<WorkInjuryDeclarationFileInfoDO> WorkInjuryDeclarationFileInfoDOList = workInjuryDeclarationFileInfoService.selectByWorkInjuryDeclarationId(id);
            if (!CollectionUtils.isEmpty(WorkInjuryDeclarationFileInfoDOList)){
                List<WorkInjuryDeclarationFileRespDTO> WorkInjuryDeclarationFileRespDTOList = BeanCopyUtils.copyBeanList(WorkInjuryDeclarationFileInfoDOList , WorkInjuryDeclarationFileRespDTO.class);
            if (!CollectionUtils.isEmpty(WorkInjuryDeclarationFileInfoDOList)) {
                List<WorkInjuryDeclarationFileRespDTO> WorkInjuryDeclarationFileRespDTOList = BeanCopyUtils.copyBeanList(WorkInjuryDeclarationFileInfoDOList, WorkInjuryDeclarationFileRespDTO.class);
                WorkInjuryDeclarationDetailRespDTO.setFileList(WorkInjuryDeclarationFileRespDTOList);
            }
            return new ResultVO<>(ResultCodes.OK ,WorkInjuryDeclarationDetailRespDTO);
            return new ResultVO<>(ResultCodes.OK, WorkInjuryDeclarationDetailRespDTO);
        }
    }

@@ -150,21 +151,21 @@
        Date nowDate = new Date();
        //查询是否存在
        WorkInjuryDeclarationInfoDetailDO WorkInjuryDeclarationInfoDetailDO = workInjuryDeclarationInfoService.selectWorkInjuryDeclarationById(WorkInjuryDeclarationReqDTO.getId());
        if (WorkInjuryDeclarationInfoDetailDO==null){
        if (WorkInjuryDeclarationInfoDetailDO == null) {
            throw new AccidentException(AccidentResultCodes.WORK_INJURY_DECLARATION_NOT_EXIST);
        }else{
        } else {
            WorkInjuryDeclarationInfo WorkInjuryDeclarationInfo = new WorkInjuryDeclarationInfo();
            BeanUtils.copyProperties(WorkInjuryDeclarationReqDTO,WorkInjuryDeclarationInfo);
            BeanUtils.copyProperties(WorkInjuryDeclarationReqDTO, WorkInjuryDeclarationInfo);
            WorkInjuryDeclarationInfo.setUpdateUid(uid);
            WorkInjuryDeclarationInfo.setGmtModitify(nowDate);
            workInjuryDeclarationInfoService.updateWorkInjuryDeclaration(WorkInjuryDeclarationInfo);
            //修改工伤申报附件
            updateWorkInjuryDeclarationFile(uid,WorkInjuryDeclarationReqDTO.getId(),nowDate,WorkInjuryDeclarationReqDTO.getFileList());
            updateWorkInjuryDeclarationFile(uid, WorkInjuryDeclarationReqDTO.getId(), nowDate, WorkInjuryDeclarationReqDTO.getFileList());
            return new ResultVO(ResultCodes.OK);
        }
    }

    private void updateWorkInjuryDeclarationFile(Long uid ,Long WorkInjuryDeclarationId ,Date nowDate,List<WorkInjuryDeclarationFileReqDTO> WorkInjuryDeclarationFileReqDTOList){
    private void updateWorkInjuryDeclarationFile(Long uid, Long WorkInjuryDeclarationId, Date nowDate, List<WorkInjuryDeclarationFileReqDTO> WorkInjuryDeclarationFileReqDTOList) {

        List<WorkInjuryDeclarationFileInfoDO> WorkInjuryDeclarationFileInfoDOList = workInjuryDeclarationFileInfoService.selectByWorkInjuryDeclarationId(WorkInjuryDeclarationId);
        List<Long> oldIdsList = WorkInjuryDeclarationFileInfoDOList.stream().map(WorkInjuryDeclarationFileInfoDO::getId).collect(Collectors.toList());
@@ -174,11 +175,11 @@
        List<WorkInjuryDeclarationFileInfo> addList = new ArrayList<>();
        //删除的附件集合(id)
        List<Long> deleteList = new ArrayList<>();
        for (WorkInjuryDeclarationFileReqDTO WorkInjuryDeclarationFileReqDTO : WorkInjuryDeclarationFileReqDTOList){
        for (WorkInjuryDeclarationFileReqDTO WorkInjuryDeclarationFileReqDTO : WorkInjuryDeclarationFileReqDTOList) {
            //如果不存在id则表示页面新增的附件
            if (WorkInjuryDeclarationFileReqDTO.getId() == null){
            if (WorkInjuryDeclarationFileReqDTO.getId() == null) {
                WorkInjuryDeclarationFileInfo WorkInjuryDeclarationFileInfo = new WorkInjuryDeclarationFileInfo();
                BeanUtils.copyProperties(WorkInjuryDeclarationFileReqDTO,WorkInjuryDeclarationFileInfo);
                BeanUtils.copyProperties(WorkInjuryDeclarationFileReqDTO, WorkInjuryDeclarationFileInfo);
                WorkInjuryDeclarationFileInfo.setDelFlag(false);
                WorkInjuryDeclarationFileInfo.setGmtCreate(nowDate);
                WorkInjuryDeclarationFileInfo.setCreateUid(uid);
@@ -186,21 +187,21 @@
                addList.add(WorkInjuryDeclarationFileInfo);
            }
            //如果存在id则判断页面是否删除
            else{
            else {
                newIdsList.add(WorkInjuryDeclarationFileReqDTO.getId());
            }
        }
        for (Long oldId : oldIdsList){
            if (!newIdsList.contains(oldId)){
        for (Long oldId : oldIdsList) {
            if (!newIdsList.contains(oldId)) {
                deleteList.add(oldId);
            }
        }
        if (!CollectionUtils.isEmpty(addList)){
            for (WorkInjuryDeclarationFileInfo WorkInjuryDeclarationFileInfo : addList){
        if (!CollectionUtils.isEmpty(addList)) {
            for (WorkInjuryDeclarationFileInfo WorkInjuryDeclarationFileInfo : addList) {
                workInjuryDeclarationFileInfoService.addWorkInjuryDeclarationFile(WorkInjuryDeclarationFileInfo);
            }
        }
        if (!CollectionUtils.isEmpty(deleteList)){
        if (!CollectionUtils.isEmpty(deleteList)) {
            workInjuryDeclarationFileInfoService.deleteWorkInjuryDeclarationFileByIds(deleteList);
        }
    }
@@ -209,10 +210,10 @@
    @Override
    public ResultVO batchDeleteWorkInjuryDeclaration(Long[] ids) {

        if (ids == null ||  ids.length==0){
        if (ids == null || ids.length == 0) {
            throw new AccidentException(AccidentResultCodes.WORK_INJURY_DECLARATION_NULL);
        }else{
            for (Long id : ids){
        } else {
            for (Long id : ids) {
                deleteWorkInjuryDeclaration(id);
            }
            return new ResultVO(ResultCodes.OK);
@@ -222,9 +223,9 @@
    private void deleteWorkInjuryDeclaration(Long id) {
        //查询是否存在
        WorkInjuryDeclarationInfoDetailDO WorkInjuryDeclarationInfoDetailDO = workInjuryDeclarationInfoService.selectWorkInjuryDeclarationById(id);
        if (WorkInjuryDeclarationInfoDetailDO==null){
        if (WorkInjuryDeclarationInfoDetailDO == null) {
            throw new AccidentException(AccidentResultCodes.WORK_INJURY_DECLARATION_NOT_EXIST);
        }else{
        } else {
            workInjuryDeclarationInfoService.deleteWorkInjuryDeclarationById(id);
            //删除附件
            workInjuryDeclarationFileInfoService.deleteWorkInjuryDeclarationFileByWorkInjuryDeclarationId(id);
@@ -232,41 +233,48 @@
    }




    /**
     * 验证必填项
     *
     * @return
     */
    private void checkRequired(WorkInjuryDeclarationReqDTO WorkInjuryDeclarationReqDTO) {
    private void checkRequired(WorkInjuryDeclarationReqDTO workInjuryDeclarationReqDTO) {
        //申报人姓名
        if (StringUtils.isBlank(WorkInjuryDeclarationReqDTO.getDeclareUserName())) {
        if (StringUtils.isBlank(workInjuryDeclarationReqDTO.getDeclareUserName())) {
            throw new AccidentException(AccidentResultCodes.WORK_INJURY_DECLARATION_USERNAME_NULL);
        }
        //事故性别
        if (WorkInjuryDeclarationReqDTO.getDeclareUserGender() == null ) {
        if (workInjuryDeclarationReqDTO.getDeclareUserGender() == null) {
            throw new AccidentException(AccidentResultCodes.WORK_INJURY_DECLARATION_GENDER_NULL);
        }
        //申报人部门
        if (WorkInjuryDeclarationReqDTO.getDeclareDepartmentId()==null) {
        if (workInjuryDeclarationReqDTO.getDeclareDepartmentId() == null) {
            throw new AccidentException(AccidentResultCodes.WORK_INJURY_DECLARATION_USERNAME_NOT_EXIST);
        }
        //事故名称
        if (WorkInjuryDeclarationReqDTO.getAccidentExpressId() == null ) {
        if (workInjuryDeclarationReqDTO.getAccidentExpressId() == null) {
            throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NULL);
        }
        AccidentExpressInfoDetailDO accidentExpressInfo = accidentExpressInfoService.selectAccidentExpressById(WorkInjuryDeclarationReqDTO.getAccidentExpressId());
        AccidentExpressInfoDetailDO accidentExpressInfo = accidentExpressInfoService.selectAccidentExpressById(workInjuryDeclarationReqDTO.getAccidentExpressId());
        if (accidentExpressInfo == null) {
            throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NOT_EXIST);
        }
        //工伤类型
        if (StringUtils.isBlank(WorkInjuryDeclarationReqDTO.getWorkInjuryType())) {
        if (workInjuryDeclarationReqDTO.getWorkInjuryType() == null) {
            throw new AccidentException(AccidentResultCodes.WORK_INJURY_DECLARATION_TYPE_NULL);
        }
        //申报日期
        if (WorkInjuryDeclarationReqDTO.getDeclareDate()==null) {
            throw new AccidentException(AccidentResultCodes.WORK_INJURY_DECLARATION_Date_NULL);
        if (workInjuryDeclarationReqDTO.getDeclareDate() == null) {
            throw new AccidentException(AccidentResultCodes.WORK_INJURY_DECLARATION_DATA_NULL);
        }
    }

    /**
     * 枚举验证
     */
    private void checkEnum(WorkInjuryDeclarationReqDTO workInjuryDeclarationReqDTO) {
        if (WorkInjuryTypeEnum.getByCode(workInjuryDeclarationReqDTO.getWorkInjuryType()) == null) {
            throw new AccidentException(AccidentResultCodes.WORK_INJURY_DECLARATION_ENUMS_TYPE_NOT_EXIST);
        }
    }
}