wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-12-08 16:05:14 +08:00
parent 3195fdb885 91eea8e787
commit 8ee75c8e78
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
View File

@ -99,7 +99,7 @@ public class ActHistoryService {
@Autowired @Autowired
private TRemindersService tRemindersService; private TRemindersService tRemindersService;
@Value("${reminders.interval:7}") // 流程发起后多少天允许催办 @Value("${reminders.interval}") // 流程发起后多少天允许催办
private Integer interval; private Integer interval;
@ -397,6 +397,7 @@ public class ActHistoryService {
Optional<Task> nowTask = taskService.createTaskQuery().processInstanceId(index.getProcessInstanceId()) Optional<Task> nowTask = taskService.createTaskQuery().processInstanceId(index.getProcessInstanceId())
.orderByTaskCreateTime().desc().active().list().stream().findFirst(); // 尝试获取当前task .orderByTaskCreateTime().desc().active().list().stream().findFirst(); // 尝试获取当前task
if (nowTask.isPresent()) { // 存在正在进行的任务 if (nowTask.isPresent()) { // 存在正在进行的任务
logger.info("当前任务id:" + nowTask.get().getId());
LocalDate localDate = tRemindersService.selectRemindersTime(nowTask.get().getId()); LocalDate localDate = tRemindersService.selectRemindersTime(nowTask.get().getId());
if (localDate == null) { // 未进行过催办 if (localDate == null) { // 未进行过催办
LocalDate taskCreateDate = nowTask.get().getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); LocalDate taskCreateDate = nowTask.get().getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
@ -424,6 +425,7 @@ public class ActHistoryService {
} }
} }
} else { } else {
logger.info("不存在正在进行流程节点");
index.setAllowReminders(Boolean.FALSE); index.setAllowReminders(Boolean.FALSE);
index.setDoneReminders(Boolean.FALSE); index.setDoneReminders(Boolean.FALSE);
index.setNextRemindersDays(0); index.setNextRemindersDays(0);

2
renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
View File

@ -103,7 +103,7 @@ public class TAbilityApplicationController {
@Value("${infrastructure.dept-can-apply-max}") @Value("${infrastructure.dept-can-apply-max}")
private Integer infrastructureMax; private Integer infrastructureMax;
@Value("${reminders.interval:7}") // 流程发起后多少天允许催办 @Value("${reminders.interval}") // 流程发起后多少天允许催办
private Integer interval; private Integer interval;
@Autowired @Autowired

2
renren-admin/src/main/java/io/renren/modules/reminders/controller/TRemindersController.java
View File

@ -57,7 +57,7 @@ public class TRemindersController {
@Autowired @Autowired
protected TaskService taskService; protected TaskService taskService;
@Value("${reminders.interval:7}") // 流程发起后多少天允许催办 @Value("${reminders.interval}") // 流程发起后多少天允许催办
private Integer interval; private Integer interval;
@GetMapping("page") @GetMapping("page")

2
renren-admin/src/main/java/io/renren/modules/reminders/service/impl/TRemindersServiceImpl.java
View File

@ -46,7 +46,7 @@ public class TRemindersServiceImpl extends CrudServiceImpl<TRemindersDao, TRemin
@Value("#{new Boolean(${notice.yawei})}") @Value("#{new Boolean(${notice.yawei})}")
private Boolean noticeYaWei; // 是否发送消息到亚微中心 private Boolean noticeYaWei; // 是否发送消息到亚微中心
@Value("${reminders.interval:7}") // 流程发起后多少天允许催办 @Value("${reminders.interval}") // 流程发起后多少天允许催办
private Integer interval; private Integer interval;
@Autowired @Autowired