From a5d3da1c7d435a2c76c022b818bce220cec58681 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 02 八月 2023 10:06:38 +0800
Subject: [PATCH] 指挥端-历史任务查询接口增加按app用户id过滤

---
 ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
index bbb8127..ab08add 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
@@ -9,11 +9,15 @@
 import com.ruoyi.app.tasktext.domain.ArdAppTaskText;
 import com.ruoyi.app.tasktext.mapper.ArdAppTaskTextMapper;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -39,6 +43,8 @@
     private ArdAppTaskMapper ardAppTaskMapper;
     @Resource
     private ArdAppTaskTextMapper ardAppTaskTextMapper;
+    @Resource
+    private SysUserMapper sysUserMapper;
 
     /**
      * 鏌ヨapp浠诲姟绠＄悊
@@ -48,7 +54,28 @@
      */
     @Override
     public ArdAppTask selectArdAppTaskById(String id) {
-        return ardAppTaskMapper.selectArdAppTaskById(id);
+        ArdAppTask ardAppTask = ardAppTaskMapper.selectArdAppTaskById(id);
+
+        List<ArdAppTaskDetail> ardAppTaskDetailList = ardAppTask.getArdAppTaskDetailList();
+        if(ardAppTaskDetailList.size()>0)
+        {
+            ardAppTaskDetailList = ardAppTaskDetailList.stream()
+                    .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new java.util.TreeSet<>(java.util.Comparator.comparing(ArdAppTaskDetail::getName))), ArrayList::new));
+            ardAppTask.setArdAppTaskDetailList(ardAppTaskDetailList);
+        }
+
+        List<String> userIds = ardAppTaskMapper.selectArdAppTaskDetailUserIdsByTaskId(id);
+        if (userIds.size() > 0) {
+            ardAppTask.setUserIds(userIds);
+            List<SysUser> sysUserList=new ArrayList<>();
+            for (String userId : userIds) {
+                SysUser sysUser = sysUserMapper.selectUserById(userId);
+                sysUserList.add(sysUser);
+            }
+            ardAppTask.setSysUserList(sysUserList);
+
+        }
+        return ardAppTask;
     }
 
     @Override
@@ -70,9 +97,23 @@
      * @return app浠诲姟绠＄悊
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
     public List<ArdAppTask> selectArdAppTaskList(ArdAppTask ardAppTask) {
-        return ardAppTaskMapper.selectArdAppTaskList(ardAppTask);
+        List<ArdAppTask> parentList = ardAppTaskMapper.selectArdAppTaskList(ardAppTask);
+
+        //
+        if(StringUtils.isNotNull(ardAppTask.getAppUserId())) {
+            //濡傛灉app鐢ㄦ埛id涓嶄负绌�,鏌ヨ鍑烘墍鏈変换鍔＄殑瀛愪换鍔″垪琛�
+            for(ArdAppTask appTask:parentList)
+            {
+                List<ArdAppTaskDetail> ardAppTaskDetails = ardAppTaskMapper.selectArdAppTaskDetailListByTaskId(appTask.getId());
+                appTask.setArdAppTaskDetailList(ardAppTaskDetails);
+            }
+            //閫氳繃app鐢ㄦ埛id杩囨护瀛愪换鍔″垪琛ㄦ潵杩囨护鍑虹埗浠诲姟鍒楄〃
+           parentList = parentList.stream()
+                    .filter(parent -> parent.getArdAppTaskDetailList().stream().anyMatch(child -> child.getUserId().equals(ardAppTask.getAppUserId())))
+                    .collect(Collectors.toList());
+        }
+        return parentList;
     }
 
     /**
@@ -90,6 +131,12 @@
     @Override
     public List<ArdAppTask> selectArdAppTaskListWithDetailById(ArdAppTask ardAppTask) {
         List<ArdAppTask> list = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
+        for(ArdAppTaskDetail detail : list.get(0).getArdAppTaskDetailList()) {
+            ArdAppTaskDetailPic ardAppTaskDetailPic =new ArdAppTaskDetailPic();
+            ardAppTaskDetailPic.setTaskDetailId(detail.getId());
+            List<ArdAppTaskDetailPic> ardAppTaskDetailPicList = ardAppTaskDetailPicMapper.selectArdAppTaskDetailPicList(ardAppTaskDetailPic);
+            detail.setArdAppTaskDetailPic(ardAppTaskDetailPicList);
+        }
         return list;
     }
 
@@ -278,7 +325,7 @@
     @Override
     public ArdAppTask selectNewArdAppTaskByUserId(String userId) {
         ArdAppTask ardAppTask = ardAppTaskMapper.selectNewArdAppTaskByUserId(userId);
-        if(StringUtils.isNotNull(ardAppTask)) {
+        if (StringUtils.isNotNull(ardAppTask)) {
             ArdAppTaskDetail detail = new ArdAppTaskDetail();
             detail.setViewFlag("1");
             detail.setTaskId(ardAppTask.getId());
@@ -286,6 +333,7 @@
         }
         return ardAppTask;
     }
+
     /**
      * 鏌ヨ宸插脊绐椾絾鏈鐨勪换鍔℃暟閲�
      *
@@ -293,8 +341,7 @@
      * @return 缁撴灉
      */
     @Override
-    public int selectUnreadArdAppTaskCount(String userId)
-    {
+    public int selectUnreadArdAppTaskCount(String userId) {
         return ardAppTaskMapper.selectUnreadArdAppTaskCount(userId);
     }
 }

--
Gitblit v1.9.3