From b2e3d6532dbbb3929e01a598dcef7eb07f39b826 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 七月 2025 09:30:27 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java | 91 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 81 insertions(+), 10 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 e80a829..ae738b2 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,21 +1,26 @@
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;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.applet.query.TaskUserListQuery;
import com.ruoyi.system.applet.vo.TaskUserListVO;
-import com.ruoyi.system.mapper.TDeptMapper;
-import com.ruoyi.system.mapper.TTaskDetailMapper;
-import com.ruoyi.system.mapper.TTaskMapper;
+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.StringUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -38,6 +43,11 @@
private TDeptMapper deptMapper;
@Autowired
private TTaskDetailMapper taskDetailMapper;
+ @Autowired
+ private SysUserMapper sysUserMapper;
+ @Autowired
+ private TProjectDeptMapper projectDeptMapper;
+
@Override
public PageInfo<TaskListVO> pageList(TaskListQuery query) {
PageInfo<TaskListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
@@ -47,13 +57,29 @@
.orderByDesc(BaseModel::getCreateTime)
.in(TTaskDetail::getHandleType,Arrays.asList(1,4)));
- for (TaskListVO taskListVO : list) {
- TDept tDept = deptMapper.selectById(taskListVO.getPatrolInspectorDept());
- taskListVO.setDeptName(tDept.getDeptName());
- TTaskDetail tTaskDetail = tTaskDetails.stream().filter(e -> e.getTaskId().equals(taskListVO.getId())).findFirst().orElse(null);
+ for (TaskListVO temp : list) {
+ SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(temp.getPatrolInspector()));
+ if(sysUser!=null){
+ if ( sysUser.getDeptType() == 1){
+ TProjectDept tProjectDept = projectDeptMapper.selectById(sysUser.getDeptId());
+ if (!tProjectDept.getParentId().equals("0")){
+ TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
+ temp.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
+ }else{
+ temp.setDeptName(tProjectDept.getProjectName());
+ }
+ }else{
+ TDept tDept = deptMapper.selectById(sysUser.getDeptId());
+ if (tDept != null){
+ temp.setDeptName(tDept.getDeptName());
+
+ }
+ }
+ }
+ TTaskDetail tTaskDetail = tTaskDetails.stream().filter(e -> e.getTaskId().equals(temp.getId())).findFirst().orElse(null);
if (tTaskDetail!=null){
- taskListVO.setPicture(tTaskDetail.getPicture());
- taskListVO.setClearStatus(tTaskDetail.getClearStatus());
+ temp.setPicture(tTaskDetail.getPicture());
+ temp.setClearStatus(tTaskDetail.getClearStatus());
}
}
pageInfo.setRecords(list);
@@ -65,7 +91,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;
@@ -92,4 +123,44 @@
}
return list;
}
+
+ @Override
+ public PageInfo<ProgressListVO> taskProgress(TaskProgressQuery query) {
+ PageInfo<ProgressListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<ProgressListVO> list = this.baseMapper.taskProgress(query,pageInfo);
+ pageInfo.setRecords(list);
+ 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));
+
+ for (TLocationTaskListVO tLocationTaskListVO : list) {
+ if(tLocationTaskListVO.getDeptType()==1){
+ projectDeptList.stream().filter(e -> e.getId().equals(tLocationTaskListVO.getDeptId())).findFirst().ifPresent(e -> {
+ tLocationTaskListVO.setDeptName(e.getProjectName());
+ });
+ }else {
+ deptList.stream().filter(e -> e.getId().equals(tLocationTaskListVO.getDeptId())).findFirst().ifPresent(e -> {
+ tLocationTaskListVO.setDeptName(e.getDeptName());
+ });
+ }
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+
}
--
Gitblit v1.7.1