From c8cc7ec5d9e051f03c7f97df81867f5b5e5391fb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 七月 2025 21:39:21 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
index 1ed32fe..af215ce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
@@ -72,6 +72,8 @@
@Resource
private TDeptService deptService;
@Resource
+ private TTemplateCountService templateCountService;
+ @Resource
private ISysUserService sysUserService;
@Resource
private TDictDataService dictDataService;
@@ -167,6 +169,12 @@
TTemplate tTemplate = templates.stream().filter(e -> e.getId().equals(record.getTemplateId())).findFirst().orElse(null);
record.setNum1(1);
if(Objects.nonNull(tTemplate)){
+ TTemplateCount templateCount = templateCountService.lambdaQuery().eq(TTemplateCount::getUserId, record.getUserId())
+ .eq(TTemplateCount::getTemplateId, tTemplate.getId())
+ .orderByDesc(TTemplateCount::getCreateTime).last("limit 1").one();
+ if (templateCount!=null){
+ record.setNum1(templateCount.getTaskCount());
+ }
// todo 应生成计划数
LocalDateTime createTime = tTemplate.getCreateTime();
// 转化为yyyy-MM-dd字符串
--
Gitblit v1.7.1