From 2fee40486f9473398be3c293e8311d45bd53adc9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 七月 2025 20:47:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java
index e4e726b..65f2fce 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java
@@ -20,6 +20,7 @@
import com.ruoyi.system.vo.system.TaskListVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
@@ -163,16 +164,36 @@
List<TDept> deptList = deptMapper.selectList(Wrappers.lambdaQuery(TDept.class));
List<TProjectDept> projectDeptList = projectDeptMapper.selectList(Wrappers.lambdaQuery(TProjectDept.class));
+ if(CollectionUtils.isEmpty(list)){
+ return pageInfo;
+ }
+
+ List<String> taskIds = list.stream().map(TLocationTaskListVO::getId).collect(Collectors.toList());
+ List<TTaskDetail> taskDetails = taskDetailMapper.selectList(Wrappers.lambdaQuery(TTaskDetail.class)
+ .in(TTaskDetail::getTaskId,taskIds)
+ .orderByDesc(BaseModel::getCreateTime));
+
for (TLocationTaskListVO tLocationTaskListVO : list) {
if(tLocationTaskListVO.getDeptType()==1){
projectDeptList.stream().filter(e -> e.getId().equals(tLocationTaskListVO.getDeptId())).findFirst().ifPresent(e -> {
- tLocationTaskListVO.setDeptName(e.getProjectName());
+ if("0".equals(e.getParentId())){
+ tLocationTaskListVO.setDeptName(e.getProjectName());
+ }else {
+ projectDeptList.stream().filter(ee -> ee.getId().equals(e.getParentId())).findFirst().ifPresent(ee -> {
+ tLocationTaskListVO.setDeptName(ee.getProjectName());
+ });
+ }
});
}else {
deptList.stream().filter(e -> e.getId().equals(tLocationTaskListVO.getDeptId())).findFirst().ifPresent(e -> {
tLocationTaskListVO.setDeptName(e.getDeptName());
});
}
+
+ taskDetails.stream().filter(e -> e.getTaskId().equals(tLocationTaskListVO.getId())).findFirst().ifPresent(e -> {
+ tLocationTaskListVO.setClearStatus(e.getClearStatus());
+ });
+
}
pageInfo.setRecords(list);
return pageInfo;
--
Gitblit v1.7.1