From 1cc2a9e3f324fce0a1f4667c7f531ad4e49b42a3 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Wed, 12 Apr 2023 10:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BC=81=E6=A0=87=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=B1=BB=E5=88=AB=E5=92=8C=E6=A0=87=E5=87=86=E5=8F=B7?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E9=97=AE=E9=A2=98=E5=92=8C=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarBussionessStandController.java         | 37 ++++++++++++++++---
 .../entity/SarBussionessStandEOPage.java      | 10 +++++
 2 files changed, 41 insertions(+), 6 deletions(-)

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 cd8ce7c4..3198eeea 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
@@ -207,11 +207,11 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
         if (StringUtils.isNotEmpty(page.getStandCode()) && StringUtils.isNotEmpty(page.getStandSort())) {
             String standnumber = "";
             if(StringUtils.isNotEmpty(page.getStandYear()) && !"null".equals(page.getStandYear())){
-                standnumber = page.getStandSort() + " " + page.getStandCode() + "-" + page.getStandYear();
-                standNumShow = sortName + " " + page.getStandCode() + "-" + page.getStandYear();
+                standnumber = page.getStandSort() + page.getStandNumber() + "-" + page.getStandYear();
+                standNumShow = sortName + page.getStandNumber() + "-" + page.getStandYear();
             } else {
-                standnumber = page.getStandSort() + " " + page.getStandCode();
-                standNumShow = sortName + " " + page.getStandCode();
+                standnumber = page.getStandSort() + page.getStandNumber();
+                standNumShow = sortName + page.getStandNumber();
             }
             List<SarBussionessStand> standlist = sarBussionessStandEOService.selectStandardsByStandNumber(standnumber);
             if (standlist.size() > 0) {
@@ -221,7 +221,19 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
                         if (standlist.get(i).getId().equals(page.getId())) {
                             continue;
                         } else {
-                            return Result.error(standNumShow + "标准号已存在");
+                            QueryWrapper<SarBussionessStand> queryWrapper = new QueryWrapper<>();
+                            queryWrapper.eq(null!=standnumber,"STAND_CODE",standnumber)
+                                    .eq(null!=page.getStandName(),"STAND_NAME",page.getStandName());
+                            List<SarBussionessStand> list = sarBussionessStandEOService.list(queryWrapper);
+                            Integer valIdFlag = 0;
+                            for (SarBussionessStand stand :list){
+                                if ((list.size() >=1 && !stand.getId().equals(page.getId()))){
+                                    valIdFlag = stand.getValidFlag();
+                                    if (valIdFlag == 0){
+                                        return Result.error("企标编号("+ standnumber +")或企标名称("+ page.getStandName() +")已存在");
+                                    }
+                                }
+                            }
                         }
                     }
                     return Result.success();
@@ -229,11 +241,24 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
                     return Result.error(standNumShow + "标准号已存在");
                 }
             } else {
-                return Result.success();
+                QueryWrapper<SarBussionessStand> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq(null!=standnumber,"STAND_CODE",standnumber)
+                        .eq(null!=page.getStandName(),"STAND_NAME",page.getStandName());
+                List<SarBussionessStand> list = sarBussionessStandEOService.list(queryWrapper);
+                Integer valIdFlag = 0;
+                for (SarBussionessStand stand :list){
+                    if ((list.size() >=1 && !stand.getId().equals(page.getId()))){
+                        valIdFlag = stand.getValidFlag();
+                        if (valIdFlag == 0){
+                            return Result.error("企标编号("+ standnumber +")或企标名称("+ page.getStandName() +")已存在");
+                        }
+                    }
+                }
             }
         } else {
             return Result.success();
         }
+        return Result.success();
     }
 
     /**
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java
index d2cc26c9..b9a18752 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java
@@ -14,6 +14,16 @@ import java.util.List;
  */
 public class SarBussionessStandEOPage extends BasePage {
 
+    private String standNumber;
+
+    public String getStandNumber() {
+        return standNumber;
+    }
+
+    public void setStandNumber(String standNumber) {
+        this.standNumber = standNumber;
+    }
+
     private String textStatusBuss;
 
     private String reviseStatus;