From 9369c32a283542966344a243999076409343dd4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Mon, 27 Sep 2021 17:53:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayWorkingGroupServiceImpl.java      | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
index 59d78c2f..2efa15d2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
@@ -25,8 +25,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 
@@ -115,8 +119,35 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
         if(Objects.isNull(payWorkingGroupOld)){
             throw new JeroBootException("工作组不存在！");
         }
+        String str = payWorkingGroupOld.getWorkingGroupProject() + "-副本";
+        LambdaQueryWrapper<PayWorkingGroup> queryPayWorkingGroup = new LambdaQueryWrapper<>();
+        queryPayWorkingGroup.like(PayWorkingGroup::getWorkingGroupProject,str);
+        List<PayWorkingGroup> listPayWorkingGroup = payWorkingGroupService.list(queryPayWorkingGroup);
+        if(!CollectionUtils.isEmpty(listPayWorkingGroup)){
+            String rex = "^[0-9]*[1-9][0-9]*$";
+            List<Integer> list = new ArrayList<>();
+            String finalStr = str;
+            listPayWorkingGroup.forEach(p->{
+                String project = p.getWorkingGroupProject();
+                if(!StringUtils.isEmpty(project) && !Objects.equals(p.getId(),payWorkingGroupOld.getId())){
+                    String projectNew = project.substring(finalStr.length());
+                    Pattern pa = Pattern.compile(rex);
+                    Matcher m = pa.matcher(projectNew);
+                    if (m.find()){
+                        list.add(Integer.parseInt(projectNew));
+                    }
+                }
+            });
+            if(!CollectionUtils.isEmpty(list)){
+                int m = list.stream().max(Comparator.comparing(Integer::intValue)).get();
+                str = str + (m + 1);
+            }
+        }else{
+            str = str + 1;
+        }
+
         payWorkingGroupOld.setId(null);
-        payWorkingGroupOld.setWorkingGroupProject(payWorkingGroupOld.getWorkingGroupProject() + "-副本");
+        payWorkingGroupOld.setWorkingGroupProject(str);
         payWorkingGroupOld.setCreateBy(null);
         payWorkingGroupOld.setCreateTime(null);
         payWorkingGroupOld.setUpdateBy(null);