From f770f08c09b6e622242a73550b31b273f92e3444 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 六月 2025 16:45:06 +0800
Subject: [PATCH] 保洁巡检本周代码

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectorServiceImpl.java |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 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..ade0445 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,26 @@
 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.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.BaseModel;
+import com.ruoyi.system.mapper.TDeptMapper;
 import com.ruoyi.system.mapper.TInspectorMapper;
+import com.ruoyi.system.mapper.TTaskDetailMapper;
+import com.ruoyi.system.mapper.TTaskMapper;
+import com.ruoyi.system.model.TDept;
 import com.ruoyi.system.model.TInspector;
+import com.ruoyi.system.model.TTask;
+import com.ruoyi.system.model.TTaskDetail;
+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 +33,34 @@
 @Service
 public class TInspectorServiceImpl extends ServiceImpl<TInspectorMapper, TInspector> implements TInspectorService {
 
+    @Autowired
+    private TDeptMapper deptMapper;
+    @Autowired
+    private TTaskDetailMapper taskDetailMapper;
+    @Autowired
+    private TTaskMapper taskMapper;
+    @Override
+    public PageInfo<InspectorListVO> pageList(InsepectorListQuery query) {
+        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){
+                TDept tDept = deptMapper.selectById(tTask.getPatrolInspectorDept());
+                taskListVO.setDeptName(tDept.getDeptName());
+                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;
+    }
 }

--
Gitblit v1.7.1