From 8edae6b9a271c6307793fcc55546fae3278c1bc8 Mon Sep 17 00:00:00 2001
From: "hhb@hotmail.com" <hhb@hotmail.com>
Date: Fri, 14 Mar 2025 12:12:12 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A4=84=E7=90=86=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AdminAppraiseServiceImpl.java   | 16 +++++++++-------
 .../service/impl/LaborEducationServiceImpl.java  |  4 ++--
 .../service/impl/MoralEducationServiceImpl.java  |  4 ++--
 .../repository/AppraiseRecordRepository.java     |  7 ++++---
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/AdminAppraiseServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/AdminAppraiseServiceImpl.java
index 57f3d89..d20bc53 100644
--- a/src/main/java/cn/teammodel/controller/admin/service/impl/AdminAppraiseServiceImpl.java
+++ b/src/main/java/cn/teammodel/controller/admin/service/impl/AdminAppraiseServiceImpl.java
@@ -143,13 +143,15 @@ public class AdminAppraiseServiceImpl implements AdminAppraiseService {
         String academicYearId = timeRangeDto.getAcademicYearId();
         String schoolId = SecurityUtil.getLoginUser().getSchoolId();
         String typeName = null;
-        if (timeRangeDto.getType().equals("moral")) {
-            typeName = "德育";
-        }else if (timeRangeDto.getType().equals("labour")){
-            typeName = "劳育";
+        String type = timeRangeDto.getType();
+        if(type != null && !type.isEmpty()) {
+            if (timeRangeDto.getType().equals("moral")) {
+                typeName = "德育";
+            }else if (timeRangeDto.getType().equals("labour")){
+                typeName = "劳育";
+            }
         }
 
-
         // fixme: 是否对时间范围做一些限制(不能确保当前周有数据)
         // 无参默认当前周
         if (startTime == null || endTime == null) {
@@ -172,8 +174,8 @@ public class AdminAppraiseServiceImpl implements AdminAppraiseService {
                 academicYearId,
                 startTime,
                 endTime,
-                classIds,
-                typeName
+                typeName,
+                classIds
         );
 
         if (res != null) {
diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/LaborEducationServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/LaborEducationServiceImpl.java
index a9204bf..bcd7622 100644
--- a/src/main/java/cn/teammodel/controller/admin/service/impl/LaborEducationServiceImpl.java
+++ b/src/main/java/cn/teammodel/controller/admin/service/impl/LaborEducationServiceImpl.java
@@ -126,8 +126,8 @@ public class LaborEducationServiceImpl implements LaborEducationService {
                 academicYearId,
                 startTime,
                 endTime,
-                classIds,
-                "德育"
+                "德育",
+                classIds
         );
         //表扬的次数
         int rightCount = (int) res.stream().filter(RecordVo::isPraise).count();
diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/MoralEducationServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/MoralEducationServiceImpl.java
index 9c766b0..587a78f 100644
--- a/src/main/java/cn/teammodel/controller/admin/service/impl/MoralEducationServiceImpl.java
+++ b/src/main/java/cn/teammodel/controller/admin/service/impl/MoralEducationServiceImpl.java
@@ -126,8 +126,8 @@ public class MoralEducationServiceImpl implements MoralEducationService {
                 academicYearId,
                 startTime,
                 endTime,
-                classIds,
-                "劳育"
+                "劳育",
+                classIds
         );
         //表扬的次数
         int rightCount = (int) res.stream().filter(RecordVo::isPraise).count();
diff --git a/src/main/java/cn/teammodel/repository/AppraiseRecordRepository.java b/src/main/java/cn/teammodel/repository/AppraiseRecordRepository.java
index 4a8c43c..3e30bc3 100644
--- a/src/main/java/cn/teammodel/repository/AppraiseRecordRepository.java
+++ b/src/main/java/cn/teammodel/repository/AppraiseRecordRepository.java
@@ -77,10 +77,11 @@ public interface AppraiseRecordRepository extends CosmosRepository<AppraiseRecor
             "c.academicYearId =  @academicYearId and " +
             "(IS_NULL(@startTime) or n.createTime >= @startTime) and " +
             "(IS_NULL(@endTime) or n.createTime <= @endTime) and " +
-            "c.classId in (@ids) and " +
-            "(IS_NULL(@typeName) or array_contains(n.appraiseNode.path ,@typeName)"
+            "(IS_NULL(@typeName) or array_contains(n.appraiseNode.path ,@typeName)) and " +
+            "c.classId in (@ids) "
+
     )
-    List<RecordVo> latestRecords(String code, String academicYearId, Long startTime, Long endTime, Collection<String> ids,String typeName);
+    List<RecordVo> latestRecords(String code, String academicYearId, Long startTime, Long endTime,String typeName, Collection<String> ids);
 
 
     /**