Commit 5a948abf authored by tianbo's avatar tianbo

隐患执行检查计划类型bug

parent 459569e6
...@@ -9,8 +9,8 @@ import java.util.Map; ...@@ -9,8 +9,8 @@ import java.util.Map;
* 计划类型枚举(机场单位、外部单位) * 计划类型枚举(机场单位、外部单位)
*/ */
public enum PlanTypeEnum { public enum PlanTypeEnum {
OUTER("外部单位检查","1"), OUTER("外部单位检查","1", "outer"),
INNER("机场单位检查","0"); INNER("机场单位检查","0", "inner");
/** /**
* 名称,描述 * 名称,描述
...@@ -22,9 +22,12 @@ public enum PlanTypeEnum { ...@@ -22,9 +22,12 @@ public enum PlanTypeEnum {
*/ */
private String code; private String code;
PlanTypeEnum(String name, String code){ private String value;
PlanTypeEnum(String name, String code, String value){
this.name = name; this.name = name;
this.code = code; this.code = code;
this.value = value;
} }
public static PlanTypeEnum getEnum(String code) { public static PlanTypeEnum getEnum(String code) {
...@@ -65,4 +68,12 @@ public enum PlanTypeEnum { ...@@ -65,4 +68,12 @@ public enum PlanTypeEnum {
public void setCode(String code) { public void setCode(String code) {
this.code = code; this.code = code;
} }
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
} }
...@@ -1188,7 +1188,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1188,7 +1188,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
}); });
}); });
} }
String startCondition = PlanTypeEnum.INNER.getCode(); String startCondition = PlanTypeEnum.INNER.getValue();
if (PlanTypeEnum.OUTER.getCode().equals(bizInfo.getString("isOuter"))) { if (PlanTypeEnum.OUTER.getCode().equals(bizInfo.getString("isOuter"))) {
if (!roleNameSet.contains(sodFireProtectionConfirmRole)) {// 安全运行部门消防业务 角色 if (!roleNameSet.contains(sodFireProtectionConfirmRole)) {// 安全运行部门消防业务 角色
executeSubmitDto.setIsOk(false); executeSubmitDto.setIsOk(false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment