From cf746a1b31ddd2b2b4232c5ce9dd304a2d5c2c46 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 02 八月 2023 10:32:53 +0800
Subject: [PATCH] 单兵端-新任务轮询异常修复
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 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 a6b4d80..0832eee 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
@@ -16,6 +16,8 @@
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;
@@ -53,6 +55,15 @@
@Override
public ArdAppTask selectArdAppTaskById(String 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);
@@ -87,7 +98,21 @@
*/
@Override
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;
}
/**
@@ -105,6 +130,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;
}
--
Gitblit v1.9.3