feat: 任务截图定时任务优化2

hnqz-visual/hnqz-daemon-quartz/src/main/java/com/qunzhixinxi/hnqz/daemon/quartz/service/impl/WmTaskServiceImpl.java

@@ -83,10 +83,12 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		// 优先查询审核通过的(taskStatus == 3)
 		wmTaskLambdaQueryWrapper.orderByDesc(WmTask::getTaskStatus, WmTask::getId);
 
+		Set<String> ids = new HashSet<>();
+
 		if (StrUtil.isNotBlank(param) && Integer.parseInt(param) > 1) {
 			// 手动指定积分包id的情况
 			// 查询下级积分包
-			Set<String> ids = Stream.of(param).collect(Collectors.toSet());
+			ids.add(StrUtil.trim(param));
 			getAllLowerScorePackages(ids);
 
 			wmTaskLambdaQueryWrapper.in(WmTask::getScorePackageId, ids);
@@ -94,6 +96,8 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 
 		List<WmTask> wmTaskList = this.list(wmTaskLambdaQueryWrapper);
 
+		log.info("积分包id:{}, 任务个数:{}", ids, wmTaskList.size());
+
 		if (CollUtil.isNotEmpty(wmTaskList)) {
 			for (WmTask wmTask : wmTaskList) {
 				String url = quartzAppConfig.getApiUrl() + "/admin/api/getH5To?taskId=" + wmTask.getId();
@@ -119,8 +123,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 	private void getAllLowerScorePackages(Set<String> ids) {
 		List<WmScorePackage> subList = wmScorePackageMapper.selectList(Wrappers.<WmScorePackage>lambdaQuery()
 				.in(WmScorePackage::getRelationScoreId, ids)
-				.eq(WmScorePackage::getDelFlag, "0")
-				.eq(WmScorePackage::getEnableFlag, "0"));
+				.eq(WmScorePackage::getDelFlag, "0"));
 
 		if (CollectionUtil.isNotEmpty(subList)) {
 			Set<String> idSet = subList.stream().map(WmScorePackage::getId).collect(Collectors.toSet());