From 6605af34249a6fec0b3967698dcc53ae366d781c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 14 七月 2025 16:56:49 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectorServiceImpl.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 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 427fc44..d5ca49d 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
@@ -44,9 +44,7 @@
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);
@@ -61,19 +59,19 @@
}
}else{
- TProjectDept tProjectDept = projectDeptMapper.selectById(tTask.getPatrolInspectorDept());
- if (tProjectDept!=null){
- taskListVO.setDeptName(tProjectDept.getProjectName());
-
+ TProjectDept tProjectDept = projectDeptMapper.selectById(sysUser.getDeptId());
+ if (tProjectDept != null) {
+ if (!tProjectDept.getParentId().equals("0")) {
+ TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
+ if (tProjectDept1 != null) {
+ taskListVO.setDeptName(tProjectDept1.getProjectName() + ">" + tProjectDept.getProjectName());
+ }
+ } else {
+ 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);
--
Gitblit v1.7.1