From 165e73d176191ae75b57c70e049c0cfd552bbdfa Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 七月 2025 21:27:37 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectorServiceImpl.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 102 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectorServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectorServiceImpl.java
index 20953f8..e1fb35e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectorServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectorServiceImpl.java
@@ -1,10 +1,21 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.mapper.TInspectorMapper;
-import com.ruoyi.system.model.TInspector;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.BaseModel;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.mapper.*;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.InsepectorListQuery;
import com.ruoyi.system.service.TInspectorService;
+import com.ruoyi.system.vo.system.InspectorListVO;
+import com.ruoyi.system.vo.system.TaskListVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
/**
* <p>
@@ -17,4 +28,93 @@
@Service
public class TInspectorServiceImpl extends ServiceImpl<TInspectorMapper, TInspector> implements TInspectorService {
+ @Autowired
+ private TDeptMapper deptMapper;
+ @Autowired
+ private TProjectDeptMapper projectDeptMapper;
+ @Autowired
+ private TTaskDetailMapper taskDetailMapper;
+ @Autowired
+ private TTaskMapper taskMapper;
+ @Autowired
+ private SysUserMapper sysUserMapper;
+ @Override
+ public PageInfo<InspectorListVO> pageList(InsepectorListQuery query) {
+ List<SysUser> sysUsers = sysUserMapper.selectAllList();
+ PageInfo<InspectorListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<InspectorListVO> list = this.baseMapper.pageList(query,pageInfo);
+
+ List<TTaskDetail> tTaskDetails = taskDetailMapper.selectList(new LambdaQueryWrapper<TTaskDetail>()
+ .orderByDesc(BaseModel::getCreateTime)
+ .in(TTaskDetail::getHandleType, Arrays.asList(1,4)));
+ List<TTask> tTasks = taskMapper.selectList(null);
+ for (InspectorListVO taskListVO : list) {
+ TTask tTask = tTasks.stream().filter(e -> e.getId().equals(taskListVO.getTaskId())).findFirst().orElse(null);
+ if (tTask!=null){
+ SysUser sysUser = sysUsers.stream().filter(e -> e.getUserId().equals(Long.valueOf(tTask.getPatrolInspector()))).findFirst().orElse(null);
+ if (sysUser!=null){
+ if (sysUser.getDeptType()==2){
+ TDept tDept = deptMapper.selectById(tTask.getPatrolInspectorDept());
+ if (tDept!=null){
+ taskListVO.setDeptName(tDept.getDeptName());
+ }
+
+ }else{
+ TProjectDept tProjectDept = projectDeptMapper.selectById(tTask.getPatrolInspectorDept());
+ if (tProjectDept!=null){
+ taskListVO.setDeptName(tProjectDept.getProjectName());
+
+ }
+ }
+ }
+ TTaskDetail tTaskDetail = tTaskDetails.stream().filter(e -> e.getTaskId().equals(taskListVO.getId())).findFirst().orElse(null);
+ if (tTaskDetail!=null){
+ taskListVO.setPicture(tTaskDetail.getPicture());
+ taskListVO.setClearStatus(tTaskDetail.getClearStatus());
+ }
+
+ }
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+ public List<InspectorListVO> pageListExport(InsepectorListQuery query) {
+ List<SysUser> sysUsers = sysUserMapper.selectAllList();
+ PageInfo<InspectorListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<InspectorListVO> list = this.baseMapper.pageListExport(query,pageInfo);
+
+ List<TTaskDetail> tTaskDetails = taskDetailMapper.selectList(new LambdaQueryWrapper<TTaskDetail>()
+ .orderByDesc(BaseModel::getCreateTime)
+ .in(TTaskDetail::getHandleType, Arrays.asList(1,4)));
+ List<TTask> tTasks = taskMapper.selectList(null);
+ for (InspectorListVO taskListVO : list) {
+ TTask tTask = tTasks.stream().filter(e -> e.getId().equals(taskListVO.getTaskId())).findFirst().orElse(null);
+ if (tTask!=null){
+ SysUser sysUser = sysUsers.stream().filter(e -> e.getUserId().equals(Long.valueOf(tTask.getPatrolInspector()))).findFirst().orElse(null);
+ if (sysUser!=null){
+ if (sysUser.getDeptType()==2){
+ TDept tDept = deptMapper.selectById(tTask.getPatrolInspectorDept());
+ if (tDept!=null){
+ taskListVO.setDeptName(tDept.getDeptName());
+ }
+
+ }else{
+ TProjectDept tProjectDept = projectDeptMapper.selectById(tTask.getPatrolInspectorDept());
+ if (tProjectDept!=null){
+ taskListVO.setDeptName(tProjectDept.getProjectName());
+
+ }
+ }
+ }
+ TTaskDetail tTaskDetail = tTaskDetails.stream().filter(e -> e.getTaskId().equals(taskListVO.getId())).findFirst().orElse(null);
+ if (tTaskDetail!=null){
+ taskListVO.setPicture(tTaskDetail.getPicture());
+ taskListVO.setClearStatus(tTaskDetail.getClearStatus());
+ }
+
+ }
+ }
+ pageInfo.setRecords(list);
+ return list;
+ }
}
--
Gitblit v1.7.1