From 671db291656c3927ef58bbbdfb245746c63cec3e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 21 六月 2025 09:34:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java
index e7a8933..e80a829 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BaseModel;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.applet.query.TaskUserListQuery;
import com.ruoyi.system.applet.vo.TaskUserListVO;
import com.ruoyi.system.mapper.TDeptMapper;
@@ -69,4 +70,26 @@
pageInfo.setRecords(list);
return pageInfo;
}
+
+ @Override
+ public List<TaskListVO> exportList(TaskListQuery query) {
+ List<TaskListVO> list = this.baseMapper.exportList(query);
+
+ 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());
+ taskListVO.setFinishTimeStr(DateUtils.localDateTimeToString(tTaskDetail.getCreateTime()));
+ taskListVO.setRemark(tTaskDetail.getRemark());
+ }
+ }
+ return list;
+ }
}
--
Gitblit v1.7.1