From ff37f2fed3c479e5c664e5bff0834e37f400eceb Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 四月 2021 09:22:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireAnswerContentDAO.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 01b90c8..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>")
@@ -68,10 +68,23 @@
* @param pageQuestnaireSubDetailsDTO 问卷ID
*/
@Select("<script> " +
- "SELECT ac.choice , ac.user_id, ac.type, ac.sub_id, u.name, ac.answer_content \n" +
+ "SELECT ac.choice , ac.user_id, ac.type, ac.sub_id, u.name as user_name, ac.answer_content \n" +
"FROM com_act_questnaire_answer_content ac LEFT JOIN sys_user u ON ac.user_id = u.user_id\n" +
- "WHERE ac.sub_id=1#{pageQuestnaireSubDetailsDTO.subId}\n" +
+ "WHERE ac.sub_id=#{pageQuestnaireSubDetailsDTO.subId}\n" +
"ORDER BY ac.create_at\n"+
"</script>")
IPage<ComActQuestnaireAnswerContentVO> selectVoByPage(Page userPage, @Param("pageQuestnaireSubDetailsDTO") PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);
+
+ /**
+ * 查询问卷 问答题 用户回答数据
+ * @param questId 问卷ID
+ * @param userId 用户ID
+ */
+ @Select("<script> " +
+ "SELECT COUNT(*)\n" +
+ "FROM com_act_questnaire q LEFT JOIN com_act_questnaire_sub qs ON q.id = qs.que_Id\n" +
+ "LEFT JOIN com_act_questnaire_answer_content ac ON qs.id = ac.sub_id\n" +
+ "WHERE q.id = #{questId} AND ac.user_id = #{userId}\n" +
+ "</script>")
+ Integer selectUserCountByQuestnaireId( @Param("questId")String questId, @Param("userId") Long userId);
}
--
Gitblit v1.7.1