From 2dfb69e49f46d5bed89197a40c526abae5ee7315 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 七月 2025 21:27:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectorServiceImpl.java |   74 ++++++++++++++++++++++++++++++++-----
 1 files changed, 64 insertions(+), 10 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 ade0445..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
@@ -4,14 +4,9 @@
 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.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;
@@ -36,11 +31,16 @@
     @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);
 
@@ -51,16 +51,70 @@
         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());
+                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