From 829f5c1472d3bc6eb0bee9896700d05b8c636b2b Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 17 八月 2026 16:39:08 +0800
Subject: [PATCH] 【丽水】随访超时处理
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 7 +++++++
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 7 +++++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 3968974..5e750a1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -1095,6 +1095,13 @@
* @return
*/
public boolean isSubtaskDeadline(ServiceSubtask serviceSubtask, List<ServiceSubtaskPreachform> serviceSubtaskPreachforms){
+ if (ObjectUtils.isNotEmpty(serviceSubtask)) {
+ //鍙湁鍑洪櫌闅忚鍜屼笓鐥呴殢璁挎湁瓒呮椂
+ if(StringUtils.isNotEmpty(serviceSubtask.getServiceType()) &&
+ !serviceSubtask.getServiceType().equals("2") && !serviceSubtask.getServiceType().equals("13")){
+ return true;
+ }
+ }
if (Objects.isNull(serviceSubtask) || CollectionUtils.isEmpty(serviceSubtaskPreachforms)) {
return false;
}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 4b0d3bd..5e4760f 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -1689,6 +1689,13 @@
* @return
*/
public boolean isSubtaskDeadline(ServiceSubtask serviceSubtask, List<ServiceSubtaskPreachform> serviceSubtaskPreachforms){
+ if (ObjectUtils.isNotEmpty(serviceSubtask)) {
+ //鍙湁鍑洪櫌闅忚鍜屼笓鐥呴殢璁挎湁瓒呮椂
+ if(StringUtils.isNotEmpty(serviceSubtask.getServiceType()) &&
+ !serviceSubtask.getServiceType().equals("2") && !serviceSubtask.getServiceType().equals("13")){
+ return true;
+ }
+ }
if (Objects.isNull(serviceSubtask) || CollectionUtils.isEmpty(serviceSubtaskPreachforms)) {
return false;
}
--
Gitblit v1.9.3