BUGFIX:
This commit is contained in:
@@ -23,6 +23,7 @@ import org.apache.poi.ss.usermodel.Sheet;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.security.core.parameters.P;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@@ -159,7 +160,7 @@ public class MyTaskScheduler {
|
||||
|
||||
// 定时任务,每十五天执行一次
|
||||
// @Scheduled(cron = "0 0 0 ? * MON")
|
||||
// @Scheduled(cron = "0 0 0 */15 * ?")
|
||||
@Scheduled(cron = "0 0 0 */15 * ?")
|
||||
public void checkExpiry() {
|
||||
// 检测正式用户是否快要过期
|
||||
QueryWrapper<Account> qw = new QueryWrapper<>();
|
||||
@@ -193,7 +194,7 @@ public class MyTaskScheduler {
|
||||
}
|
||||
}
|
||||
}
|
||||
// @Scheduled(cron = "0 0 9 * * ?")
|
||||
@Scheduled(cron = "0 0 9 * * ?")
|
||||
public void sendTrialOrderExcelToManagements() {
|
||||
// 获取前一天日期
|
||||
LocalDate yesterday = LocalDate.now().minusDays(1);
|
||||
@@ -1504,7 +1505,7 @@ public class MyTaskScheduler {
|
||||
Workspace workspace = new Workspace();
|
||||
workspace.setAgeGroup("Adult");
|
||||
if (null != design.getTemplateId()) {
|
||||
project.setProcess(DesignProcess.SERIES_DESIGN.getValue());
|
||||
project.setProcess(DesignProcess.SERIES_DESIGN.name());
|
||||
workspace.setPosition("Overall");
|
||||
// workspace设置模特
|
||||
if (design.getModelType().equals("System")) {
|
||||
@@ -1531,7 +1532,7 @@ public class MyTaskScheduler {
|
||||
}
|
||||
}
|
||||
}else {
|
||||
project.setProcess(DesignProcess.SINGLE_DESIGN.getValue());
|
||||
project.setProcess(DesignProcess.SINGLE_DESIGN.name());
|
||||
workspace.setPosition(design.getSwitchCategory());
|
||||
}
|
||||
workspace.setSystemDesignerPercentage(design.getSystemScale().multiply(new BigDecimal("100")).setScale(0, RoundingMode.HALF_UP).intValueExact());
|
||||
@@ -1661,6 +1662,11 @@ public class MyTaskScheduler {
|
||||
project.setAccountId(userLikeGroup.getAccountId());
|
||||
project.setName(userLikeGroup.getName());
|
||||
project.setCreateTime(LocalDateTime.ofInstant(userLikeGroup.getCreateDate().toInstant(), ZoneId.systemDefault()));
|
||||
if (Objects.isNull(userLikeGroup.getUpdateDate())){
|
||||
project.setUpdateTime(LocalDateTime.ofInstant(userLikeGroup.getCreateDate().toInstant(), ZoneId.systemDefault()));
|
||||
} else {
|
||||
project.setUpdateTime(LocalDateTime.ofInstant(userLikeGroup.getUpdateDate().toInstant(), ZoneId.systemDefault()));
|
||||
}
|
||||
// project.setUpdateTime(LocalDateTime.ofInstant(userLikeGroup.getUpdateDate().toInstant(), ZoneId.systemDefault()));
|
||||
project.setOriginal(userLikeGroup.getOriginal());
|
||||
project.setOriginalAccountId(userLikeGroup.getOriginalAccountId());
|
||||
|
||||
Reference in New Issue
Block a user