From 196bb14112448857a885e32dc4149e308e00b01a Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 15 八月 2024 11:57:15 +0800
Subject: [PATCH] 2024.8.15 各项修正
---
src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_12.kt | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_12.kt b/src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_12.kt
index 0737950..98ebaf8 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_12.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_12.kt
@@ -52,15 +52,18 @@
* 瀛ｅ害鍐呭叏鏃犺嚜璇勭殑 -10鍒�
*/
private fun condition2(): Boolean {
-// val period = "${info.year}/$sMonth-$eMonth"
-// val e = evaluationMapper.selectByExample(Example(Evaluation::class.java).apply {
-// createCriteria().andEqualTo("iguid", info.userId)
-// .andEqualTo("ertype", 0)
-// .andEqualTo("scensename", period)
-// })
-// return e.isEmpty()
+ val periods = mutableListOf<String>()
+ for (i in sMonth..eMonth) {
+ periods.add("${info.year}/$i-$i")
+ }
+ val e = evaluationMapper.selectByExample(Example(Evaluation::class.java).apply {
+ createCriteria().andEqualTo("iguid", info.userId)
+ .andEqualTo("ertype", 0)
+ .andIn("scensename", periods)
+ })
+ return e.isEmpty()
// FIXME: 2021/4/26 鑷瘎鏆傛椂涓嶆墸鍒�
- return false
+// return false
}
/**
--
Gitblit v1.9.3