From ff6e84a8f969e2196041c500af051e3e33c46009 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 22 二月 2025 18:16:32 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 62 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index 5c13879..cb275c2 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -253,7 +253,6 @@
}
-
/**
* 灏嗛棶棰樹繚瀛樺埌缂撳瓨涓�
*
@@ -297,6 +296,7 @@
}
return 0;
}
+
@Override
public Map<String, Object> getQuestionCache(ServiceSubTaskCacheReq serviceSubTaskCacheReq, Long flag) {
Map<String, Object> map = new HashMap<>();
@@ -341,39 +341,41 @@
Map<String, Object> map = new HashMap<>();
Map<String, Object> scriptInfoByCondition = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), serviceSubTaskQueryReq.getIsFinish(), serviceSubTaskQueryReq.getPatfrom());
- if (scriptInfoByCondition.get("type").equals("1")) {
- List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
- for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOList) {
- Map<String, String> scriptResult = getScriptResult(serviceSubTaskQueryReq.getSubId(), serviceSubTaskQueryReq.getPatid(), ivrLibaTemplateScriptVO.getId());
- if (ObjectUtils.isNotEmpty(scriptResult)) {
- ivrLibaTemplateScriptVO.setScriptResult(scriptResult.get("asrtext"));
- ivrLibaTemplateScriptVO.setScriptResultId(scriptResult.get("asrtextId"));
+ if (ObjectUtils.isNotEmpty(scriptInfoByCondition) && ObjectUtils.isNotEmpty(scriptInfoByCondition.get("script"))) {
+ log.error("-----------scriptInfoByCondition鐨勫�间负锛歿}",scriptInfoByCondition);
+ if (scriptInfoByCondition.get("type").equals("1")) {
+ List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
+ for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOList) {
+ Map<String, String> scriptResult = getScriptResult(serviceSubTaskQueryReq.getSubId(), serviceSubTaskQueryReq.getPatid(), ivrLibaTemplateScriptVO.getId());
+ if (ObjectUtils.isNotEmpty(scriptResult)) {
+ ivrLibaTemplateScriptVO.setScriptResult(scriptResult.get("asrtext"));
+ ivrLibaTemplateScriptVO.setScriptResultId(scriptResult.get("asrtextId"));
+ }
}
- }
- map.put("scriptResult", ivrLibaTemplateScriptVOList);
- map.put("taskName", scriptInfoByCondition.get("taskName"));
- return map;
- } else if (scriptInfoByCondition.get("type").equals("2")) {
- List<SvyLibTemplateScriptVO> svyLibTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
- for (SvyLibTemplateScriptVO svyLibTemplateScriptVO : svyLibTemplateScriptVOList) {
- Map<String, String> scriptResult = getScriptResult(serviceSubTaskQueryReq.getSubId(), serviceSubTaskQueryReq.getPatid(), svyLibTemplateScriptVO.getId());
- if (ObjectUtils.isNotEmpty(scriptResult)) {
- svyLibTemplateScriptVO.setScriptResult(scriptResult.get("asrtext"));
- svyLibTemplateScriptVO.setScriptResultId(scriptResult.get("asrtextId"));
+ map.put("scriptResult", ivrLibaTemplateScriptVOList);
+ map.put("taskName", scriptInfoByCondition.get("taskName"));
+ return map;
+ } else if (scriptInfoByCondition.get("type").equals("2")) {
+ List<SvyLibTemplateScriptVO> svyLibTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
+ for (SvyLibTemplateScriptVO svyLibTemplateScriptVO : svyLibTemplateScriptVOList) {
+ Map<String, String> scriptResult = getScriptResult(serviceSubTaskQueryReq.getSubId(), serviceSubTaskQueryReq.getPatid(), svyLibTemplateScriptVO.getId());
+ if (ObjectUtils.isNotEmpty(scriptResult)) {
+ svyLibTemplateScriptVO.setScriptResult(scriptResult.get("asrtext"));
+ svyLibTemplateScriptVO.setScriptResultId(scriptResult.get("asrtextId"));
+ }
}
+ map.put("scriptResult", scriptInfoByCondition);
+ map.put("taskName", scriptInfoByCondition.get("taskName"));
+ return map;
+ } else if (scriptInfoByCondition.get("type").equals("3")) {
+ //瀹ｆ暀涓嶉渶瑕佹煡鐪�
+ List<HeLibrary> heLibraryList = (List) scriptInfoByCondition.get("script");
+ map.put("scriptResult", heLibraryList);
+ map.put("taskName", scriptInfoByCondition.get("taskName"));
+ return map;
}
- map.put("scriptResult", scriptInfoByCondition);
- map.put("taskName", scriptInfoByCondition.get("taskName"));
- return map;
- } else if (scriptInfoByCondition.get("type").equals("3")) {
- //瀹ｆ暀涓嶉渶瑕佹煡鐪�
- List<HeLibrary> heLibraryList = (List) scriptInfoByCondition.get("script");
- map.put("scriptResult", heLibraryList);
- map.put("taskName", scriptInfoByCondition.get("taskName"));
- return map;
}
-
- return null;
+ return map;
}
private Map<String, String> getScriptResult(Long subid, Long pid, Long sid) {
--
Gitblit v1.9.3