From 87334a83dcea88059dd41281e9150f8934844669 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 24 May 2022 11:35:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=BC=96=E5=8F=B7=E9=AA=8C=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 88ebd0a3f..4dde91114 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -1459,7 +1459,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @param map
      */
     public void addInfo(Map<String, Object> map) {
+        String cut = (String) map.get("cut");
+
         try {
+            String serialNumber = (String)map.get("serial_number");
+            //编码验重
+            List<BussDocumentLibraryEO> list = this.list();
+            if(list.size() != 0){
+                List<String> serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
+                if(serialNumberList.contains(serialNumber)){
+                    throw new JeroBootException("编号已存在不能重复添加");
+                }
+            }
+
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             String issueTime = (String) map.get("issue_time");
             Date issueTimeDate = df.parse(issueTime);
@@ -1524,7 +1536,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 //            }
 //        }
         //代替标准不为空,需要向被替代标准的法规工程师发送站内通知和飞书信息，提醒内容："新标准编号"已实施，请注意更新“替代标准编号”状态
-        String cut = (String) map.get("cut");
         map.remove("cut");
         //获取搜索中心字段
         List<OnlCgformField> searchFieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(e.getIsShowSearch())).collect(Collectors.toList());
@@ -1988,6 +1999,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @param map
      */
     public void updateInfo(Map<String, Object> map) {
+        String cut = (String) map.get("cut");
+        List<BussDocumentLibraryEO> list = this.list();
+        List<String> serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
+        String serialNumber = (String)map.get("serial_number");
+        String id = (String) map.get("id");
+        //通过id查询数据
+        List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
+        if(dataList.size() != 0){
+            String serialNumberTemp = (String)dataList.get(0).get("serial_number");
+            if(!serialNumberTemp.equals(serialNumber) && serialNumberList.contains(serialNumber)){
+                throw new JeroBootException("编号已存在不能重复添加");
+            }
+        }
+
         try {
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             String issueTime = (String) map.get("issue_time");
@@ -2031,7 +2056,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 //                }
 //            }
 //        }
-        String cut = (String) map.get("cut");
+
         map.remove("cut");
         //获取搜索中心字段
         List<OnlCgformField> searchFieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(e.getIsShowSearch())).collect(Collectors.toList());
@@ -2047,9 +2072,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 .filter(e -> FieldTypeEnum.PULL_SINGLE.getValue().equals(e.getFieldShowType())
                         || FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
 
-        String id = (String) map.get("id");
-        //通过id查询数据
-        List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
+
 
         Map<String, Object> mapTemp = new HashMap<>();
         mapCopy(map, mapTemp);