smartor.git - Gitblit

			@@ -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());
			@@ -402,6 +402,8 @@
			if (StringUtils.isNotEmpty(scriptResult.get("asrtext")))
			svyLibTemplateScriptVO.setScriptResult(StringUtils.isNotEmpty(scriptResult.get("asrtext")) ? scriptResult.get("asrtext").replaceAll("^(\"\|')(.*)\\1$", "$2") : "");
			svyLibTemplateScriptVO.setScriptResultId(scriptResult.get("asrtextId"));
			if (StringUtils.isNotEmpty(scriptResult.get("answerps")))
			svyLibTemplateScriptVO.setAnswerps(scriptResult.get("answerps"));
			}
			}
			map.put("scriptResult", svyLibTemplateScriptVOList);
			@@ -427,6 +429,7 @@
			if (CollectionUtils.isNotEmpty(serviceSubtaskDetails)) {
			map.put("asrtext", serviceSubtaskDetails.get(0).getAsrtext());
			map.put("asrtextId", serviceSubtaskDetails.get(0).getId());
			map.put("answerps", serviceSubtaskDetails.get(0).getAnswerps());
			return map;
			}
			return null;
			@@ -478,8 +481,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 +512,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);