From 6a9685e29ff409516a1ad078eaacadaf73843f9b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 七月 2025 13:57:22 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectorServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 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 163c427..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
@@ -78,4 +78,43 @@
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