From 5e2d78f61bf7d1513d5d5c8cd55442133a6e898e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 14 七月 2025 18:23:36 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 insertions(+), 4 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..564c2d3 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()
@@ -105,16 +106,50 @@
@Override
public PageInfo<TaskUserListVO> pageListUser(TaskUserListQuery query) {
PageInfo<TaskUserListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- List<TaskUserListVO> list = this.baseMapper.pageListUser(query,pageInfo);
+ List<TaskUserListVO> list = this.baseMapper.pageListUser(query);
+ List<TTaskDetail> taskDetails = taskDetailMapper.selectList(Wrappers.lambdaQuery(TTaskDetail.class)
+ .eq(TTaskDetail::getHandleType,1)
+ .orderByDesc(TTaskDetail::getCreateTime));
+ taskDetails = new ArrayList<>(taskDetails.stream()
+ .collect(Collectors.groupingBy(
+ TTaskDetail::getTaskId,
+ Collectors.collectingAndThen(
+ Collectors.toList(),
+ listAll -> listAll.get(0)
+ )
+ ))
+ .values());
for (TaskUserListVO taskUserListVO : list) {
+ TTaskDetail tTaskDetail = taskDetails.stream().filter(e -> e.getTaskId().equals(taskUserListVO.getId()))
+ .findFirst().orElse(null);
+ if (tTaskDetail!=null){
+ if (tTaskDetail.getClearStatus()==1){
+ taskUserListVO.setStatus(5);
+ }else{
+ taskUserListVO.setStatus(4);
+
+ }
+ }
if (taskUserListVO.getDistance()!=null){
taskUserListVO.setDistance(taskUserListVO.getDistance().divide(new BigDecimal("1000"),2, RoundingMode.HALF_DOWN));
}else{
taskUserListVO.setDistance(new BigDecimal("0"));
}
}
- pageInfo.setRecords(list);
+ List<TaskUserListVO> res = new ArrayList<>();
+ if (query.getClearStatus()!=null){
+ for (TaskUserListVO taskUserListVO : list) {
+ if (taskUserListVO.getClearStatus().equals(query.getClearStatus())){
+ res.add(taskUserListVO);
+ }
+ }
+ pageInfo.setRecords(res);
+ pageInfo.setTotal(res.size());
+ }else{
+ pageInfo.setRecords(list);
+ pageInfo.setTotal(list.size());
+ }
return pageInfo;
}
@@ -163,20 +198,50 @@
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);
+ }
+
+ @Override
+ public List<TTask> getTaskByIds(List<String> collect1,String lon,String lat) {
+ return this.baseMapper.getTaskByIds(collect1,lon,lat);
+ }
+
}
--
Gitblit v1.7.1