From 98d454739e217fb23a0bab379c01f69a49fd1d4e Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 24 Feb 2023 13:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=BF=87=E5=86=85=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=E5=92=8C=E4=BC=81=E4=B8=9A=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/workFlow/service/ActSarItemsBussEOService.java | 8 ++++++++ .../adc/da/workFlow/service/ActSarItemsEOService.java | 11 +++++++++++ .../controller/SarStandardsInfoController.java | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) 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 c1a52764..63dc0acd 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 @@ -5,6 +5,7 @@ import com.adc.da.common.BussEnum; import com.adc.da.common.SarConformStateEnum; import com.adc.da.common.SarStateColorEnum; import com.adc.da.common.SarTypeEnum; +import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.ResponseMessage; import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess; @@ -387,6 +388,13 @@ public class ActSarItemsBussEOService { sarBussionessStand.setSarStandAttrEOStr(resData); // 根据标准号判断数据是否已存在 //2021年4月9日 此处检查当前是否存在standId + 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("当前企标标准号和企标名称已存在"); + } String standCode = ""; if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){ standCode = sarBussionessStand.getStandCode(); diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 4b2c708d..05ae71e6 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -4,6 +4,8 @@ import com.adc.da.common.PropertyTypeEnum; import com.adc.da.common.SarConformStateEnum; import com.adc.da.common.SarStateColorEnum; import com.adc.da.common.SarTypeEnum; +import com.adc.da.exception.AdcDaBaseException; +import com.adc.da.http.Result; import com.adc.da.login.util.UserUtils; import com.adc.da.person.entity.PersonMsgEO; import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess; @@ -34,6 +36,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -189,6 +192,14 @@ public class ActSarItemsEOService { // attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarStandardsInfoEO.setSarStandAttrEOStr(resData); + + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName()) + .eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber()); + Integer s=sarStandardsInfoEOService.count(wrapper); + if (s>0){ + throw new AdcDaBaseException("当前标准编号和中文名称已存在"); + } // 根据标准号判断数据是否已存在 //2021年4月9日 此处检查当前是否存在standId String standnumber = ""; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 121a91c8..60d0855c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -902,7 +902,7 @@ public class SarStandardsInfoController extends BaseController .eq(null!=page.getStandYear(),"STAND_YEAR",page.getStandYear()).eq("VALID_FLAG", 0); Integer s=sarStandardsInfoEOService.count(wrapper); if (s>0){ - return Result.error(); + return Result.error("当前标准编号已存在"); }else { return Result.success(); }