From 09f75e1b4ee21241940ad26b91462ea15c5e4f00 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 03 七月 2026 09:25:29 +0800
Subject: [PATCH] 1.短信功能提交 2.优化随访详情页 3.导出两个sheet
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 138 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 31 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 162d9a1..07484ad 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -348,6 +348,15 @@
List<SvyTaskTemplateScriptVO> cacheList = serviceSubTaskCacheReq.getSvyTaskTemplateScriptVOS();
cacheList.sort(Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));
log.info("闂嵎鍥炵瓟缁撴灉锛歿}", cacheList);
+ // 棰勬煡璇㈠惊鐜腑涓嶅彉鐨勬暟鎹紝閬垮厤姣忛閲嶅鏌ユ暟鎹簱
+ ServiceSubtaskEntity preSubtaskVO = new ServiceSubtaskEntity();
+ preSubtaskVO.setTaskid(tid);
+ preSubtaskVO.setPatid(pid);
+ preSubtaskVO.setSubId(subid);
+ List<ServiceSubtask> preServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(preSubtaskVO);
+ ServiceTask preServiceTask = serviceTaskService.selectServiceTaskByTaskid(tid);
+ Map<Long, Long> preDetailIdMap = getExistingDetailIdMap(subid);
+ Map<Long, Long> preTraceIdMap = getExistingTraceIdMap(subid);
for (int i = 0; i < cacheList.size(); i++) {
if (i == 0) {
//杩欎釜鏃堕棿瑕佹壘鍒扮涓�棰�
@@ -356,7 +365,7 @@
//璇存槑鏄涓�棰�
List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions();
svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid);
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid, preServiceSubtaskList, preServiceTask, preDetailIdMap, preTraceIdMap);
if (map == null) continue;
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
@@ -376,7 +385,7 @@
svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid);
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid, preServiceSubtaskList, preServiceTask, preDetailIdMap, preTraceIdMap);
log.error("nextScriptNo鐨勪俊鎭负锛歿}", map.get("nextScriptNo"));
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
@@ -764,25 +773,29 @@
if (ObjectUtils.isNotEmpty(scriptInfoByCondition) && ObjectUtils.isNotEmpty(scriptInfoByCondition.get("script"))) {
if (scriptInfoByCondition.get("type").equals("1")) {
List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVOS = (List<IvrTaskTemplateScriptVO>) scriptInfoByCondition.get("script");
+ // 鎵归噺鏌ヨ鎵�鏈夋槑缁嗭紝閬垮厤寰幆涓�愭潯鏌ユ暟鎹簱锛圢+1闂浼樺寲锛�
+ Map<Long, ServiceSubtaskDetail> detailMap = getScriptResultMap(subid, patid);
for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : ivrTaskTemplateScriptVOS) {
- Map<String, String> scriptResult = getScriptResult(subid, patid, ivrTaskTemplateScriptVO.getId());
- if (ObjectUtils.isNotEmpty(scriptResult)) {
- ivrTaskTemplateScriptVO.setScriptResult(scriptResult.get("asrtext"));
- ivrTaskTemplateScriptVO.setScriptResultId(scriptResult.get("asrtextId"));
+ ServiceSubtaskDetail detail = detailMap.get(ivrTaskTemplateScriptVO.getId());
+ if (detail != null) {
+ ivrTaskTemplateScriptVO.setScriptResult(detail.getAsrtext());
+ ivrTaskTemplateScriptVO.setScriptResultId(String.valueOf(detail.getId()));
}
}
map.put("scriptResult", ivrTaskTemplateScriptVOS);
map.put("taskName", scriptInfoByCondition.get("taskName"));
} else if (scriptInfoByCondition.get("type").equals("2")) {
List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
+ // 鎵归噺鏌ヨ鎵�鏈夋槑缁嗭紝閬垮厤寰幆涓�愭潯鏌ユ暟鎹簱锛圢+1闂浼樺寲锛�
+ Map<Long, ServiceSubtaskDetail> detailMap = getScriptResultMap(subid, patid);
for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : svyTaskTemplateScriptVOList) {
- Map<String, String> scriptResult = getScriptResult(subid, patid, svyTaskTemplateScriptVO.getId());
- if (ObjectUtils.isNotEmpty(scriptResult)) {
- if (StringUtils.isNotEmpty(scriptResult.get("asrtext")))
- svyTaskTemplateScriptVO.setScriptResult(StringUtils.isNotEmpty(scriptResult.get("asrtext")) ? scriptResult.get("asrtext").replaceAll("^(\"|')(.*)\\1$", "$2") : "");
- svyTaskTemplateScriptVO.setScriptResultId(scriptResult.get("asrtextId"));
- if (StringUtils.isNotEmpty(scriptResult.get("answerps")))
- svyTaskTemplateScriptVO.setAnswerps(scriptResult.get("answerps"));
+ ServiceSubtaskDetail detail = detailMap.get(svyTaskTemplateScriptVO.getId());
+ if (detail != null) {
+ if (StringUtils.isNotEmpty(detail.getAsrtext()))
+ svyTaskTemplateScriptVO.setScriptResult(detail.getAsrtext().replaceAll("^(\"|')(.*)\\1$", "$2"));
+ svyTaskTemplateScriptVO.setScriptResultId(String.valueOf(detail.getId()));
+ if (StringUtils.isNotEmpty(detail.getAnswerps()))
+ svyTaskTemplateScriptVO.setAnswerps(detail.getAnswerps());
}
}
map.put("scriptResult", svyTaskTemplateScriptVOList);
@@ -795,6 +808,31 @@
}
}
return map;
+ }
+
+ /**
+ * 鎵归噺鏌ヨ瀛愪换鍔℃槑缁嗗苟鎸塻criptid鍒嗙粍锛岄伩鍏嶅惊鐜腑閫愭潯鏌ユ暟鎹簱
+ *
+ * @param subid 瀛愪换鍔D
+ * @param pid 鎮ｈ�匢D
+ * @return key=scriptid, value=瀵瑰簲鐨勭涓�鏉erviceSubtaskDetail
+ */
+ private Map<Long, ServiceSubtaskDetail> getScriptResultMap(Long subid, Long pid) {
+ ServiceSubtaskDetail query = new ServiceSubtaskDetail();
+ query.setSubId(subid);
+ query.setPatid(pid);
+ List<ServiceSubtaskDetail> details = serviceSubtaskDetailMapper.selectServiceSubtaskDetailList(query);
+ if (CollectionUtils.isEmpty(details)) {
+ return Collections.emptyMap();
+ }
+ Map<Long, ServiceSubtaskDetail> result = new HashMap<>();
+ for (ServiceSubtaskDetail detail : details) {
+ // 鍚屼竴涓猻criptid鍙兘鏈夊鏉¤褰曪紝鍙彇绗竴鏉★紙涓庡師閫昏緫涓�鑷达級
+ if (!result.containsKey(detail.getScriptid())) {
+ result.put(detail.getScriptid(), detail);
+ }
+ }
+ return result;
}
@@ -821,6 +859,52 @@
serviceSubtaskVO.setPatid(patid);
serviceSubtaskVO.setSubId(subid);
List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+ ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(taskid);
+ Map<Long, Long> existingDetailIdMap = getExistingDetailIdMap(subid);
+ Map<Long, Long> existingTraceIdMap = getExistingTraceIdMap(subid);
+ return setWJInfo(svyTaskTemplateScriptVO, taskid, patid, subid, selectServiceSubtaskList, serviceTask, existingDetailIdMap, existingTraceIdMap);
+ }
+
+ /**
+ * 鎵归噺鏌ヨ宸插瓨鍦ㄧ殑鏄庣粏璁板綍ID锛屾寜scriptid鍒嗙粍锛堥伩鍏嶅惊鐜腑閫愭潯鏌ヨ锛�
+ */
+ private Map<Long, Long> getExistingDetailIdMap(Long subid) {
+ if (subid == null) return Collections.emptyMap();
+ ServiceSubtaskDetail query = new ServiceSubtaskDetail();
+ query.setSubId(subid);
+ List<ServiceSubtaskDetail> details = serviceSubtaskDetailMapper.selectServiceSubtaskDetailList(query);
+ if (CollectionUtils.isEmpty(details)) return Collections.emptyMap();
+ Map<Long, Long> map = new HashMap<>();
+ for (ServiceSubtaskDetail d : details) {
+ if ((d.getDelFlag() == null || "0".equals(d.getDelFlag())) && d.getScriptid() != null && !map.containsKey(d.getScriptid())) {
+ map.put(d.getScriptid(), d.getId());
+ }
+ }
+ return map;
+ }
+
+ /**
+ * 鎵归噺鏌ヨ寮傚父璺熻釜璁板綍ID锛屾寜scriptid鍒嗙粍锛堥伩鍏嶅惊鐜腑閫愭潯鏌ヨ锛�
+ */
+ private Map<Long, Long> getExistingTraceIdMap(Long subid) {
+ if (subid == null) return Collections.emptyMap();
+ ServiceSubtaskDetailTraceVO query = new ServiceSubtaskDetailTraceVO();
+ query.setSubId(subid);
+ List<ServiceSubtaskDetailTrace> traces = traceService.selectServiceSubtaskDetailTtraceList(query);
+ if (CollectionUtils.isEmpty(traces)) return Collections.emptyMap();
+ Map<Long, Long> map = new HashMap<>();
+ for (ServiceSubtaskDetailTrace t : traces) {
+ if (t.getScriptid() != null && !map.containsKey(t.getScriptid())) {
+ map.put(t.getScriptid(), t.getId());
+ }
+ }
+ return map;
+ }
+
+ private Map<String, String> setWJInfo(SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, Long taskid, Long patid, Long subid,
+ List<ServiceSubtask> selectServiceSubtaskList, ServiceTask serviceTask,
+ Map<Long, Long> existingDetailIdMap, Map<Long, Long> existingTraceIdMap) {
+ log.error("-----svyTaskTemplateScriptVO鐨勫�间负锛歿}", svyTaskTemplateScriptVO);
String score = "0";
//涓嬮璺宠浆
String nextScriptNo = null;
@@ -860,7 +944,6 @@
nextScriptNo = getNextScriptNo(svyTaskTemplateScriptVO.getTemplateID(), svyTaskTemplateScriptVO.getScriptContent());
}
}
- ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(taskid);
serviceSubtaskDetailVO.setQuestiontext(svyTaskTemplateScriptVO.getScriptContent());
serviceSubtaskDetailVO.setIsMydException(svyTaskTemplateScriptVO.getIsMydException());
serviceSubtaskDetailVO.setDimension(svyTaskTemplateScriptVO.getDimension());
@@ -884,10 +967,10 @@
serviceSubtaskDetailVO.setTemplatequestionnum(svyTaskTemplateScriptVO.getId());
ServiceSubtaskDetail serviceSubtaskDetail = DtoConversionUtils.sourceToTarget(serviceSubtaskDetailVO, ServiceSubtaskDetail.class);
- //鍏堢敤subid鍜宻criptid鏌ヨ涓�涓嬫槸鍚﹀瓨鍦紝濡傛灉瀛樺湪鍒欐洿鏂帮紝涓嶅瓨鍦ㄥ垯鎻掑叆
- ServiceSubtaskDetailDTO existServiceSubtaskDetail = serviceSubtaskDetailMapper.isExistServiceSubtaskDetail(serviceSubtaskDetailVO.getSubId(), serviceSubtaskDetailVO.getScriptid());
- if (ObjectUtils.isNotEmpty(existServiceSubtaskDetail)) {
- serviceSubtaskDetail.setId(existServiceSubtaskDetail.getId());
+ //鍏堢敤subid鍜宻criptid鏌ヨ涓�涓嬫槸鍚﹀瓨鍦紝濡傛灉瀛樺湪鍒欐洿鏂帮紝涓嶅瓨鍦ㄥ垯鎻掑叆锛堜娇鐢ㄩ鏌ヨ鐨凪ap锛岄伩鍏嶉�愭潯鏌ユ暟鎹簱锛�
+ Long existDetailId = existingDetailIdMap.get(serviceSubtaskDetailVO.getScriptid());
+ if (existDetailId != null) {
+ serviceSubtaskDetail.setId(existDetailId);
serviceSubtaskDetail.setUpdateTime(new Date());
serviceSubtaskDetailMapper.updateServiceSubtaskDetail(serviceSubtaskDetail);
} else {
@@ -945,23 +1028,16 @@
subtaskDetailTrace.setUpdateTime(new Date());
subtaskDetailTrace.setOrgid(selectServiceSubtaskList.get(0).getOrgid());
- ServiceSubtaskDetailTraceVO ssdt = new ServiceSubtaskDetailTraceVO();
- ssdt.setSubId(subtaskDetailTrace.getSubId());
- ssdt.setScriptid(subtaskDetailTrace.getScriptid());
- ssdt.setTemplateType(subtaskDetailTrace.getTemplateType());
- List<ServiceSubtaskDetailTrace> serviceSubtaskDetailTraces = traceService.selectServiceSubtaskDetailTtraceList(ssdt);
- if (CollectionUtils.isNotEmpty(serviceSubtaskDetailTraces)) {
- subtaskDetailTrace.setId(serviceSubtaskDetailTraces.get(0).getId());
+ Long existTraceId = existingTraceIdMap.get(subtaskDetailTrace.getScriptid());
+ if (existTraceId != null) {
+ subtaskDetailTrace.setId(existTraceId);
traceService.updateServiceSubtaskDetailTtrace(subtaskDetailTrace);
} else traceService.insertServiceSubtaskDetailTtrace(subtaskDetailTrace);
} else if (ObjectUtils.isNotEmpty(stt) && stt.getIsabnormal() != 1L) {
//杩欓噷涓昏鏄�曞尰鎶や汉鍛樻妸寮傚父閫夐」鏀规垚浜嗛潪寮傚父鐨勶紝杩欓噷灏遍渶瑕佹煡涓�涓嬭繖鏉℃暟鎹槸涓嶆槸鍦ㄦ弧鎰忓害寮傚父琛紝濡傛灉鍦紝鍒欒鍒犻櫎
- ServiceSubtaskDetailTraceVO subtaskDetailTraceVO = new ServiceSubtaskDetailTraceVO();
- subtaskDetailTraceVO.setSubId(serviceSubtaskDetailVO.getSubId());
- subtaskDetailTraceVO.setScriptid(svyTaskTemplateScriptVO.getId());
- List<ServiceSubtaskDetailTrace> serviceSubtaskDetailTraces = traceService.selectServiceSubtaskDetailTtraceList(subtaskDetailTraceVO);
- if (CollectionUtils.isNotEmpty(serviceSubtaskDetailTraces)) {
- traceService.deleteServiceSubtaskDetailTtraceById(serviceSubtaskDetailTraces.get(0).getId());
+ Long existTraceId = existingTraceIdMap.get(svyTaskTemplateScriptVO.getId());
+ if (existTraceId != null) {
+ traceService.deleteServiceSubtaskDetailTtraceById(existTraceId);
}
}
--
Gitblit v1.9.3