From 5bbd99ba550aa2e8cd8da36644018981ca1a1921 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 23 九月 2026 16:58:51 +0800
Subject: [PATCH] 【丽水】更新同步

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |   18 ++++++++----------
 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java        |    4 ++--
 2 files changed, 10 insertions(+), 12 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 06955a7..e4e98d3 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
@@ -358,7 +358,6 @@
 //                                sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "&param2=" + patid + "&param3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=false");
                         sendMagParam.setPhone(serviceSubtask.getPhone());
                         sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/wt?p=" + format : ip + "/wt?p=" + format);
-                        log.info("sendMagParam鐨勫�间负锛歿}", sendMagParam);
                         //濡傛灉type鏄闊抽殢璁跨殑璇濓紙璇存槑琛ュ伩鍙戦�佹柟寮忎腑鏈夌數璇濋殢璁跨殑鏂瑰紡锛岃繖閲岀殑澶栭摼灏卞湴鍧�鍙兘鐢�/sf锛�
                         if (serviceSubtask.getType().equals("1"))
                             sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/sf?p=" + format : ip + "/sf?p=" + format);
@@ -425,7 +424,7 @@
                         serviceOutPath.setUrl(url);
                         iServiceOutPathService.updateServiceOutPath(serviceOutPath);
                     }
-
+                    log.info("sendMagParam鐨勫�间负锛歿}", sendMagParam);
                     //鐭俊杩橀渶瑕佹ā鏉�
                     String s = null;
                     if (active.equals("xh")) {
@@ -1069,6 +1068,7 @@
         String body = new Gson().toJson(map);
 
         String result = null;
+        log.info("銆恎etDXCode銆�-鐭俊鍙戦�佸叆鍙� body = {}", body);
         try {
             result = OkHttpExample.sendPostRequest(address, body, token);
         } catch (IOException e) {
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index ebed5a9..5ecccd8 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -6238,9 +6238,10 @@
             redisCache.deleteObject(phoneCallReqYQVO.getUuid() + "PlayEventCallbackPlaystop");
 //                        //鑾峰彇涓嬩竴棰�
             log.error("鑾峰彇涓嬩竴棰樼殑淇℃伅锛歿}", ivrTaskTemplateScriptVO);
-            if (ivrTaskTemplateScriptVO.getBranchFlag().equals("1") || ivrTaskTemplateScriptVO.getBranchFlag().equals("0") && ivrTaskTemplateScriptVO.getNextScriptno() != null && ivrTaskTemplateScriptVO.getNextScriptno() != 0) {
+            //branchFlag涓簄ull鏃舵寜鍒嗘敮0澶勭悊锛岄伩鍏峃PE
+            if ("1".equals(ivrTaskTemplateScriptVO.getBranchFlag()) || "0".equals(ivrTaskTemplateScriptVO.getBranchFlag()) && ivrTaskTemplateScriptVO.getNextScriptno() != null && ivrTaskTemplateScriptVO.getNextScriptno() != 0) {
                 Long nextQuestion = null;
-                if (ivrTaskTemplateScriptVO.getBranchFlag().equals("1")) {
+                if ("1".equals(ivrTaskTemplateScriptVO.getBranchFlag())) {
                     nextQuestion = chosenOption.getNextQuestion();
                     //鏇存柊鍒嗘暟
                     double score = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "SCORE");
@@ -6273,14 +6274,11 @@
                     redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "- jsy", serviceTask.getJsy(), 120, TimeUnit.MINUTES);
                     phoneCallBackYQVO.setType("text");
                     phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + serviceTask.getJsy());
-                    //灏嗙粨鏋滃啓杩沝etail琛�
-                    ServiceSubTaskDetailReq ssdReq = new ServiceSubTaskDetailReq();
-                    List<ServiceSubtaskDetail> serviceSubtaskDetailList2 = new ArrayList<>();
-                    serviceSubtaskDetailList.add(getServiceSubtaskDetail(phoneCallReqYQVO, ivrTaskTemplateScriptVO, serviceSubtask, ivrTaskTemplate));
-                    serviceSubTaskDetailReq.setServiceSubtaskDetailList(serviceSubtaskDetailList2);
-                    ssdReq.setGuid(phoneCallReqYQVO.getGuid());
-                    ssdReq.setOrgid(phoneCallReqYQVO.getOrgid());
-                    saveQuestionAnswerPhone(ssdReq);
+                    //灏嗙粨鏋滃啓杩沝etail琛紙鏈鐨勬槑缁嗗湪涓婇潰鍖归厤鎴愬姛鏃跺凡缁忕粍瑁呭苟瀛樺叆serviceSubtaskDetailList锛岃繖閲岀洿鎺ヨ惤搴擄紝閬垮厤閲嶅鏂板锛�
+                    serviceSubTaskDetailReq.setServiceSubtaskDetailList(serviceSubtaskDetailList);
+                    serviceSubTaskDetailReq.setGuid(phoneCallReqYQVO.getGuid());
+                    serviceSubTaskDetailReq.setOrgid(phoneCallReqYQVO.getOrgid());
+                    saveQuestionAnswerPhone(serviceSubTaskDetailReq);
                     return phoneCallBackYQVO;
                 }
 

--
Gitblit v1.9.3