From e73a23cfb7625b0f06e96c950920f41c8f7b6267 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 11 Oct 2024 15:21:01 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B=20=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessAnnualInitLinkService.java | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
index a4a575dc..51314a16 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
@@ -1,6 +1,7 @@
 package com.jero.modules.activiti.process.annualinit.service;
 
 import cn.hutool.core.collection.CollStreamUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
@@ -36,9 +37,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import java.io.IOException;
 import java.time.LocalDate;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -180,6 +179,7 @@ public class ProcessAnnualInitLinkService extends ServiceImpl<ProcessAnnualInitL
         Map<String, List<SysDepart>> sysDepartMap = departList.stream().collect(Collectors.groupingBy(SysDepart::getDepartName));
         Map<String, String> sysDepartPathMap = SysDepart.buildPaths(departList);
 
+        LinkedList<String> standardNumberList = new LinkedList<>();
         for (int i = 0; i < excelList.size(); i++) {
             StringBuilder msgSub = new StringBuilder();
             ProcessAnnualInitLinkExcelVO excelVO = excelList.get(i);
@@ -192,15 +192,25 @@ public class ProcessAnnualInitLinkService extends ServiceImpl<ProcessAnnualInitL
                 excelVO.setRevisionType(espRevisionTypeMap.get(revisionType));
             }
             String standardNumber = excelVO.getStandardNumber();
-            if (ProcessAnnualInitCommon.REVISE.equals(revisionType)){
+            if (ProcessAnnualInitCommon.REVISE.equals(excelVO.getRevisionType())){
                 if (StringUtils.isBlank(standardNumber)){
                     msgSub.append("第" + (i + 4) + "行" + "企标编号不能为空;");
-                }
-                LawsEnterpriseStandard lawsEnterpriseStandard = enterpriseStandardService.queryByStandardNumber(standardNumber);
-                if (lawsEnterpriseStandard != null){
-                    excelVO.setStandardId(lawsEnterpriseStandard.getId());
-                }else {
-                    msgSub.append("第" + (i + 4) + "行" + "企标编号不存在;");
+                }else
+                if (standardNumberList.contains(standardNumber)) {
+                    msgSub.append("第" + (i + 4) + "行" + "企标编号重复;");
+                } else {
+                    standardNumberList.add(standardNumber);
+                    LawsEnterpriseStandard lawsEnterpriseStandard = enterpriseStandardService.queryByStandardNumber(standardNumber);
+                    if (lawsEnterpriseStandard != null){
+                        excelVO.setStandardId(lawsEnterpriseStandard.getId());
+                        //使用当前年份的年代号
+                        String[] split = standardNumber.split("-");
+                        split[split.length-1] = String.valueOf(DateUtil.thisYear());
+                        String join = String.join("-", Arrays.asList(split));
+                        excelVO.setStandardNumber(join);
+                    }else {
+                        msgSub.append("第" + (i + 4) + "行" + "企标编号不存在;");
+                    }
                 }
             }
             String standardName = excelVO.getStandardName();