feat: 可用积分包添加开始日期

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -280,10 +280,10 @@ public class ApiController {
         Map<String, Object> dictMap = new LinkedHashMap<>();
 
         List<WmTaskContentConfig> listConfig = wmTaskContentConfigService.list(Wrappers.<WmTaskContentConfig>lambdaQuery()
-                        .eq(WmTaskContentConfig::getDelFlag, CommonConstants.STATUS_NORMAL)
-                        .eq(WmTaskContentConfig::getEnableFlag, CommonConstants.STATUS_NORMAL)
-                        .eq(WmTaskContentConfig::getTaskTypeId, taskTypeId)
-                        .orderByAsc(WmTaskContentConfig::getSeq));
+                .eq(WmTaskContentConfig::getDelFlag, CommonConstants.STATUS_NORMAL)
+                .eq(WmTaskContentConfig::getEnableFlag, CommonConstants.STATUS_NORMAL)
+                .eq(WmTaskContentConfig::getTaskTypeId, taskTypeId)
+                .orderByAsc(WmTaskContentConfig::getSeq));
 
         listConfig.forEach(config -> config.setTaskFiledType(config.getTaskFiledType().trim()));
         log.info("task_content_config:<{}>", listConfig);
@@ -310,8 +310,12 @@ public class ApiController {
                         if (CollUtil.isNotEmpty(statusList)) {
                             Set<String> scoreIds = statusList.stream().map(WmScorePackageStatus::getPackageId).collect(Collectors.toSet());
                             // 批量查询积分包
-                            log.info("score_pkg_ids:<--{}-->", scoreIds);
-                            List<WmScorePackage> wmScorePackages = wmScorePackageService.listByIds(scoreIds);
+                            LocalDate now = LocalDate.now();
+                            log.info("score_pkg_ids:<--{}-->, start_time:<--{}-->", scoreIds, now);
+                            // List<WmScorePackage> wmScorePackages = wmScorePackageService.listByIds(scoreIds);
+                            List<WmScorePackage> wmScorePackages = wmScorePackageService.list(Wrappers.<WmScorePackage>lambdaQuery()
+                                    .ge(WmScorePackage::getStartTime, now)
+                                    .in(WmScorePackage::getId, scoreIds));
                             log.info("score_pkgs:<--{}-->", wmScorePackages);
                             Map<String, WmScorePackage> scorePackageMap = wmScorePackages.stream().collect(Collectors.toMap(WmScorePackage::getId, Function.identity()));
                             // 批量查询scoreTaskType