From b25c3b5188e402695f3792ad7da53e452682cd80 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 12 十月 2026 19:43:07 +0800
Subject: [PATCH] 满意度统计BUG修改
---
ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/service/impl/PatSatisfactionServiceImpl.java | 91 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 73 insertions(+), 18 deletions(-)
diff --git a/ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/service/impl/PatSatisfactionServiceImpl.java b/ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/service/impl/PatSatisfactionServiceImpl.java
index 5d1078a..fd18c80 100644
--- a/ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/service/impl/PatSatisfactionServiceImpl.java
+++ b/ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/service/impl/PatSatisfactionServiceImpl.java
@@ -216,7 +216,7 @@
//3 涓�娆＄粺璁″叏閮ㄩ棶棰樼殑鍙戦�侀噺/濉姤閲�/閫夐」鍒嗗�硷紙鍘熸潵鏄瘡涓棶棰樺悇鏌� 3 娆★級
List<SatScriptRef> scriptRefs = new ArrayList<>();
for (SatisfactionIvrScriptRow ivrLibaTemplateScript : ivrLibaTemplateScripts) {
- scriptRefs.add(new SatScriptRef(ivrLibaTemplateScript.getTemplateid(), ivrLibaTemplateScript.getScriptid(), ivrLibaTemplateScript.getScriptContent()));
+ scriptRefs.add(new SatScriptRef(ivrLibaTemplateScript.getTemplateid(), ivrLibaTemplateScript.getScriptid(), ivrLibaTemplateScript.getScriptContent(), ivrLibaTemplateScript.getDimension()));
}
buildSatisfactionDetailEntities(patSatisfactionReqVO, "1", true, scriptRefs, patSatisfactionDetailEntities, personTotals);
}
@@ -231,7 +231,7 @@
List<SatScriptRef> scriptRefs = new ArrayList<>();
for (SatisfactionSvyScriptRow svyLibTemplateScript : svyLibTemplateScripts) {
// 闂嵎鐨勯�夐」琛ㄦ寜 svy_lib_template_script 鐨勪富閿叧鑱�
- scriptRefs.add(new SatScriptRef(svyLibTemplateScript.getSvyid(), svyLibTemplateScript.getId(), svyLibTemplateScript.getScriptContent()));
+ scriptRefs.add(new SatScriptRef(svyLibTemplateScript.getSvyid(), svyLibTemplateScript.getId(), svyLibTemplateScript.getScriptContent(), svyLibTemplateScript.getDimension()));
}
buildSatisfactionDetailEntities(patSatisfactionReqVO, "2", false, scriptRefs, patSatisfactionDetailEntities, personTotals);
}
@@ -270,7 +270,7 @@
//3 涓�娆＄粺璁″叏閮ㄩ棶棰樼殑鍙戦�侀噺/濉姤閲�/閫夐」鍒嗗�硷紙鍘熸潵鏄瘡涓棶棰樺悇鏌� 3 娆★級
List<SatScriptRef> scriptRefs = new ArrayList<>();
for (SatisfactionIvrScriptRow ivrLibaTemplateScript : ivrLibaTemplateScripts) {
- scriptRefs.add(new SatScriptRef(ivrLibaTemplateScript.getTemplateid(), ivrLibaTemplateScript.getScriptid(), ivrLibaTemplateScript.getScriptContent()));
+ scriptRefs.add(new SatScriptRef(ivrLibaTemplateScript.getTemplateid(), ivrLibaTemplateScript.getScriptid(), ivrLibaTemplateScript.getScriptContent(), ivrLibaTemplateScript.getDimension()));
}
buildSatisfactionDetailEntities(patSatisfactionReqVO, "1", true, scriptRefs, patSatisfactionDetailEntities, personTotals);
}
@@ -284,7 +284,7 @@
List<SatScriptRef> scriptRefs = new ArrayList<>();
for (SatisfactionSvyScriptRow svyLibTemplateScript : svyLibTemplateScripts) {
// 闂嵎鐨勯�夐」琛ㄦ寜 svy_lib_template_script 鐨勪富閿叧鑱�
- scriptRefs.add(new SatScriptRef(svyLibTemplateScript.getSvyid(), svyLibTemplateScript.getId(), svyLibTemplateScript.getScriptContent()));
+ scriptRefs.add(new SatScriptRef(svyLibTemplateScript.getSvyid(), svyLibTemplateScript.getId(), svyLibTemplateScript.getScriptContent(), svyLibTemplateScript.getDimension()));
}
buildSatisfactionDetailEntities(patSatisfactionReqVO, "2", false, scriptRefs, patSatisfactionDetailEntities, personTotals);
}
@@ -763,31 +763,66 @@
SatisfactionStatQuery statQuery = buildSatisfactionStatQuery(reqVO, type, templateIds);
Map<Long, Long> sendCountMap = mapSatisfactionSendCount(statQuery);
SatisfactionFillStatByMatchedtext fillStat = querySatisfactionFillStatByMatchedtext(statQuery);
+ //绛旈銆愪汉鏁般�戯細鎸� 妯℃澘+闂 鐨� distinct sub_id锛堜笌銆屽彂閫佷汉鏁般�嶅悓鍙ｅ緞锛�
+ Map<String, Long> answerPersonMap = mapSatisfactionFillPersonCountByQuestion(statQuery);
Map<Long, List<String>> optionScores = loadTargetOptionScores(voice, scriptRefs);
for (SatScriptRef scriptRef : scriptRefs) {
Long templateId = scriptRef.getTemplateId();
//鍙戦�佹�婚噺锛堝師鏉ユ槸鎶婂叏閮� sub_id 鏌ュ洖 Java 鍐嶅彇 size锛�
long sendCount = templateId == null ? 0L : sendCountMap.getOrDefault(templateId, 0L);
- //濉姤鏁伴噺锛堝師鏉ユ槸鎶婃槑缁嗚鍏ㄩ儴鏌ュ洖 Java 鍐嶇粺璁★級
+ //濉姤銆愯鏁般�戯細鐢ㄤ簬骞冲潎鍒� / 鏈�楂樺垎 / 鏈�浣庡垎 / 鍚勯�夐」鍗犳瘮锛堣繖浜涘彛寰勬湰鏉ュ氨鎸夋槑缁嗚璁★級
List<MatchedtextCount> fillRows = fillStat.get(templateId, scriptRef.getScriptContent());
long fillCount = countFillRowsByMatchedtext(fillRows);
+ //绛旈銆愪汉鏁般�戯細鐢ㄤ簬 绛旈浜烘暟 / 鏈瓟棰樹汉鏁� / 绛旈鐜�
+ long answerPersonCount = answerPersonMap.getOrDefault(
+ statKey(templateId, scriptRef.getScriptContent()), 0L);
PatSatisfactionDetailEntity detail = new PatSatisfactionDetailEntity();
detail.setScriptContent(scriptRef.getScriptContent());
- detail.setAnswerPerson((int) fillCount);
- detail.setNoAnswerPerson(fillCount > 0L && sendCount > 0L ? (int) (sendCount - fillCount) : sendCount > 0L ? (int) sendCount : 0);
+ //缁村害锛氬師鏈煡璇㈤噷宸插彇鍒帮紝浣嗘瀯閫� SatScriptRef 鏃惰涓㈡帀锛屽鑷村墠绔�岀淮搴︺�嶅垪涓�鐩翠负绌�
+ detail.setDimension(scriptRef.getDimension());
+ // 鈿狅笍 浜烘暟鍙ｅ緞淇锛氬師鏉ヨ繖閲岀敤鐨勬槸 fillCount锛堟槑缁嗚鏁帮級锛�
+ // 鑰屽彂閫佷汉鏁版槸 count(distinct id)锛堜汉鏁帮級锛屼袱鑰呯浉鍑忎細鍑虹幇璐熸暟锛堝疄娴� -120 = 15 鈭� 135锛夈��
+ // 涓�鏉� (sub_id, questiontext) 鍙兘鏈夊琛屾槑缁嗭紝鎵�浠ョ瓟棰樹汉鏁板繀椤诲彇 distinct sub_id銆�
+ detail.setAnswerPerson((int) answerPersonCount);
+ detail.setNoAnswerPerson(answerPersonCount > 0L && sendCount > 0L ? (int) (sendCount - answerPersonCount)
+ : sendCount > 0L ? (int) sendCount : 0);
detail.setAverageScore(String.valueOf(averageScoreByMatchedtext(fillRows)));
List<String> scores = optionScores.get(scriptRef.getOptionScriptId());
detail.setMaxScore(String.valueOf(maxScoreOf(scores)));
detail.setMinScore(String.valueOf(minScoreOf(scores)));
- detail.setAnswerRate(sendCount == 0L ? 0 : fillCount == 0L ? 0 : fillCount * 1.0 / sendCount);
+ detail.setAnswerRate(sendCount == 0L ? 0 : answerPersonCount == 0L ? 0 : answerPersonCount * 1.0 / sendCount);
detail.setMatchedtextStats(buildMatchedtextStats(fillRows, fillCount));
out.add(detail);
- totals[0] += (int) fillCount;
+ totals[0] += (int) answerPersonCount;
totals[1] += (int) sendCount;
}
+ }
+
+ /**
+ * 涓�娆℃煡鍑恒�屽叏閮� 妯℃澘+闂銆嶇殑绛旈浜烘暟锛坽@code count(distinct ssd.sub_id)}锛夈��
+ * <p>
+ * key 鐢ㄤ笌 {@link #statKey(Long, String)} 鐩稿悓鐨勮鍒欐瀯閫狅紝淇濊瘉涓庤皟鐢ㄦ柟鐨勬煡鎵句竴鑷�
+ * 锛坽@code statKey} 宸插仛 trim + 灏忓啓锛岀瓑浠蜂簬 MySQL 鐨勫拷鐣ュぇ灏忓啓涓庡熬閮ㄧ┖鏍兼瘮杈冿級銆�
+ */
+ private Map<String, Long> mapSatisfactionFillPersonCountByQuestion(SatisfactionStatQuery statQuery) {
+ Map<String, Long> answerPersonMap = new HashMap<>();
+ if (statQuery == null || CollectionUtils.isEmpty(statQuery.getLibTemplateIds())) return answerPersonMap;
+ List<Map<String, Object>> rows = satisfactionMapper.selectSatisfactionFillPersonCountByQuestion(statQuery);
+ if (CollectionUtils.isEmpty(rows)) return answerPersonMap;
+ for (Map<String, Object> row : rows) {
+ Long templateId = toLong(row.get("libtemplateid"));
+ if (templateId == null) continue;
+ long cnt = toLong(row.get("cnt"), 0L);
+ if (cnt <= 0L) continue;
+ Object questiontext = row.get("questiontext");
+ answerPersonMap.merge(
+ statKey(templateId, questiontext == null ? null : String.valueOf(questiontext)),
+ cnt, Long::sum);
+ }
+ return answerPersonMap;
}
/**
@@ -914,7 +949,7 @@
/**
* 鑾峰彇骞冲潎鍒嗭紙鑱氬悎鐗堬細鍒嗗�间笌鏉℃暟锛�
* <p>
- * 鍙ｅ緞涓� {@link #averageScore(List)} 涓�鑷达細鍒嗗瓙涓哄彲瑙ｆ瀽鍒嗗�间箣鍜岋紝鍒嗘瘝涓烘槑缁嗚鏁帮紙鍚垎鍊间负绌虹殑琛岋級銆�
+ * 鍒嗗瓙涓哄彲瑙ｆ瀽鍒嗗�间箣鍜岋紝鍒嗘瘝涓烘槑缁嗚鏁帮紙鍚垎鍊间负绌虹殑琛岋級銆�
*/
private Double averageScoreByMatchedtext(List<MatchedtextCount> fillRows) {
if (CollectionUtils.isEmpty(fillRows)) return 0.0;
@@ -932,7 +967,7 @@
}
/**
- * 鑾峰彇鏈�楂樺垎锛堣仛鍚堢増锛屽彛寰勫悓 {@link #maxScore(List)}锛氱┖鍒楄〃杩斿洖 0.0锛�
+ * 鑾峰彇鏈�楂樺垎锛堣仛鍚堢増锛岀┖鍒楄〃杩斿洖 0.0锛�
*/
private Double maxScoreOf(List<String> scores) {
if (CollectionUtils.isEmpty(scores)) return 0.0;
@@ -941,7 +976,7 @@
}
/**
- * 鑾峰彇鏈�浣庡垎锛堣仛鍚堢増锛屽彛寰勫悓 {@link #minScore(List)}锛氱┖鍒楄〃杩斿洖 0.0锛�
+ * 鑾峰彇鏈�浣庡垎锛堣仛鍚堢増锛屽彛寰勫悓 {绌哄垪琛ㄨ繑鍥� 0.0锛�
*/
private Double minScoreOf(List<String> scores) {
if (CollectionUtils.isEmpty(scores)) return 0.0;
@@ -950,17 +985,19 @@
}
/**
- * 婊℃剰搴︾粺璁＄敤鐨勯棶棰樺紩鐢細妯℃澘id銆侀�夐」琛ㄥ叧鑱旂殑闂id锛堝彲鑳戒负 null锛夈�侀棶棰樺唴瀹�
+ * 婊℃剰搴︾粺璁＄敤鐨勯棶棰樺紩鐢細妯℃澘id銆侀�夐」琛ㄥ叧鑱旂殑闂id锛堝彲鑳戒负 null锛夈�侀棶棰樺唴瀹广�佺淮搴�
*/
private static class SatScriptRef {
private final Long templateId;
private final Long optionScriptId;
private final String scriptContent;
+ private final String dimension;
- SatScriptRef(Long templateId, Long optionScriptId, String scriptContent) {
+ SatScriptRef(Long templateId, Long optionScriptId, String scriptContent, String dimension) {
this.templateId = templateId;
this.optionScriptId = optionScriptId;
this.scriptContent = scriptContent;
+ this.dimension = dimension;
}
Long getTemplateId() {
@@ -973,6 +1010,10 @@
String getScriptContent() {
return scriptContent;
+ }
+
+ String getDimension() {
+ return dimension;
}
}
@@ -1038,19 +1079,33 @@
// 鍘熷疄鐜扮洿鎺� new smartor 鐨勫疄浣撳綋鍏ュ弬锛涙ā鍧楀寲鍚庣粺涓�鐢� SatisfactionScriptQuery锛�
// 杩欓噷鎶婁笁澶勬瀯閫犳敹鏁涗负甯姪鏂规硶锛屾潯浠朵笌鍘熸潵閫愬瓧瀵瑰簲銆�
- /** 婊℃剰搴﹀垎绫绘煡璇紙orgid + type=myd锛� */
+ /**
+ * 婊℃剰搴﹀垎绫绘煡璇紙璇煶渚э級銆�
+ * <p>
+ * 鈿狅笍 <b>涓庡師鏂囦竴鑷达細鍙紶 orgid锛�<u>涓嶄紶 type</u></b>銆傚師瀹炵幇鏄�
+ * <pre>
+ * IvrLibaScriptAssort e = new IvrLibaScriptAssort();
+ * e.setOrgid(reqVO.getOrgid()); // 鈫� 鍙湁 orgid
+ * mapper.selectIvrLibaScriptAssortList(e);
+ * </pre>
+ * 鍒嗙被鐨勩�屾槸涓嶆槸婊℃剰搴�(myd)銆嶆槸鍦� <b>Java 渚�</b>鐢�
+ * {@code item.getType().contains("myd")} 杩囨护鐨勶紙瑙� {@link #statistics} /
+ * {@link #satisfactionGraph}锛夈��
+ * <p>
+ * 濡傛灉鍦ㄨ繖閲岄『鎵嬪姞涓� {@code type="myd"}锛孲QL 灏变細澶氬嚭涓�涓�
+ * {@code type like '%myd%'} 鏉′欢 鈥斺�� 鑰� MySQL 鐨� LIKE 榛樿<b>涓嶅尯鍒嗗ぇ灏忓啓</b>锛�
+ * 浼氭瘮 Java 鐨� {@code contains("myd")} 澶氬懡涓垎绫伙紝瀵艰嚧缁熻缁撴灉鍑虹幇宸紓銆�
+ */
private SatisfactionScriptQuery ivrCategoryQuery(PatSatisfactionReqVO reqVO) {
SatisfactionScriptQuery q = new SatisfactionScriptQuery();
q.setOrgid(reqVO.getOrgid());
- q.setType("myd");
return q;
}
- /** 婊℃剰搴﹀垎绫绘煡璇紙闂嵎渚э紝鏉′欢鍚岃闊充晶锛� */
+ /** 婊℃剰搴﹀垎绫绘煡璇紙闂嵎渚э紝鍚屾牱鍙紶 orgid锛岃 {@link #ivrCategoryQuery}锛� */
private SatisfactionScriptQuery svyCategoryQuery(PatSatisfactionReqVO reqVO) {
SatisfactionScriptQuery q = new SatisfactionScriptQuery();
q.setOrgid(reqVO.getOrgid());
- q.setType("myd");
return q;
}
--
Gitblit v1.9.3