From 6c636ce3119d116ce513302d63373769e610cb9c Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 8 Dec 2022 16:04:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=82=AC=E5=8A=9E=E9=85=8D=E7=BD=AE=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/renren/modules/activiti/service/ActHistoryService.java | 4 +++-
 .../processForm/controller/TAbilityApplicationController.java | 2 +-
 .../modules/reminders/controller/TRemindersController.java    | 2 +-
 .../modules/reminders/service/impl/TRemindersServiceImpl.java | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
index cce261f9..c6b90442 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
@@ -99,7 +99,7 @@ public class ActHistoryService {
 
     @Autowired
     private TRemindersService tRemindersService;
-    @Value("${reminders.interval:7}") // 流程发起后多少天允许催办
+    @Value("${reminders.interval}") // 流程发起后多少天允许催办
     private Integer interval;
 
 
@@ -397,6 +397,7 @@ public class ActHistoryService {
             Optional<Task> nowTask = taskService.createTaskQuery().processInstanceId(index.getProcessInstanceId())
                     .orderByTaskCreateTime().desc().active().list().stream().findFirst(); // 尝试获取当前task
             if (nowTask.isPresent()) { // 存在正在进行的任务
+                logger.info("当前任务id:" + nowTask.get().getId());
                 LocalDate localDate = tRemindersService.selectRemindersTime(nowTask.get().getId());
                 if (localDate == null) { // 未进行过催办
                     LocalDate taskCreateDate = nowTask.get().getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
@@ -424,6 +425,7 @@ public class ActHistoryService {
                     }
                 }
             } else {
+                logger.info("不存在正在进行流程节点");
                 index.setAllowReminders(Boolean.FALSE);
                 index.setDoneReminders(Boolean.FALSE);
                 index.setNextRemindersDays(0);
diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
index 0da56cf4..8e9e14b0 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
@@ -103,7 +103,7 @@ public class TAbilityApplicationController {
     @Value("${infrastructure.dept-can-apply-max}")
     private Integer infrastructureMax;
 
-    @Value("${reminders.interval:7}") // 流程发起后多少天允许催办
+    @Value("${reminders.interval}") // 流程发起后多少天允许催办
     private Integer interval;
 
     @Autowired
diff --git a/renren-admin/src/main/java/io/renren/modules/reminders/controller/TRemindersController.java b/renren-admin/src/main/java/io/renren/modules/reminders/controller/TRemindersController.java
index 29a6621f..59fa9ddb 100644
--- a/renren-admin/src/main/java/io/renren/modules/reminders/controller/TRemindersController.java
+++ b/renren-admin/src/main/java/io/renren/modules/reminders/controller/TRemindersController.java
@@ -57,7 +57,7 @@ public class TRemindersController {
     @Autowired
     protected TaskService taskService;
 
-    @Value("${reminders.interval:7}") // 流程发起后多少天允许催办
+    @Value("${reminders.interval}") // 流程发起后多少天允许催办
     private Integer interval;
 
     @GetMapping("page")
diff --git a/renren-admin/src/main/java/io/renren/modules/reminders/service/impl/TRemindersServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/reminders/service/impl/TRemindersServiceImpl.java
index ce73e477..ac29ab3d 100644
--- a/renren-admin/src/main/java/io/renren/modules/reminders/service/impl/TRemindersServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/reminders/service/impl/TRemindersServiceImpl.java
@@ -46,7 +46,7 @@ public class TRemindersServiceImpl extends CrudServiceImpl<TRemindersDao, TRemin
     @Value("#{new Boolean(${notice.yawei})}")
     private Boolean noticeYaWei; // 是否发送消息到亚微中心
 
-    @Value("${reminders.interval:7}") // 流程发起后多少天允许催办
+    @Value("${reminders.interval}") // 流程发起后多少天允许催办
     private Integer interval;
 
     @Autowired