增加任务列表筛选

src/main/java/com/project/task/domain/enums/TaskStatusEnum.java

@@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor;
 @Getter
 @RequiredArgsConstructor
 public enum TaskStatusEnum implements HasValueEnum<String> {
+    ALL("全部") ,
     Not_Start("未开考") ,
     In_Progress("已开考") ,
 

src/main/java/com/project/task/domain/param/TaskParam.java

@@ -21,4 +21,6 @@ public class TaskParam extends BaseParam {
 
     private String subLineName;
 
+    private String taskStatus;
+
 }

src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java

@@ -47,16 +47,16 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService {
     public Result<PageResult<TaskDTO>> search(TaskParam param) throws Exception {
         LambdaQueryWrapper<TaskEntity> queryWrapper = new LambdaQueryWrapper<>();
         if (param.getName() != null && StrUtil.isNotBlank(param.getName().trim())) {
-            queryWrapper.like(TaskEntity::getName , param.getName().trim());
+            queryWrapper.like(TaskEntity::getName, param.getName().trim());
         }
         if (Objects.nonNull(param.getLineId())) {
-            queryWrapper.eq(TaskEntity::getLineId , param.getLineId());
+            queryWrapper.eq(TaskEntity::getLineId, param.getLineId());
         }
         if (Objects.nonNull(param.getSubLineId())) {
-            queryWrapper.eq(TaskEntity::getSubLineId , param.getSubLineId());
+            queryWrapper.eq(TaskEntity::getSubLineId, param.getSubLineId());
         }
         if (Objects.nonNull(param.getBusinessId())) {
-            queryWrapper.eq(TaskEntity::getBusinessId , param.getBusinessId());
+            queryWrapper.eq(TaskEntity::getBusinessId, param.getBusinessId());
         }
         if (StrUtil.isNotBlank(param.getSubLineName())) {
             List<Long> productLineEntityList = productLineBaseService.lambdaQuery().select(ProductLineEntity::getId)
@@ -64,11 +64,27 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService {
                     .eq(ProductLineEntity::getLeaf, Boolean.TRUE).list()
                     .stream().map(ProductLineEntity::getId).toList();
             if (CollUtil.isEmpty(productLineEntityList)) {
-                queryWrapper.in(TaskEntity::getSubLineId , List.of(-1L));
+                queryWrapper.in(TaskEntity::getSubLineId, List.of(-1L));
             } else {
-                queryWrapper.in(TaskEntity::getSubLineId , productLineEntityList);
+                queryWrapper.in(TaskEntity::getSubLineId, productLineEntityList);
             }
         }
+        // 考试状态过滤
+        Date endOfToday = DateUtil.endOfDay(new Date());
+        Date beginOfToday = DateUtil.beginOfDay(new Date());
+        // 待开考：开始时间大于当前
+        if (StrUtil.equals(param.getTaskStatus(), TaskStatusEnum.Not_Start.name())) {
+            queryWrapper.gt(TaskEntity::getStartTime, endOfToday);
+        }
+        // 已截止：结束时间小于当前
+        if (StrUtil.equals(param.getTaskStatus(), TaskStatusEnum.Cut_Off.name())) {
+            queryWrapper.lt(TaskEntity::getEndTime, beginOfToday);
+        }
+        // 已开考
+        if (StrUtil.equals(param.getTaskStatus(), TaskStatusEnum.In_Progress.name())) {
+            queryWrapper.le(TaskEntity::getStartTime, endOfToday);
+            queryWrapper.ge(TaskEntity::getEndTime, beginOfToday);
+        }
         queryWrapper.orderByDesc(TaskEntity::getId);
         IPage<TaskEntity> taskEntityPage = taskMapper.selectPage(
                 PageConverter.toMpPage(param),

src/main/resources/application-test.yml

@@ -66,14 +66,19 @@ analysis:
   port: 8888
   url: /word/parse
 ding:
-  appKey: dinghgexcbos9dorl3kb
-  appSecret: bSNX1ZOUTk2A4FGwQ1U6fyHlFssh9IZtFO6FuKx8A97PE1VZL9lBTJapwzDGCS7v
-  #  appKey: ding4eootvq4jzas96lr #保伦架构
-  #  appSecret: UI6XcD8GFPE_W_yo2eQkMuoSsTEf1whpZYEXrsDA7CV7bkJp40B3VNcETWS1aGgg
-  agentId: 4418045751
-  corpId: ding13a2ff8718e6bcdd
-  #  corpId: 3318151640
-  noticeUrlPrefix: https://107pm707566hq.vicp.fun/ai-evaluator-test
+#  appKey: dinghgexcbos9dorl3kb
+#  appSecret: bSNX1ZOUTk2A4FGwQ1U6fyHlFssh9IZtFO6FuKx8A97PE1VZL9lBTJapwzDGCS7v
+#  #  appKey: ding4eootvq4jzas96lr #保伦架构
+#  #  appSecret: UI6XcD8GFPE_W_yo2eQkMuoSsTEf1whpZYEXrsDA7CV7bkJp40B3VNcETWS1aGgg
+#  agentId: 4418045751
+#  corpId: ding13a2ff8718e6bcdd
+#  #  corpId: 3318151640
+#  noticeUrlPrefix: https://107pm707566hq.vicp.fun/ai-evaluator-test
+  appKey: dinggl2ktuhdhoczkg2o
+  appSecret: nK104mgXPbkCWjX1I-EcYiubjM0FJAYcfqBKPkVcyvrBsLMF9XK1g9Qd_QVOndcK
+  agentId: 4283077101
+  corpId: ding13d71da66ad91ff0f5bf40eda33b7ba0
+  noticeUrlPrefix: https://107pm707566hq.vicp.fun/ai-evaluator
 algo:
   clusterUrl: /semantic-cluster
   baseUrl: http://127.0.0.1:8002