From c62e26954e41360fc6a2efc874815aa84f8b0073 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期三, 21 五月 2025 14:45:10 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 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 bf54388..383e489 100644 --- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java +++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java @@ -287,7 +287,7 @@ tid = Long.valueOf(serviceSubTaskCacheReq.getParam1()); pid = Long.valueOf(serviceSubTaskCacheReq.getParam2()); } - if (serviceSubTaskCacheReq.getType() != null && serviceSubTaskCacheReq.getType() == 2) { + if (CollectionUtils.isNotEmpty(serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS()) && serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS().size() > 0) { //闂嵎 redisCache.deleteObject(pid + "-" + tid + "-WJscriptCache"); redisCache.setCacheListRight(pid + "-" + tid + "-WJscriptCache", serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS()); @@ -295,7 +295,7 @@ Long tims = Long.valueOf(3 * 24 * 3600); boolean expire = redisCache.expire(pid + "-" + tid + "-WJscriptCache", tims); return 1; - } else if (serviceSubTaskCacheReq.getType() != null && serviceSubTaskCacheReq.getType() == 1) { + } else if (CollectionUtils.isNotEmpty(serviceSubTaskCacheReq.getIvrLibaTemplateScriptVOList()) && serviceSubTaskCacheReq.getIvrLibaTemplateScriptVOList().size() > 0) { //闂嵎 redisCache.deleteObject(pid + "-" + tid + "-SFscriptCache"); redisCache.setCacheListRight(pid + "-" + tid + "-SFscriptCache", serviceSubTaskCacheReq.getIvrLibaTemplateScriptVOList()); @@ -478,8 +478,8 @@ if (svyTaskTemplateScriptVO.getScore() != null) { score = String.valueOf(svyTaskTemplateScriptVO.getScore()); } - serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", "")); - serviceSubtaskDetailVO.setMatchedtext(svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", "")); + serviceSubtaskDetailVO.setAsrtext(StringUtils.isEmpty(svyTaskTemplateScriptVO.getScriptResult()) ? "" : svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", "")); + serviceSubtaskDetailVO.setMatchedtext(StringUtils.isEmpty(svyTaskTemplateScriptVO.getScriptResult()) ? "" : svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", "")); // if (StringUtils.isEmpty(serviceSubtaskDetailVO.getAsrtext())) { // nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno().toString(); // } @@ -509,7 +509,7 @@ serviceSubtaskDetailVO.setGuid(serviceTask.getGuid()); serviceSubtaskDetailVO.setOrgid(serviceTask.getOrgid()); } - serviceSubtaskDetailVO.setSubId(selectServiceSubtaskList.get(0).getId()); + serviceSubtaskDetailVO.setSubId(CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.get(0).getId() : null); serviceSubtaskDetailVO.setTemplatequestionnum(svyTaskTemplateScriptVO.getId()); ServiceSubtaskDetail serviceSubtaskDetail = DtoConversionUtils.sourceToTarget(serviceSubtaskDetailVO, ServiceSubtaskDetail.class); serviceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail); -- Gitblit v1.9.3