From 84b4c86b36e38557da72cc0b8892cb557bf10c2e Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Fri, 4 Aug 2023 11:20:47 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=A5=E5=BF=97=EF=BC=8C=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ActSarItemsBussEOService.java     |  3 +-
 .../SarBussionessStandController.java         | 28 +++++++++++++------
 2 files changed, 21 insertions(+), 10 deletions(-)

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 dcd7a327..bc6d120a 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
@@ -332,13 +332,14 @@ public class ActSarItemsBussEOService {
     }
 
     /***
-     * @Description: 国内外标准流程入库"
+     * @Description: 企业标准流程入库"
      * @Date: 2020/12/7 13:48
      * @Param: [standJson]
      * @Return: void
      */
     public String processCreateBuss(String standJson) throws Exception{
         Map<String,Object> standMap = new HashMap();
+        logger.info("企标入库JSON单：{}",standJson);
         standMap = JSONObject.parseObject(standJson);
         String bussId = "";
         if (standMap != null && !standMap.isEmpty()) {
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 f2a7dca8..4908cecf 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
@@ -739,19 +739,29 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
     @ApiOperation(value = "企标发布节点完成任务和入库接口执行前先执行校验编号和名称校验")
     @PostMapping("/ifStandCodebyStandName")
     public ResponseMessage ifStandCodebyStandName(String standCode,String standName){
+        if (StringUtils.isBlank(standCode) || StringUtils.isBlank(standName)) {
+            return Result.error("企标编号或企标名称不能为空");
+        }
         QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(standCode != null,"STAND_CODE",standCode)
-                .eq(standName != null,"STAND_NAME",standName);
+        queryWrapper.eq("STAND_CODE",standCode).eq("VALID_FLAG","0");
         List<SarBussionessStand> list = sarBussionessStandEOService.list(queryWrapper);
-        Integer valIdFlag = 0;
+        if (list == null || list.isEmpty()){
+            return Result.success("校验通过");
+        }
         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 +"已存在");
-                }
+            if (standName.equals(stand.getStandName())){
+                logger.info("企标标准号"+ standCode +"和企标名称"+ standName +"已存在");
+                return Result.error("企标标准号"+ standCode +"和企标名称"+ standName +"已存在");
             }
+            logger.info("企标标准号" + standCode + "已存在");
+            return Result.error("企标标准号" + standCode + "已存在");
+//            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("校验通过");
     }