Commit 52d5b57c authored by suhuiguang's avatar suhuiguang

fix(jyjc):检验检测业务列表筛选

1.筛选报错
parent 3d50446b
...@@ -18,12 +18,13 @@ public enum InspectPlanStatusEnum { ...@@ -18,12 +18,13 @@ public enum InspectPlanStatusEnum {
this.value = value; this.value = value;
} }
public static InspectPlanStatusEnum getByValue(String value) { public static InspectPlanStatusEnum getByValue(String value) {
for (InspectPlanStatusEnum e : InspectPlanStatusEnum.values()) { for (InspectPlanStatusEnum e : InspectPlanStatusEnum.values()) {
if (e.value.equals(value)) { if (e.value.equals(value)) {
return e; return e;
} }
} }
throw new BadRequest("not support " + value); return null;
} }
} }
...@@ -621,8 +621,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -621,8 +621,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
} }
} }
// 进行筛选时,返回筛选的状态 // 进行筛选时,返回筛选的状态
if (String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()).equals(r.getStatus()) && StringUtils.isNotEmpty(filter.getStatus())) { if (StringUtils.isNotEmpty(filter.getStatus())) {
r.setStatusName(InspectPlanStatusEnum.getByValue(filter.getStatus()).getName()); Optional.ofNullable(InspectPlanStatusEnum.getByValue(filter.getStatus())).ifPresent(e->{
r.setStatusName(e.getName());
});
} }
} }
......
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