From fecfd518d5d0ee1b9d597dc4b8a879141213438f Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Mon, 19 Jun 2023 09:15:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E'=E4=BC=81=E6=A0=87=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E8=8A=82=E7=82=B9=E5=AE=8C=E6=88=90=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=92=8C=E5=85=A5=E5=BA=93=E6=8E=A5=E5=8F=A3=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=89=8D=E5=85=88=E6=89=A7=E8=A1=8C=E6=A0=A1=E9=AA=8C=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=90=8D=E7=A7=B0=E6=A0=A1=E9=AA=8C'?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ActSarItemsBussEOService.java     | 22 -------------------
 .../SarBussionessStandController.java         | 21 ++++++++++++++++++
 2 files changed, 21 insertions(+), 22 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 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都不存在的情况
                 //  新增方法
-                QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
-                        .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
-                List<SarBussionessStand> 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);
-                // 根据标准号判断数据是否已存在
-//                QueryWrapper<SarBussionessStand>queryWrapper = 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..81d47852 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 BaseController<SarBussionessSt
     public ResponseMessage repeal(String id,String type){
         return sarBussionessStandEOService.repeal(id,type);
     }
+
+
+    @ApiOperation(value = "企业标准完成流程和入库前的校验")
+    @PostMapping("/ifStandCodebyStandName")
+    public ResponseMessage ifStandCodebyStandName(@RequestBody String standCode,String standName){
+        QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(standCode != null,"STAND_CODE",standCode)
+                .eq(standName != null,"STAND_NAME",standName);
+        List<SarBussionessStand> 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("校验通过");
+    }
 }