From a820ec5dc1682ac0a31fcbdba3eb4d2c0fe74b64 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 17:11:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/impl/UserEventLogServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/UserEventLogServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/UserEventLogServiceImpl.java
index e4e8346..5819b72 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/UserEventLogServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/UserEventLogServiceImpl.java
@@ -40,10 +40,10 @@
@Override
- public List<Integer> selectMothCount() {
+ public List<Integer> selectMothCount(List<Integer> deptIds) {
Date startTime = DateTimeUtil.getMonthStartDay();
Date endTime = DateTimeUtil.getMonthEndDay();
- List<KeyValue> mouthCount = userEventLogMapper.selectCountByDate(startTime, endTime);
+ List<KeyValue> mouthCount = userEventLogMapper.selectCountByDate(startTime, endTime, deptIds);
List<String> mothStartToNowFormat = DateTimeUtil.MothStartToNowFormat();
return mothStartToNowFormat.stream().map(md -> {
KeyValue keyValue = mouthCount.stream().filter(kv -> kv.getName().equals(md)).findAny().orElse(null);
--
Gitblit v1.8.0