From 6a53d35b5d56e2f6bc64bbfe41579f6f32039c90 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 24 三月 2026 15:24:33 +0800
Subject: [PATCH] 【丽水】随访增加 人工随访超时状态
---
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 0281b14..7dc8631 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
@@ -24,6 +24,7 @@
import com.ruoyi.system.service.ISysConfigService;
import com.smartor.common.LSHospTokenUtil;
import com.smartor.domain.*;
+import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.*;
import com.smartor.service.IBaseSmsaccountService;
import com.smartor.service.IServiceOutPathService;
@@ -187,7 +188,7 @@
ServiceTask ivrTask1 = ivrTaskMapper.selectServiceTaskByTaskid(commonTaskcallMQ.getTaskid());
//閫氳繃浠诲姟ID鎷垮埌鎮ｈ�呬俊鎭�
- ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
serviceSubtaskVO.setTaskid(commonTaskcallMQ.getTaskid());
serviceSubtaskVO.setSendstate(2L);
List<ServiceSubtask> selectServiceSubtaskList = ivrTaskcallMapper.selectServiceSubtaskList(serviceSubtaskVO);
@@ -653,7 +654,7 @@
serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
} else if (descByCode.equals("浜哄伐")) {
- setFailPreachForm(serviceSubtask, sendPreachform, "浜哄伐寰呮墽琛�", "2");
+ setFailPreachForm(serviceSubtask, sendPreachform, "浜哄伐瓒呮椂", "7");
} else if (descByCode.equals("寰俊灏忕▼搴�")) {
setFailPreachForm(serviceSubtask, sendPreachform, "寰俊灏忕▼搴忓緟鎵ц", "2");
}
@@ -848,6 +849,11 @@
serviceSubtask.setCurrentPreachform(preachform);
serviceSubtask.setSendstate(5L);
serviceSubtask.setRemark("setFailPreachForm鏂规硶 褰撳墠鐨刾reachform宸茬粡鏄渶鍚庝竴涓簡锛屽叏閮ㄦ墽琛屽け璐�");
+ //浜哄伐鍙戦�佽秴鏃�
+ if(ObjectUtils.isNotEmpty(preachform) && preachform.equals("1") && failSendstate.equals("7")){
+ serviceSubtask.setSendstate(7L);
+ serviceSubtask.setRemark("setFailPreachForm鏂规硶 褰撳墠鐨刾reachform宸茬粡鏄渶鍚庝竴涓簡, 浜哄伐鍙戦�佽秴鏃�");
+ }
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
return true;
}
@@ -861,6 +867,11 @@
serviceSubtask.setCurrentPreachform(preachform);
serviceSubtask.setVisitTime(getNextVisitTime(serviceSubtask.getId(), serviceSubtask.getTaskid(), serviceSubtask.getVisitTime(), serviceSubtask.getCurrentPreachform()));
serviceSubtask.setSendstate(3L);
+ //浜哄伐鍙戦�佽秴鏃�
+ if(ObjectUtils.isNotEmpty(preachform) && preachform.equals("1") && failSendstate.equals("7")){
+ serviceSubtask.setSendstate(7L);
+ serviceSubtask.setRemark("浜哄伐鍙戦�佽秴鏃�");
+ }
if (serviceSubtask.getType().equals("3") || serviceSubtask.getType().equals("4")) {
//濡傛灉鏄鏁欐垨閫氱煡锛屽苟涓斿彂閫佹垚鍔燂紝鍒欑洿鎺ュ皢serviceSubtask鐘舵�佹敼鎴�6L锛堣繖涓偅鑰呮槸娌℃湁棰樺仛鐨勶紝涓嶄細鍐嶈Е鍙戞帴鍙ｈ繘琛岀姸鎬佷慨鏀癸級
if (failSendstate.equals("2")) {
--
Gitblit v1.9.3