java/zhihuishenqu.git

			@@ -19,6 +19,4 @@
			private Integer joinCount;
			@ApiModelProperty("社区ID")
			private Long communityId;
			@ApiModelProperty("问卷参与者类型 0 全部 1 志愿者 2 党员")
			private Integer parterType;
			}

			@@ -22,7 +22,7 @@
			*/
			@Select("<script> " +
			"SELECT qs.id AS sub_id, ac.choice as option_name, COUNT(ac.user_id) as total, ac.answer_content as answerContent, \n" +
			" COUNT(ac.user_id) /(SELECT COUNT() FROM com_act_questnaire_answer_content WHERE sub_id = qs.id) 100 AS proportion\n" +
			" 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" +

			@@ -177,7 +177,7 @@

			@Override
			public R statQuestnaire(Long questId) {
			ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectById(questId);
			ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectOne(new QueryWrapper<ComActQuestnaireDO>().lambda().eq(ComActQuestnaireDO::getId, questId).eq(ComActQuestnaireDO::getIsHide, 0));

			QuestnaireAnswerStatVO usersAnswerStatVO = new QuestnaireAnswerStatVO();
			//问卷信息
			@@ -224,8 +224,7 @@

			@Override
			public R answerInfoQuestnaire(Long userId, Long questId) {

			ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectById(questId);
			ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectOne(new QueryWrapper<ComActQuestnaireDO>().lambda().eq(ComActQuestnaireDO::getId, questId).eq(ComActQuestnaireDO::getIsHide, 0));
			if (comActQuestnaireDO == null) {
			return R.fail("问卷不存在!");
			}
			@@ -236,7 +235,7 @@
			usersAnswerVO.setQuestnaire(comActQuestnaireVO);

			List<ComActQuestnaireSubDO> list = questnaireSubDAO.selectList(new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
			list.sort(Comparator.comparing(ComActQuestnaireSubDO::getSort).reversed());
			list.sort(Comparator.comparing(ComActQuestnaireSubDO::getSort));
			List<UsersSubAnswerVO> usersSubAnswerVOList = new ArrayList<>();

			list.forEach(comActQuestnaireSubDO -> {

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireVO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireAnswerContentDAO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史