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/TTaskServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskServiceImpl.java
index 6415ad5..8513988 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskServiceImpl.java
@@ -1,10 +1,27 @@
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.TTaskDetailMapper;
import com.ruoyi.system.mapper.TTaskMapper;
-import com.ruoyi.system.model.TTask;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.LocationListTaskQuery;
+import com.ruoyi.system.query.TaskListQuery;
import com.ruoyi.system.service.TTaskService;
+import com.ruoyi.system.vo.system.LocationListTaskVO;
+import com.ruoyi.system.vo.system.LocationListVO;
+import com.ruoyi.system.vo.system.LocationTypeListVO;
+import com.ruoyi.system.vo.system.TaskListVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.sql.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
/**
* <p>
@@ -17,4 +34,30 @@
@Service
public class TTaskServiceImpl extends ServiceImpl<TTaskMapper, TTask> implements TTaskService {
+
+ @Autowired
+ private TDeptMapper deptMapper;
+ @Autowired
+ private TTaskDetailMapper taskDetailMapper;
+ @Override
+ public PageInfo<TaskListVO> pageList(TaskListQuery query) {
+ PageInfo<TaskListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TaskListVO> list = this.baseMapper.pageList(query,pageInfo);
+
+ List<TTaskDetail> tTaskDetails = taskDetailMapper.selectList(new LambdaQueryWrapper<TTaskDetail>()
+ .orderByDesc(BaseModel::getCreateTime)
+ .in(TTaskDetail::getHandleType,Arrays.asList(1,4)));
+
+ for (TaskListVO taskListVO : list) {
+ TDept tDept = deptMapper.selectById(taskListVO.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