From 083c414ff683ab12e65069c6c0ba6871ed1ed09f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 10:19:09 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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..3e8c4ab 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
@@ -7,6 +7,7 @@
import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.applet.dto.IndexDTO;
import com.ruoyi.system.applet.query.TaskUserListQuery;
import com.ruoyi.system.applet.vo.TaskUserListVO;
import com.ruoyi.system.mapper.*;
@@ -20,6 +21,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;
@@ -60,7 +62,6 @@
}
List<TTaskDetail> taskDetails = taskDetailMapper.selectList(Wrappers.lambdaQuery(TTaskDetail.class)
.in(TTaskDetail::getTaskId, collect)
- .eq(TTaskDetail::getClearStatus, 2)
.eq(TTaskDetail::getHandleType,1)
.orderByDesc(TTaskDetail::getCreateTime));
taskDetails = new ArrayList<>(taskDetails.stream()
@@ -163,20 +164,45 @@
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;
}
+ @Override
+ public List<TTask> indexTask(IndexDTO dto) {
+ return this.baseMapper.indexTask(dto);
+ }
+
}
--
Gitblit v1.7.1