From 16f0ae2b40ab76f122eb248247fd1f204c09a708 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 01 十二月 2022 09:46:15 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionUserDAO.java |   76 +++++++++++++++++++++++++++++---------
 1 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionUserDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionUserDAO.java
index 621b488..9ac8bc9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionUserDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionUserDAO.java
@@ -1,10 +1,17 @@
 package com.panzhihua.service_community.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.panzhihua.service_community.model.dos.ComActDiscussOptionUserDO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO;
+import com.panzhihua.common.model.vos.community.ComActDiscussOptionUserVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.panzhihua.service_community.model.dos.ComActDiscussOptionUserDO;
+
+import java.util.List;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -14,24 +21,57 @@
  **/
 @Mapper
 public interface ComActDiscussOptionUserDAO extends BaseMapper<ComActDiscussOptionUserDO> {
-    //    @Select("<script> " +
-//            " <where>" +
-//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
-//            " </if> " +
-//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
-//            " </if> " +
-//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
-//            " </if> " +
-//            " </where>" +
-//            "</script>")
-    @Select("SELECT \n" +
-            "COUNT(ou.id)\n" +
-            "FROM\n" +
-            "com_act_discuss d\n" +
-            "JOIN com_act_discuss_option o ON d.id = o.discuss_id and d.id=#{id}\n" +
-            "JOIN com_act_discuss_option_user ou ON o.id = ou.discuss_option_id and ou.user_id=#{loginUserId}")
+    // @Select("<script> " +
+    // " <where>" +
+    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
+    // " </if> " +
+    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
+    // " </if> " +
+    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
+    // " </if> " +
+    // " </where>" +
+    // "</script>")
+    @Select("SELECT \n" + "COUNT(ou.id)\n" + "FROM\n" + "com_act_discuss d\n"
+        + "JOIN com_act_discuss_option o ON d.id = o.discuss_id and d.id=#{id}\n"
+        + "JOIN com_act_discuss_option_user ou ON o.id = ou.discuss_option_id and ou.user_id=#{loginUserId}")
     int selectHaveVote(@Param("id") Long id, @Param("loginUserId") Long loginUserId);
 
     @Select("select count(id) from com_act_discuss_option_user where discuss_option_id = #{discussOptionId} and user_id = #{userId}")
     int selectHaveVotes(@Param("discussOptionId") Long discussOptionId, @Param("userId") Long userId);
+
+    /**
+     * 查询用户当天当前投票栏目下已投次数
+     * @param discussId 一起议主键id
+     * @param userId 用户id
+     * @return 总数
+     */
+    int selectVotedVotesInToday(@Param("discussId") Long discussId, @Param("userId") Long userId);
+
+    /**
+     * 查询当前投票主题下的记录 最多6条用于展示
+     * @param discussId 一起议主键id
+     * @return
+     */
+    List<ComActDiscussOptionUserVO> selectVotedRecords(@Param("discussId") Long discussId);
+
+    /**
+     * 查询当前投票主题参与人数
+     * @param discussId 一起议主键id
+     * @return
+     */
+    int selectVotedPersonNum(@Param("discussId") Long discussId);
+
+    /**
+     * 投票情况-分页查询
+     * @param pageVoteSituationDTO
+     * @return
+     */
+    IPage<ComActDiscussOptionUserVO> pageVoteSituation(@Param("page") Page page, @Param("pageVoteSituationDTO") PageVoteSituationDTO pageVoteSituationDTO);
+
+    /**
+     * 投票情况详情
+     * @param optionUserId
+     * @return
+     */
+    ComActDiscussOptionUserVO detailVoteSituation(@Param("optionUserId") Long optionUserId);
 }

--
Gitblit v1.7.1