update 处理查询条件

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")) {
+        String type = timeRangeDto.getType();
-            typeName = "德育";
+        if(type != null && !type.isEmpty()) {
-        }else if (timeRangeDto.getType().equals("labour")){
+            if (timeRangeDto.getType().equals("moral")) {
-            typeName = "劳育";
+                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) {

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();

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();

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)) and " +
-            "(IS_NULL(@typeName) or array_contains(n.appraiseNode.path ,@typeName)"
+            "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);
 
 
     /**