From 54b54315510eed85fb81211cd4f4df25414bdf9a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 11 七月 2025 20:44:48 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 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 2801899..0a8cf44 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
@@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BaseModel;
@@ -10,18 +11,23 @@
import com.ruoyi.system.applet.vo.TaskUserListVO;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.PointDetailQuery;
import com.ruoyi.system.query.TaskListQuery;
import com.ruoyi.system.query.TaskProgressQuery;
import com.ruoyi.system.service.TTaskCleanService;
import com.ruoyi.system.vo.system.ProgressListVO;
+import com.ruoyi.system.vo.system.TLocationTaskListVO;
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;
import java.math.RoundingMode;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -66,7 +72,10 @@
}
}else{
TDept tDept = deptMapper.selectById(sysUser.getDeptId());
- temp.setDeptName(tDept.getDeptName());
+ if (tDept != null){
+ temp.setDeptName(tDept.getDeptName());
+
+ }
}
}
TTaskDetail tTaskDetail = tTaskDetails.stream().filter(e -> e.getTaskId().equals(temp.getId())).findFirst().orElse(null);
@@ -84,7 +93,12 @@
PageInfo<TaskUserListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TaskUserListVO> list = this.baseMapper.pageListUser(query,pageInfo);
for (TaskUserListVO taskUserListVO : list) {
- taskUserListVO.setDistance(taskUserListVO.getDistance().divide(new BigDecimal("1000"),2, RoundingMode.HALF_UP));
+
+ 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);
return pageInfo;
@@ -120,5 +134,55 @@
return pageInfo;
}
+ @Override
+ public List<ProgressListVO> taskProgressExport(TaskProgressQuery query) {
+ List<ProgressListVO> list = this.baseMapper.taskProgressExport(query);
+
+ return list;
+ }
+
+ @Override
+ public PageInfo<TLocationTaskListVO> pointInspectionHeatDetailTaskList(PointDetailQuery query) {
+ PageInfo<TLocationTaskListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TLocationTaskListVO> list = this.baseMapper.pointInspectionHeatDetailTaskList(query,pageInfo);
+
+ 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 -> {
+ 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