From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireAnswerContentDAO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireAnswerContentDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireAnswerContentDAO.java
index c5f074a..ac3e63a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireAnswerContentDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireAnswerContentDAO.java
@@ -29,7 +29,7 @@
" CONCAT(ROUND( COUNT(ac.user_id) /(SELECT COUNT(*) FROM com_act_questnaire_answer_content WHERE sub_id = qs.id) *100), '%') AS proportion\n" +
"FROM com_act_questnaire qn LEFT JOIN com_act_questnaire_sub qs ON qn.id = qs.que_Id\n" +
" LEFT JOIN com_act_questnaire_answer_content ac ON qs.id = ac.sub_id\n" +
- "WHERE qn.id=#{questId}\n" +
+ "WHERE qn.id=#{questId} \n" +
"GROUP BY qs.id, ac.choice\n" +
"ORDER BY qs.id"+
"</script>")
@@ -41,8 +41,8 @@
*/
@Select("<script> " +
"SELECT ac.* \n" +
- "FROM com_act_questnaire qn LEFT JOIN com_act_questnaire_sub qs ON qn.id = qs.que_Id\n" +
- " LEFT JOIN com_act_questnaire_answer_content ac ON qs.id = ac.sub_id\n" +
+ "FROM com_act_questnaire_answer_content ac left JOIN com_act_questnaire_sub qs ON ac.sub_id = qs.id \n" +
+ " LEFT JOIN com_act_questnaire qn ON qs.que_Id = qn.id \n" +
"WHERE qn.id=#{questId}\n" +
"ORDER BY ac.user_id, qs.id "+
"</script>")
--
Gitblit v1.7.1