diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 92edefad..dcd7a327 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -480,30 +480,8 @@ public class ActSarItemsBussEOService { sarUpdLogEOService.createBaseProcessLog(standId,"BUSINESS",content,prcCreateUser); } else {//标准号、ID都不存在的情况 // 新增方法 - QueryWrapperqueryWrapper = new QueryWrapper<>(); - queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) - .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); - List list = iSarBussionessStandService.list(queryWrapper); - Integer valIdFlag = 0; - for (SarBussionessStand stand :list){ - if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ - valIdFlag = stand.getValidFlag(); - if (valIdFlag == 0){ - logger.info("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在"); - throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在"); - } - } - } sarBussionessStand.setPrcCreateUser(prcCreateUser); sarBussionessStand.setReplaceStandNum(DTQBBHBUSS); - // 根据标准号判断数据是否已存在 -// QueryWrapperqueryWrapper = new QueryWrapper<>(); -// queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) -// .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); -// Integer count = iSarBussionessStandService.count(queryWrapper); -// if (count > 0){ -// throw new AdcDaBaseException("当前企标标准号和企标名称已存在"); -// } //制定和修订类型 清除历史版本 JSONObject atteObj = JSON.parseObject(sarBussionessStand.getSarStandAttrEOStr()); atteObj.remove("LSBBBUSS"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index d3d87b51..f2a7dca8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -734,5 +734,26 @@ public class SarBussionessStandController extends BaseControllerqueryWrapper = new QueryWrapper<>(); + queryWrapper.eq(standCode != null,"STAND_CODE",standCode) + .eq(standName != null,"STAND_NAME",standName); + List list = sarBussionessStandEOService.list(queryWrapper); + Integer valIdFlag = 0; + for (SarBussionessStand stand :list){ + if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ + valIdFlag = stand.getValidFlag(); + if (valIdFlag == 0){ + logger.info("企标标准号"+ standCode +"和企标名称"+ standName +"已存在"); + return Result.error("企标标准号"+ standCode +"和企标名称"+ standName +"已存在"); + } + } + } + return Result.success("校验通过"); + } }