From 973db3d9d601e538e2dca651fd16af53908faffb Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 10 八月 2023 13:28:35 +0800
Subject: [PATCH] 日历
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 3feb04c..d6ab9f7 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,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Optional;
import java.util.stream.Collectors;
import com.ruoyi.common.utils.StringUtils;
@@ -54,7 +55,10 @@
@Override
public ArdAppTask selectArdAppTaskById(String id) {
ArdAppTask ardAppTask = ardAppTaskMapper.selectArdAppTaskById(id);
-
+ if(StringUtils.isNull(ardAppTask))
+ {
+ return null;
+ }
List<ArdAppTaskDetail> ardAppTaskDetailList = ardAppTask.getArdAppTaskDetailList();
if(ardAppTaskDetailList.size()>0)
{
@@ -97,7 +101,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;
}
/**
@@ -115,6 +133,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