From a9f31a85a3092a1fb7495f6ad0773f4f82d79693 Mon Sep 17 00:00:00 2001
From: liux <963924687@qq.com>
Date: Wed, 12 Feb 2025 15:06:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2git=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/project/domain/SubPerson.java   |  5 ++++
 .../project/service/impl/SubServiceImpl.java  | 24 ++++++++++++++++++-
 .../resources/mapper/system/SubMapper.xml     |  6 +++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java
index 248ba23..d3c2278 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java
@@ -151,4 +151,9 @@ public class SubPerson extends BaseBean implements Serializable {
     private String annotation = "0";
     private String isExistFile;
 
+    private List<String> userList;
+    private String taskType;
+
+
+
 }
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java
index a596930..26c84c3 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java
@@ -23,7 +23,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -126,10 +128,28 @@ public class SubServiceImpl implements SubService {
      */
     @Override
     public List<SubPerson> enterPersonList(SubPerson bean) {
+        long startTime = System.currentTimeMillis();
+        RequestEntity entity = new RequestEntity();
+        entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
+        AjaxResult ajaxResult = flowTaskService.getStayFlow(entity);
+        List<String> stringList = new ArrayList<>();
+        if (ajaxResult.isSuccess() ) {
+            List<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
+            if (data != null && !data.isEmpty()) {
+                if (data != null && !data.isEmpty()) {
+                    stringList = data.stream()
+                            .map(map -> (String) map.get("proInsId"))
+                            .collect(Collectors.toList());
+                }
+            }
+
+        }
+        bean.setUserList(stringList);
 
         List<SubPerson> list = mapper.enterPersonList(bean);
 
-        RequestEntity entity = new RequestEntity();
+          System.err.println("stringList="+stringList);
+      //  RequestEntity entity = new RequestEntity();
         entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
         // 创建一个 GenericProcessor 实例 对审批流程数据进行处理
         GenericProcessor processor = new GenericProcessor();
@@ -139,6 +159,8 @@ public class SubServiceImpl implements SubService {
                     .filter(subPerson -> bean.getStatus().equals(subPerson.getIntoStatus()))
                     .collect(Collectors.toList());
         }
+        long endTime = System.currentTimeMillis();
+        System.err.println("耗时："+(endTime-startTime));
         return list;
     }
 
diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/SubMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/SubMapper.xml
index 0ad9342..bc20bce 100644
--- a/bonus-modules/bonus-project/src/main/resources/mapper/system/SubMapper.xml
+++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/SubMapper.xml
@@ -120,6 +120,12 @@
                 and lcp.out_status = #{status}
             </if>
         </if>
+        <if test="userList != null and userList !='' ">
+            and lcp.proc_inst_id in
+            <foreach collection="userList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="checkIsExistPersonName" resultType="com.bonus.system.api.domain.SysUser">
         SELECT user_id as userId,