diff --git a/src/main/java/com/ai/da/common/task/AccountTask.java b/src/main/java/com/ai/da/common/task/AccountTask.java index 594405a9..b564ad71 100644 --- a/src/main/java/com/ai/da/common/task/AccountTask.java +++ b/src/main/java/com/ai/da/common/task/AccountTask.java @@ -24,8 +24,8 @@ public class AccountTask { * 替换为 * 每个月月初只刷新教育子账号的积分 */ - @Scheduled(cron = "0 25 14 * * ?") -// @Scheduled(cron = "0 0 0 1 * ?") +// @Scheduled(cron = "0 25 14 * * ?") + @Scheduled(cron = "0 0 0 1 * ?") public void refreshCreditsMonthly() { log.info("每月1号0点 重置教育版子账号为默认积分"); accountService.refreshCreditsMonthly(); @@ -81,7 +81,8 @@ public class AccountTask { redisUtil.batchDeleteKeysWithSamePrefix(RedisUtil.NICKNAME_MODIFY_TIMES); } - @Scheduled(cron = "0 35 14 * * ?") +// @Scheduled(cron = "0 35 14 * * ?") + @Scheduled(cron = "0 5 0 * * ?") public void checkEduAdminExpireStatus() { accountService.checkEduAdminExpireStatus(); } diff --git a/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java b/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java index 05153fd2..9cc869aa 100644 --- a/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java +++ b/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java @@ -37,7 +37,9 @@ public class ProjectQueryDTO extends PageQueryBaseVo { @ApiModelProperty("1交集2并集") private Integer intersection; - private List process; + // todo 获取历史列表,允许传入多个类型 +// private List process; + private String process; private Integer asc; } diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index 0d58594f..8c8b0bf4 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -1727,7 +1727,9 @@ public class UserLikeGroupServiceImpl extends ServiceImpl