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
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 19 +
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 96 +++++++++++++
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 6
smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java | 7 +
smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java | 7 +
smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailRatioExport.java | 42 ++++++
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 138 +++++++++++++++----
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 43 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java | 12 +
9 files changed, 332 insertions(+), 38 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index f73cbce..4db09ad 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -224,10 +224,10 @@
/**
- * 瀵煎嚭鍗曚竴浠诲姟锛堥殢璁垮鏁欙級鍒楄〃
+ * 瀵煎嚭鍗曚竴浠诲姟鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
- @Log(title = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級", businessType = BusinessType.EXPORT)
+ @Log(title = "鍗曚竴浠诲姟", businessType = BusinessType.EXPORT)
@PostMapping("/patItemExport")
public void patItemExport(HttpServletResponse response, ServiceSubtaskEntity serviceSubtaskVO) {
LoginUser loginUser = getLoginUser();
@@ -238,6 +238,7 @@
serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO);
}
List<ServiceSubtaskExport> serviceSubtaskExports = null;
+ List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = null;
if (!CollectionUtils.isEmpty(serviceSubtaskList)) {
serviceSubtaskExports = DtoConversionUtils.sourceToTarget(serviceSubtaskList, ServiceSubtaskExport.class);
for (ServiceSubtaskExport serviceSubtaskExport : serviceSubtaskExports) {
@@ -255,11 +256,17 @@
}
}
- }
- ExcelUtil<ServiceSubtaskExport> util = new ExcelUtil<ServiceSubtaskExport>(ServiceSubtaskExport.class);
- util.exportExcel(response, serviceSubtaskExports, "鎮ｈ�呴殢璁夸俊鎭〃鍗�");
- }
+ //鑾峰彇serviceSubtaskList涓殑鎵�鏈塼askid
+ List<Long> taskIds = serviceSubtaskList.stream().map(ServiceSubtaskRes::getTaskid).filter(ObjectUtils::isNotEmpty).distinct().collect(Collectors.toList());
+ serviceSubtaskDetailRatioExports = serviceSubtaskService.statQuestionOption(taskIds);
+ }
+
+
+ ExcelUtil<ServiceSubtaskExport> util = new ExcelUtil<ServiceSubtaskExport>(ServiceSubtaskExport.class);
+ util.exportExcelTwoSheet(response, serviceSubtaskExports, "鎮ｈ�呴殢璁夸俊鎭〃鍗�",
+ serviceSubtaskDetailRatioExports, "闂璇︽儏鍗犳瘮", ServiceSubtaskDetailRatioExport.class);
+ }
/**
* 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java
index 8607f25..1342158 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java
@@ -5,6 +5,8 @@
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -39,11 +41,16 @@
//@PreAuthorize("@ss.hasPermi('smartor:smstemplet:list')")
@PostMapping("/list")
public Map<String, Object> list(@RequestBody SmsTemplet smsTemplet) {
+ if (StringUtils.isEmpty(smsTemplet.getUserName()) && StringUtils.isEmpty(smsTemplet.getWardCode()) && StringUtils.isEmpty(smsTemplet.getDeptCode())) {
+ SysUser user = getLoginUser().getUser();
+ smsTemplet.setUserName(user.getUserName());
+ smsTemplet.setNickName(user.getNickName());
+ }
//杩欎釜涓嶉渶瑕佸垎椤碉紝涓�涓瀹や篃涓嶄細鏈夊灏戞潯鐭俊妯℃澘
smsTemplet.setPageNum(null);
smsTemplet.setPageSize(null);
List<SmsTemplet> list = smsTempletService.selectSmsTempletList(smsTemplet);
- return getDataTable3(ObjectUtil.isNotEmpty(list)?list.size():0, list);
+ return getDataTable3(ObjectUtil.isNotEmpty(list) ? list.size() : 0, list);
}
/**
@@ -74,6 +81,9 @@
@Log(title = "鐭俊妯℃澘", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SmsTemplet smsTemplet) {
+ SysUser user = getLoginUser().getUser();
+ smsTemplet.setUserName(user.getUserName());
+ smsTemplet.setNickName(user.getNickName());
return toAjax(smsTempletService.insertSmsTemplet(smsTemplet));
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 06e482e..f17faa3 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -442,6 +442,102 @@
}
/**
+ * 瀵煎嚭鍖呭惈涓や釜Sheet鐨凟xcel
+ * Sheet1: 鍩轰簬褰撳墠娉涘瀷绫诲瀷T鐨勬敞瑙ｅ鍑�
+ * Sheet2: 鍩轰簬浼犲叆鐨刢lazz2绫诲瀷鐨勬敞瑙ｅ鍑�
+ *
+ * @param response 杩斿洖鏁版嵁
+ * @param list1 绗竴涓猄heet鐨勬暟鎹泦鍚�
+ * @param sheetName1 绗竴涓猄heet鐨勫悕绉�
+ * @param list2 绗簩涓猄heet鐨勬暟鎹泦鍚�
+ * @param sheetName2 绗簩涓猄heet鐨勫悕绉�
+ * @param clazz2 绗簩涓猄heet鏁版嵁瀵硅薄鐨凜lass
+ */
+ public void exportExcelTwoSheet(HttpServletResponse response,
+ List<T> list1, String sheetName1,
+ List<?> list2, String sheetName2, Class<?> clazz2) {
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ // 鍒濆鍖栧苟鍐欏叆Sheet1
+ this.init(list1, sheetName1, StringUtils.EMPTY, Type.EXPORT);
+ writeSheet();
+ // 杩藉姞鍐欏叆Sheet2
+ writeAdditionalSheet(list2, sheetName2, clazz2);
+ // 杈撳嚭鍒板搷搴旀祦
+ try {
+ wb.write(response.getOutputStream());
+ } catch (Exception e) {
+ log.error("瀵煎嚭Excel寮傚父{}", e.getMessage());
+ } finally {
+ IOUtils.closeQuietly(wb);
+ }
+ }
+
+ /**
+ * 鍚戝綋鍓嶅伐浣滅翱杩藉姞鍐欏叆涓�涓猄heet
+ *
+ * @param dataList 鏁版嵁闆嗗悎
+ * @param sheetName Sheet鍚嶇О
+ * @param dataClazz 鏁版嵁瀵硅薄鐨凜lass
+ */
+ @SuppressWarnings("unchecked")
+ public void writeAdditionalSheet(List<?> dataList, String sheetName, Class<?> dataClazz) {
+ if (dataList == null) {
+ dataList = new ArrayList<>();
+ }
+ // 淇濆瓨鍘熷鐘舵��
+ Class<T> originClazz = this.clazz;
+ List<Object[]> originFields = this.fields;
+ List<T> originList = this.list;
+ String originSheetName = this.sheetName;
+ int originRownum = this.rownum;
+ List<Field> originSubFields = this.subFields;
+ Method originSubMethod = this.subMethod;
+ int originSubMergedFirstRowNum = this.subMergedFirstRowNum;
+ int originSubMergedLastRowNum = this.subMergedLastRowNum;
+ Map<Integer, Double> originStatistics = this.statistics;
+ short originMaxHeight = this.maxHeight;
+
+ // 璁剧疆鏂扮被鍨�
+ this.clazz = (Class<T>) dataClazz;
+ this.list = (List<T>) dataList;
+ this.sheetName = sheetName;
+ this.rownum = 0;
+ this.subFields = null;
+ this.subMethod = null;
+ this.subMergedFirstRowNum = 1;
+ this.subMergedLastRowNum = 0;
+ this.statistics = new HashMap<Integer, Double>();
+
+ // 鍒涘缓鏂癝heet
+ this.sheet = wb.createSheet();
+ wb.setSheetName(wb.getNumberOfSheets() - 1, sheetName);
+
+ // 閲嶆柊鍒涘缓瀛楁
+ createExcelField();
+
+ // 琛ュ厖鏂板瓧娈电殑鏍峰紡
+ this.styles.putAll(annotationHeaderStyles(wb, this.styles));
+ this.styles.putAll(annotationDataStyles(wb));
+
+ // 鍐欏叆鏁版嵁
+ writeSheet();
+
+ // 鎭㈠鍘熷鐘舵��
+ this.clazz = originClazz;
+ this.fields = originFields;
+ this.list = originList;
+ this.sheetName = originSheetName;
+ this.rownum = originRownum;
+ this.subFields = originSubFields;
+ this.subMethod = originSubMethod;
+ this.subMergedFirstRowNum = originSubMergedFirstRowNum;
+ this.subMergedLastRowNum = originSubMergedLastRowNum;
+ this.statistics = originStatistics;
+ this.maxHeight = originMaxHeight;
+ }
+
+ /**
* 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟锛堝甫鏂囦欢鍚嶏級
*
* @param response 杩斿洖鏁版嵁
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailRatioExport.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailRatioExport.java
new file mode 100644
index 0000000..b48ab19
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailRatioExport.java
@@ -0,0 +1,42 @@
+package com.smartor.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 闂璇︽儏鍗犳瘮
+ *
+ * @author ruoyi
+ * @date 2026-06-30
+ */
+@ApiModel(value = "ServiceSubtaskDetailRatioExport", description = "闂璇︽儏鍗犳瘮")
+@Data
+public class ServiceSubtaskDetailRatioExport extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @Excel(name = "闂鍐呭")
+ @ApiModelProperty(value = "闂鍐呭")
+ private String questiontext;
+
+ @Excel(name = "閫夐」缁撴灉")
+ @ApiModelProperty(value = "閫夐」缁撴灉")
+ private String optionresult;
+
+ @Excel(name = "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
+ private String count;
+
+ @Excel(name = "姣斾緥")
+ private String ratio;
+
+ @Excel(name = "浠诲姟缂栧彿")
+ private String taskid;
+
+
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
index fde930e..ce47ee9 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
@@ -224,4 +224,11 @@
*/
List<Map<String, Object>> getHeLibraryCount(HeLibraryCountVO heLibraryCountVO);
+ /**
+ * 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮
+ * @param taskIds
+ * @return
+ */
+ List<ServiceSubtaskDetailRatioExport> statQuestionOption(@Param("taskIds") List<Long> taskIds);
+
}
diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
index 32eadda..93ae55b 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -188,4 +188,11 @@
public Map<String, Object> getHeLibraryCount(@RequestBody HeLibraryCountVO heLibraryCountVO);
Map<String, Object> smsSubTask(Long subid);
+
+ /**
+ * 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮
+ * @param taskIds
+ * @return
+ */
+ public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds);
}
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);
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index e75d680..a261694 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -28,6 +28,7 @@
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.ObjectUtils;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.Cacheable;
@@ -4557,6 +4558,11 @@
return resultMap;
}
+ @Override
+ public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds) {
+ return serviceSubtaskMapper.statQuestionOption(taskIds);
+ }
+
private Boolean saveServiceSubtaskDetail(ServiceSubtask serviceSubtask) {
Boolean result = true;
//3.4 濡傛灉3.1鎴�3.2涓簍rue鐨勮瘽锛屾牴鎹畉ype鍒ゆ柇浠�涔堢被鍨�
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 1c2ca15..4d65bd3 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -2896,5 +2896,48 @@
</choose>
</select>
+ <select id="statQuestionOption" resultType="com.smartor.domain.ServiceSubtaskDetailRatioExport">
+ SELECT
+ d.questiontext AS questiontext,
+ t.taskid AS taskid,
+ d.asrtext AS optionresult,
+ COUNT(*) AS count,
+ CONCAT(ROUND(COUNT(*) * 100.0 / t2.total_count, 2), '%') AS ratio
+ FROM
+ service_task t
+ INNER JOIN service_subtask s ON s.taskid = t.taskid
+ INNER JOIN service_subtask_detail d ON d.sub_id = s.id
+ INNER JOIN (
+ SELECT
+ t.taskid,
+ d.questiontext,
+ COUNT(*) AS total_count
+ FROM
+ service_task t
+ INNER JOIN service_subtask s ON s.taskid = t.taskid
+ INNER JOIN service_subtask_detail d ON d.sub_id = s.id
+ WHERE t.taskid IN
+ <foreach collection="taskIds" item="taskId" open="(" separator="," close=")">
+ #{taskId}
+ </foreach>
+ and s.sendstate=6
+ GROUP BY
+ t.taskid,
+ d.questiontext
+ ) t2 ON t2.taskid = t.taskid AND t2.questiontext = d.questiontext
+ WHERE t.taskid IN
+ <foreach collection="taskIds" item="taskId" open="(" separator="," close=")">
+ #{taskId}
+ </foreach>
+ AND s.sendstate = 6
+ GROUP BY
+ t.taskid,
+ d.questiontext,
+ d.asrtext
+ ORDER BY
+ d.questiontext,
+ t.taskid
+ </select>
+
</mapper>
--
Gitblit v1.9.3