diff --git a/detection/src/main/java/com/njcn/gather/plan/pojo/enums/PlanResponseEnum.java b/detection/src/main/java/com/njcn/gather/plan/pojo/enums/PlanResponseEnum.java index 5353a260..ba3db274 100644 --- a/detection/src/main/java/com/njcn/gather/plan/pojo/enums/PlanResponseEnum.java +++ b/detection/src/main/java/com/njcn/gather/plan/pojo/enums/PlanResponseEnum.java @@ -10,7 +10,8 @@ import lombok.Getter; public enum PlanResponseEnum { PLAN_REPEATED("A003014", "当前模式下,该计划已存在"), PLAN_NOT_EXIST("A003015", "该计划不存在"), - SCRIPT_RELATE_DICT_NOT_EXIST("A003016","脚本关联的字典不存在"); + SCRIPT_RELATE_DICT_NOT_EXIST("A003016","脚本关联的字典不存在"), + NOT_CHECKED_PLAN_CANNOT_ANALYSE("A003017","只有检测状态为检测完成的计划才能进行统计分析" ); private final String message; private final String code; diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java index b69ddb01..153e0c12 100644 --- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java @@ -426,6 +426,12 @@ public class AdPlanServiceImpl extends ServiceImpl impleme Integer maxTime = config.getMaxTime(); List planList = this.listByIds(ids); + planList.forEach(plan -> { + if (!CheckStateEnum.CHECKED.getValue().equals(plan.getTestState())) { + throw new BusinessException(PlanResponseEnum.NOT_CHECKED_PLAN_CANNOT_ANALYSE); + } + }); + Map> sheets = new HashMap<>(); if (planList.size() > 1) {