From a8c87a18fed28e8cd06b20de9def11631f80ab96 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 16:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index 4767a29..84cdd90 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -149,6 +149,34 @@
return scoreMapper.selectCheckScoreMap(checkScore).stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
}
+ /**
+ * 鏌ヨ鑰冩牳绉垎鍗＄墖鍒楄〃
+ *
+ * @param checkScore 鑰冩牳绉垎
+ * @return 鑰冩牳绉垎
+ */
+ @Override
+ @DataScope(deptAlias = "d",userAlias = "u")
+ public Map<Long, List<CheckScore>> selectCheckScoreChart(CheckScore checkScore)
+ {
+ //鍖哄幙鍙兘鐪嬪凡鍙戝竷
+ roleControl(checkScore);
+
+ //鏌ヨ鎴愮哗
+ String date = checkScore.getDate();
+ if(StringUtils.isEmpty(date)){
+ //濡傛灉涓虹┖鏌ユ湰鏈堢殑鏁版嵁
+ Calendar now = Calendar.getInstance();
+ //鍙栨槰澶�
+ now.add(Calendar.DATE, -1);
+ Date yesterday = now.getTime();
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
+ date = simpleDateFormat.format(yesterday);
+ checkScore.setDate(date);
+ }
+ List<CheckScore> checkScores = scoreMapper.selectCheckScoreList(checkScore);
+ return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
+ }
/**
* 鍖哄幙璇︽儏
--
Gitblit v1.8.0