diff --git a/src/main/java/com/xdap/self_development/enums/ParamValueVersionEnum.java b/src/main/java/com/xdap/self_development/enums/ParamValueVersionEnum.java index 025dc39..c1d2acc 100644 --- a/src/main/java/com/xdap/self_development/enums/ParamValueVersionEnum.java +++ b/src/main/java/com/xdap/self_development/enums/ParamValueVersionEnum.java @@ -9,7 +9,7 @@ public enum ParamValueVersionEnum { DRAFT(1,"草稿"), UNDER(2,"审核中"), WITHDRAWN(3,"已撤回"), - REFUSE(4,"已拒绝)"); + REFUSE(4,"已拒绝"); private final Integer code; private final String desc; diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java index ab4618f..5dac3a8 100644 --- a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java @@ -395,6 +395,10 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService { throw new RuntimeException("集合为空,请检查"); } for (EngineParamDetailPojo engineParamDetailPojo : engineParamDetailPojos) { + //查找参数是否已经在审批中 + if (ParamValueVersionEnum.UNDER.getCode().equals(engineParamDetailPojo.getVersionStatus())) { + throw new RuntimeException("您修改参数中有正在审批中的,请查看审批流审批后再修改,零部件+参数名称:" + engineParamDetailPojo.getPartsName()+"-"+engineParamDetailPojo.getParameterName()); + } //通过操作状态对应不同操作新增和更新都新增数据为小版本且为草稿状态 if (engineParamDetailPojo.getOperation().equals(String.valueOf(ParamOperation.UPDATE))) {