From 0abbee42ed08582645795b4b98e2637cc10cfed0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 19 四月 2026 20:12:01 +0800
Subject: [PATCH] 修改一下fuFlag的默认值 fuFlag:0不要 1要（默认）
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 136 ++++++++++++++++++++++++++++++++-------------
1 files changed, 97 insertions(+), 39 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 99ea692..5dfdd5e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -14,9 +14,7 @@
import com.smartor.domain.VO.ServiceSubtaskDetailTraceVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.*;
-import com.smartor.service.IServiceSubtaskAnswerService;
-import com.smartor.service.IServiceSubtaskDetailTraceService;
-import com.smartor.service.IServiceTaskService;
+import com.smartor.service.*;
import com.sun.org.apache.bcel.internal.generic.NEW;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -75,6 +73,18 @@
@Autowired
private IServiceSubtaskDetailTraceService traceService;
+
+ @Autowired
+ private ISvyTaskTemplateService svyTaskTemplateService;
+
+ @Autowired
+ private ISvyLibTemplateScriptService svyLibTemplateScriptService;
+
+ @Autowired
+ private IIvrTaskTemplateService ivrTaskTemplateService;
+
+ @Autowired
+ private IIvrLibaTemplateScriptService ivrLibaTemplateScriptService;
@Value("${pri_key}")
private String pri_key;
@@ -154,6 +164,7 @@
public Integer saveQuestionAnswer(ServiceSubTaskAnswerReq serviceSubTaskAnswerReq, Long flag) {
Long tid = null;
Long pid = null;
+ Long subid = null;
Double score = null;
Long isabno = 0L;
Set<String> allKeys = redisCache.getAllKeys();
@@ -164,16 +175,18 @@
if (flag == 0) {
tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam1(), pri_key));
pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam2(), pri_key));
+ subid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam6(), pri_key));
} else if (flag == 1) {
tid = Long.valueOf(serviceSubTaskAnswerReq.getParam1());
pid = Long.valueOf(serviceSubTaskAnswerReq.getParam2());
+ subid = Long.valueOf(serviceSubTaskAnswerReq.getParam6());
}
if (serviceSubTaskAnswerReq.getType() != null && serviceSubTaskAnswerReq.getType() == 2) {
allKeys = new HashSet<>();
- allKeys.add(pid + "-" + tid + "-WJscriptCache");
+ allKeys.add(pid + "-" + tid + "-" + subid + "-WJscriptCache");
} else if (serviceSubTaskAnswerReq.getType() != null && serviceSubTaskAnswerReq.getType() == 1) {
allKeys = new HashSet<>();
- allKeys.add(pid + "-" + tid + "-SFscriptCache");
+ allKeys.add(pid + "-" + tid + "-" + subid + "-SFscriptCache");
}
}
@@ -183,7 +196,7 @@
String[] split = key.split("-");
//鍏堝垽鏂紝鏄笉鏄綋鍓嶆彁浜や汉鐨勶紝涓嶆槸褰撳墠鎻愪氦浜虹殑锛岃烦杩�
try {
- if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && !Long.valueOf(split[0]).equals(pid) && !Long.valueOf(split[1]).equals(tid)) {
+ if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && !Long.valueOf(split[0]).equals(pid) && !Long.valueOf(split[1]).equals(tid) && !Long.valueOf(split[2]).equals(subid)) {
continue;
}
} catch (Exception e) {
@@ -202,7 +215,7 @@
//璇存槑鏄涓�棰�
List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(0).getSvyTaskTemplateTargetoptions();
svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid);
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid);
if (map == null) continue aa;
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
@@ -224,7 +237,7 @@
if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
// log.error("svyTaskTemplateScriptVO鐨勫�间负锛歿}", svyTaskTemplateScriptVO);
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]));
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Long.valueOf(split[2]));
log.error("nextScriptNo鐨勪俊鎭负锛歿}", map.get("nextScriptNo"));
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
@@ -250,7 +263,7 @@
List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = cacheList.get(0).getIvrTaskScriptTargetoptionList();
// List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(ivrLibaTemplateTargetoptions, IvrTaskTemplateTargetoption.class);
ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
- Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid);
+ Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid);
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
if (score == null) {
@@ -267,7 +280,7 @@
ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
if (ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) {
- Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]));
+ Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Long.valueOf(split[2]));
log.error("----nextScriptNo2鐨勪俊鎭负锛歿}", map.get("nextScriptNo"));
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
@@ -325,6 +338,7 @@
public Integer saveQuestionDetail(ServiceSubTaskCacheReq serviceSubTaskCacheReq, Long flag) {
Long tid = Long.valueOf(serviceSubTaskCacheReq.getParam1());
Long pid = Long.valueOf(serviceSubTaskCacheReq.getParam2());
+ Long subid = Long.valueOf(serviceSubTaskCacheReq.getParam6());
Double score = null;
if (ObjectUtils.isNotEmpty(serviceSubTaskCacheReq)) {
Long nextScriptno = null;
@@ -341,7 +355,7 @@
//璇存槑鏄涓�棰�
List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(0).getSvyTaskTemplateTargetoptions();
svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid);
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid);
if (map == null) continue;
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
@@ -361,7 +375,7 @@
svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid);
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid);
log.error("nextScriptNo鐨勪俊鎭负锛歿}", map.get("nextScriptNo"));
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
@@ -376,19 +390,19 @@
}
} else if (serviceSubTaskCacheReq.getType() == 1) {
List<IvrTaskTemplateScriptVO> cacheList = serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList();
- cacheList.sort(Comparator.comparingLong(IvrTaskTemplateScriptVO::getSort));
+ cacheList.sort(Comparator.comparingLong(vo -> Optional.ofNullable(vo.getSort()).orElse(0)));
log.error("鐢佃瘽闅忚闂嵎鍥炵瓟缁撴灉锛歿}", cacheList.size());
for (int i = 0; i < cacheList.size(); i++) {
if (i == 0) {
//杩欎釜鏃堕棿瑕佹壘鍒扮涓�棰�
for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : cacheList) {
- if (ivrTaskTemplateScriptVO.getSort() == 1L) {
+ if (ivrTaskTemplateScriptVO.getSort() != null && ivrTaskTemplateScriptVO.getSort() == 1L) {
//璇存槑鏄涓�棰�
List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = cacheList.get(0).getIvrTaskScriptTargetoptionList();
ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
//瀹冧咯閮芥槸ivr_task_templatescript_id,鎵�浠ヨ繖閲岄渶瑕佽缃竴涓�
ivrTaskTemplateScriptVO.setId(ivrTaskTemplateScriptVO.getScriptID());
- Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid);
+ Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid);
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
if (score == null) {
@@ -406,7 +420,7 @@
ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
if (ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) {
- Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid);
+ Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid);
log.error("----nextScriptNo2鐨勪俊鎭负锛歿}", map.get("nextScriptNo"));
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
@@ -428,6 +442,7 @@
List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(ssVO);
ServiceSubtask serviceSubtask = new ServiceSubtask();
+ serviceSubtask.setId(subid);
serviceSubtask.setTaskid(tid);
serviceSubtask.setPatid(pid);
serviceSubtask.setSubmit(1L);
@@ -503,7 +518,7 @@
List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVOS.get(0).getSvyTaskTemplateTargetoptions();
// List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(svyTaskTemplateTargetoptions, SvyTaskTemplateTargetoption.class);
svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid);
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid, serviceSubTaskMYDAnswerReq.getSubId());
if (map == null) continue;
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
@@ -527,7 +542,7 @@
if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
log.error("svyTaskTemplateScriptVO鐨勫�间负锛歿}", svyTaskTemplateScriptVO);
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid);
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid, serviceSubTaskMYDAnswerReq.getSubId());
log.error("map鐨勪俊鎭负锛歿}", map);
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
@@ -636,28 +651,31 @@
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
Long tid = null;
Long pid = null;
+ Long subid = null;
if (flag == 0L) {
tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam1(), pri_key));
pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam2(), pri_key));
+ subid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam6(), pri_key));
} else if (flag == 1L) {
tid = Long.valueOf(serviceSubTaskCacheReq.getParam1());
pid = Long.valueOf(serviceSubTaskCacheReq.getParam2());
+ subid = Long.valueOf(serviceSubTaskCacheReq.getParam6());
}
if (CollectionUtils.isNotEmpty(serviceSubTaskCacheReq.getSvyTaskTemplateScriptVOS()) && serviceSubTaskCacheReq.getSvyTaskTemplateScriptVOS().size() > 0) {
//闂嵎
- redisCache.deleteObject(pid + "-" + tid + "-WJscriptCache");
- redisCache.setCacheListRight(pid + "-" + tid + "-WJscriptCache", serviceSubTaskCacheReq.getSvyTaskTemplateScriptVOS());
+ redisCache.deleteObject(pid + "-" + tid + "-" + subid + "-WJscriptCache");
+ redisCache.setCacheListRight(pid + "-" + tid + "-" + subid + "-WJscriptCache", serviceSubTaskCacheReq.getSvyTaskTemplateScriptVOS());
//璁剧疆杩囨湡鏃堕棿 3澶�
Long tims = Long.valueOf(3 * 24 * 3600);
- boolean expire = redisCache.expire(pid + "-" + tid + "-WJscriptCache", tims);
+ boolean expire = redisCache.expire(pid + "-" + tid + "-" + subid + "-WJscriptCache", tims);
return 1;
} else if (CollectionUtils.isNotEmpty(serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList()) && serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList().size() > 0) {
//闂嵎
- redisCache.deleteObject(pid + "-" + tid + "-SFscriptCache");
- redisCache.setCacheListRight(pid + "-" + tid + "-SFscriptCache", serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList());
+ redisCache.deleteObject(pid + "-" + tid + "-" + subid + "-SFscriptCache");
+ redisCache.setCacheListRight(pid + "-" + tid + "-" + subid + "-SFscriptCache", serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList());
//璁剧疆杩囨湡鏃堕棿 3澶�
Long tims = Long.valueOf(3 * 24 * 3600);
- redisCache.expire(pid + "-" + tid + "-SFscriptCache", tims);
+ redisCache.expire(pid + "-" + tid + "-" + subid + "-SFscriptCache", tims);
return 1;
}
} catch (Exception e) {
@@ -792,11 +810,12 @@
return null;
}
- private Map<String, String> setWJInfo(SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, Long taskid, Long patid) {
+ private Map<String, String> setWJInfo(SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, Long taskid, Long patid, Long subid) {
log.error("-----svyTaskTemplateScriptVO鐨勫�间负锛歿}", svyTaskTemplateScriptVO);
ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
serviceSubtaskVO.setTaskid(taskid);
serviceSubtaskVO.setPatid(patid);
+ serviceSubtaskVO.setSubId(subid);
List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
String score = "0";
//涓嬮璺宠浆
@@ -815,6 +834,9 @@
}
nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno();
+ if (StringUtils.isEmpty(nextScriptNo)) {
+ nextScriptNo = getNextScriptNo(svyTaskTemplateScriptVO.getTemplateID(), svyTaskTemplateScriptVO.getScriptContent());
+ }
if (svyTaskTemplateScriptVO.getScore() != null) {
score = String.valueOf(svyTaskTemplateScriptVO.getScore());
}
@@ -829,7 +851,10 @@
score = String.valueOf(svyTaskTemplateScriptVO.getScore());
}
}
- nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno().toString();
+ nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno();
+ if (StringUtils.isEmpty(nextScriptNo)) {
+ nextScriptNo = getNextScriptNo(svyTaskTemplateScriptVO.getTemplateID(), svyTaskTemplateScriptVO.getScriptContent());
+ }
}
ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(taskid);
serviceSubtaskDetailVO.setQuestiontext(svyTaskTemplateScriptVO.getScriptContent());
@@ -844,12 +869,12 @@
serviceSubtaskDetailVO.setCreateTime(new Date());
serviceSubtaskDetailVO.setUpdateTime(new Date());
serviceSubtaskDetailVO.setTemplateType(2);
- serviceSubtaskDetailVO.setLibTemplateid(CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.get(0).getLibtemplateid().intValue() : null);
+ serviceSubtaskDetailVO.setLibTemplateid(CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? (ObjectUtils.isNotEmpty(selectServiceSubtaskList.get(0).getLibtemplateid()) ? selectServiceSubtaskList.get(0).getLibtemplateid().intValue() : null) : null);
if (ObjectUtils.isNotEmpty(serviceTask)) {
serviceSubtaskDetailVO.setGuid(serviceTask.getGuid());
serviceSubtaskDetailVO.setOrgid(serviceTask.getOrgid());
}
- serviceSubtaskDetailVO.setSubId(CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.get(0).getId() : null);
+ serviceSubtaskDetailVO.setSubId(subid == null ? CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.get(0).getId() : null : subid);
serviceSubtaskDetailVO.setTemplatequestionnum(svyTaskTemplateScriptVO.getId());
ServiceSubtaskDetail serviceSubtaskDetail = DtoConversionUtils.sourceToTarget(serviceSubtaskDetailVO, ServiceSubtaskDetail.class);
@@ -922,8 +947,7 @@
if (CollectionUtils.isNotEmpty(serviceSubtaskDetailTraces)) {
subtaskDetailTrace.setId(serviceSubtaskDetailTraces.get(0).getId());
traceService.updateServiceSubtaskDetailTtrace(subtaskDetailTrace);
- }
- else traceService.insertServiceSubtaskDetailTtrace(subtaskDetailTrace);
+ } else traceService.insertServiceSubtaskDetailTtrace(subtaskDetailTrace);
} else if (ObjectUtils.isNotEmpty(stt) && stt.getIsabnormal() != 1L) {
//杩欓噷涓昏鏄�曞尰鎶や汉鍛樻妸寮傚父閫夐」鏀规垚浜嗛潪寮傚父鐨勶紝杩欓噷灏遍渶瑕佹煡涓�涓嬭繖鏉℃暟鎹槸涓嶆槸鍦ㄦ弧鎰忓害寮傚父琛紝濡傛灉鍦紝鍒欒鍒犻櫎
ServiceSubtaskDetailTraceVO subtaskDetailTraceVO = new ServiceSubtaskDetailTraceVO();
@@ -949,6 +973,33 @@
map.put("isabnormal", isabnormalFlag.toString());
return map;
}
+
+ private String getNextScriptNo(Long taskTemplateID, String scriptContent) {
+ SvyTaskTemplate svyTaskTemplate = svyTaskTemplateService.selectSvyTaskTemplateBySvyid(taskTemplateID);
+ SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
+ svyLibTemplateScript.setSvyid(svyTaskTemplate.getTemplateid());
+ svyLibTemplateScript.setScriptContent(scriptContent);
+ List<SvyLibTemplateScript> svyLibTemplateScriptList = svyLibTemplateScriptService.selectSvyLibTemplateScriptList(svyLibTemplateScript);
+ if (CollectionUtils.isNotEmpty(svyLibTemplateScriptList)) {
+ return svyLibTemplateScriptList.get(0).getNextScriptno();
+ }
+ return null;
+ }
+
+ private Long getVoiceNextScriptNo(Long taskTemplateID, String scriptContent) {
+ IvrTaskTemplate ivrTaskTemplate = ivrTaskTemplateService.selectIvrTaskTemplateByID(taskTemplateID);
+ IvrLibaTemplateScript ivrLibaTemplateScript = new IvrLibaTemplateScript();
+ if (StringUtils.isEmpty(ivrTaskTemplate.getLibtemplateid())) return null;
+ ivrLibaTemplateScript.setTemplateid(Long.valueOf(ivrTaskTemplate.getLibtemplateid()));
+ ivrLibaTemplateScript.setScriptContent(scriptContent);
+ List<IvrLibaTemplateScript> ivrLibaTemplateScriptList = ivrLibaTemplateScriptService.selectIvrLibaTemplateScriptList(ivrLibaTemplateScript);
+
+ if (CollectionUtils.isNotEmpty(ivrLibaTemplateScriptList)) {
+ return ivrLibaTemplateScriptList.get(0).getNextScriptno();
+ }
+ return null;
+ }
+
private Boolean sendTaskIds(List<Integer> sendTaskids, ServiceSubtask serviceSubtask) {
for (Integer taskId : sendTaskids) {
@@ -1033,10 +1084,11 @@
return commonTaskcallMQJson;
}
- private Map<String, String> setSFInfo(IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO, Long taskid, Long patid) {
+ private Map<String, String> setSFInfo(IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO, Long taskid, Long patid, Long subid) {
ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
serviceSubtaskVO.setTaskid(taskid);
serviceSubtaskVO.setPatid(patid);
+ serviceSubtaskVO.setPatid(subid);
List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
String score = "0";
@@ -1044,7 +1096,7 @@
String nextScriptNo = null;
ServiceSubtaskDetailVO serviceSubtaskDetailVO = new ServiceSubtaskDetailVO();
String isabnormalFlag = "0";
- if (ivrTaskTemplateScriptVO.getScriptType().equals("1") || ivrTaskTemplateScriptVO.getScriptType().equals("2")) {
+ if (ivrTaskTemplateScriptVO.getScriptType() != null && (ivrTaskTemplateScriptVO.getScriptType().equals("1") || ivrTaskTemplateScriptVO.getScriptType().equals("2"))) {
//1銆�2涓哄崟閫夋垨澶氶��
for (IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption : ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList()) {
//灏嗛棶棰橀�夐」璁板綍涓嬫潵
@@ -1056,6 +1108,10 @@
}
nextScriptNo = ivrTaskTemplateScriptVO.getNextScriptno() == null ? null : ivrTaskTemplateScriptVO.getNextScriptno().toString();
+ if (StringUtils.isEmpty(nextScriptNo)) {
+ nextScriptNo = "" + getVoiceNextScriptNo(ivrTaskTemplateScriptVO.getTemplateID(), ivrTaskTemplateScriptVO.getScriptContent());
+ }
+
if (ivrTaskTemplateScriptVO.getScore() != null) {
score = String.valueOf(ivrTaskTemplateScriptVO.getScore());
}
@@ -1069,11 +1125,14 @@
}
} else {
//闈炲崟澶氶��
- if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getQuestionResult())) {
- serviceSubtaskDetailVO.setAsrtext(ivrTaskTemplateScriptVO.getQuestionResult().replaceAll("^\"|\"$", ""));
- serviceSubtaskDetailVO.setMatchedtext(ivrTaskTemplateScriptVO.getQuestionResult().replaceAll("^\"|\"$", ""));
+ if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getQuestionResult()) || StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrtext())) {
+ serviceSubtaskDetailVO.setAsrtext(ivrTaskTemplateScriptVO.getQuestionResult() != null ? ivrTaskTemplateScriptVO.getQuestionResult().replaceAll("^\"|\"$", "") : ivrTaskTemplateScriptVO.getIvrtext());
+ serviceSubtaskDetailVO.setMatchedtext(ivrTaskTemplateScriptVO.getQuestionResult() != null ? ivrTaskTemplateScriptVO.getQuestionResult().replaceAll("^\"|\"$", "") : ivrTaskTemplateScriptVO.getIvrtext());
serviceSubtaskDetailVO.setScore(ivrTaskTemplateScriptVO.getScore() != null ? ivrTaskTemplateScriptVO.getScore().toString() : "0");
nextScriptNo = ivrTaskTemplateScriptVO.getNextScriptno() == null ? null : ivrTaskTemplateScriptVO.getNextScriptno().toString();
+ if (StringUtils.isEmpty(nextScriptNo)) {
+ nextScriptNo = "" + getVoiceNextScriptNo(ivrTaskTemplateScriptVO.getTemplateID(), ivrTaskTemplateScriptVO.getScriptContent());
+ }
if (ivrTaskTemplateScriptVO.getScore() != null) {
score = String.valueOf(ivrTaskTemplateScriptVO.getScore());
}
@@ -1091,7 +1150,7 @@
serviceSubtaskDetailVO.setGuid(ivrTaskTemplateScriptVO.getGuid());
serviceSubtaskDetailVO.setOrgid(ivrTaskTemplateScriptVO.getOrgid());
serviceSubtaskDetailVO.setUpdateTime(new Date());
- serviceSubtaskDetailVO.setSubId(selectServiceSubtaskList.get(0).getId());
+ serviceSubtaskDetailVO.setSubId(subid == null ? selectServiceSubtaskList.get(0).getId() : subid);
serviceSubtaskDetailVO.setTemplatequestionnum(ivrTaskTemplateScriptVO.getId());
serviceSubtaskDetailVO.setTemplateType(1);
serviceSubtaskDetailVO.setTemplateid(ivrTaskTemplateScriptVO.getTemplateID() == null ? null : ivrTaskTemplateScriptVO.getTemplateID().toString());
@@ -1168,9 +1227,8 @@
if (CollectionUtils.isNotEmpty(serviceSubtaskDetailTraces)) {
subtaskDetailTrace.setId(serviceSubtaskDetailTraces.get(0).getId());
traceService.updateServiceSubtaskDetailTtrace(subtaskDetailTrace);
- }
- else traceService.insertServiceSubtaskDetailTtrace(subtaskDetailTrace);
- } else if (stt.getIsabnormal() != null && stt.getIsabnormal() != 1L) {
+ } else traceService.insertServiceSubtaskDetailTtrace(subtaskDetailTrace);
+ } else if (stt != null && stt.getIsabnormal() != null && stt.getIsabnormal() != 1L) {
//杩欓噷涓昏鏄�曞尰鎶や汉鍛樻妸寮傚父閫夐」鏀规垚浜嗛潪寮傚父鐨勶紝杩欓噷灏遍渶瑕佹煡涓�涓嬭繖鏉℃暟鎹槸涓嶆槸鍦ㄦ弧鎰忓害寮傚父琛紝濡傛灉鍦紝鍒欒鍒犻櫎
ServiceSubtaskDetailTraceVO subtaskDetailTraceVO = new ServiceSubtaskDetailTraceVO();
subtaskDetailTraceVO.setSubId(serviceSubtaskDetailVO.getSubId());
--
Gitblit v1.9.3