dev切换到prod,部分功能不上传
This commit is contained in:
@@ -24,8 +24,8 @@ public class AccountTask {
|
|||||||
* 替换为
|
* 替换为
|
||||||
* 每个月月初只刷新教育子账号的积分
|
* 每个月月初只刷新教育子账号的积分
|
||||||
*/
|
*/
|
||||||
@Scheduled(cron = "0 25 14 * * ?")
|
// @Scheduled(cron = "0 25 14 * * ?")
|
||||||
// @Scheduled(cron = "0 0 0 1 * ?")
|
@Scheduled(cron = "0 0 0 1 * ?")
|
||||||
public void refreshCreditsMonthly() {
|
public void refreshCreditsMonthly() {
|
||||||
log.info("每月1号0点 重置教育版子账号为默认积分");
|
log.info("每月1号0点 重置教育版子账号为默认积分");
|
||||||
accountService.refreshCreditsMonthly();
|
accountService.refreshCreditsMonthly();
|
||||||
@@ -81,7 +81,8 @@ public class AccountTask {
|
|||||||
redisUtil.batchDeleteKeysWithSamePrefix(RedisUtil.NICKNAME_MODIFY_TIMES);
|
redisUtil.batchDeleteKeysWithSamePrefix(RedisUtil.NICKNAME_MODIFY_TIMES);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Scheduled(cron = "0 35 14 * * ?")
|
// @Scheduled(cron = "0 35 14 * * ?")
|
||||||
|
@Scheduled(cron = "0 5 0 * * ?")
|
||||||
public void checkEduAdminExpireStatus() {
|
public void checkEduAdminExpireStatus() {
|
||||||
accountService.checkEduAdminExpireStatus();
|
accountService.checkEduAdminExpireStatus();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,9 @@ public class ProjectQueryDTO extends PageQueryBaseVo {
|
|||||||
@ApiModelProperty("1交集2并集")
|
@ApiModelProperty("1交集2并集")
|
||||||
private Integer intersection;
|
private Integer intersection;
|
||||||
|
|
||||||
private List<String> process;
|
// todo 获取历史列表,允许传入多个类型
|
||||||
|
// private List<String> process;
|
||||||
|
private String process;
|
||||||
|
|
||||||
private Integer asc;
|
private Integer asc;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1727,7 +1727,9 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
queryWrapper.le("update_time", new Date(query.getEndDate()));
|
queryWrapper.le("update_time", new Date(query.getEndDate()));
|
||||||
}
|
}
|
||||||
if (!StringUtils.isEmpty(query.getProcess())) {
|
if (!StringUtils.isEmpty(query.getProcess())) {
|
||||||
queryWrapper.in("process", query.getProcess());
|
// todo 获取历史列表,允许传入多个类型
|
||||||
|
// queryWrapper.in("process", query.getProcess());
|
||||||
|
queryWrapper.eq("process", query.getProcess());
|
||||||
}
|
}
|
||||||
// 新增分类过滤
|
// 新增分类过滤
|
||||||
if (CollectionUtil.isNotEmpty(query.getClassificationIdList())) {
|
if (CollectionUtil.isNotEmpty(query.getClassificationIdList())) {
|
||||||
|
|||||||
Reference in New Issue
Block a user