java/zhihuishenqu.git

			@@ -4,7 +4,9 @@
			import java.util.List;
			import java.util.Map;

			import com.panzhihua.common.model.dtos.PageBaseDTO;
			import com.panzhihua.common.model.vos.community.StatisticsCommVO;
			import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCourtyardStatisticsInfo;
			import org.apache.ibatis.annotations.Mapper;
			import org.apache.ibatis.annotations.Param;
			import org.apache.ibatis.annotations.Select;
			@@ -49,7 +51,7 @@
			// + "COUNT( DISTINCT c.id ) commentNum, " + "u.name userName, " + "u.nick_name userNickName, " + "d.create_at "
			// + "FROM " + "com_act_discuss d " + "JOIN sys_user u ON d.user_id = u.user_id "
			// + "LEFT JOIN com_act_discuss_comment c ON d.id = c.discuss_id "
			// + " where d.community_id = #{pageComActDiscussDTO.communityId}"
			// + " where d.community_id = ${pageComActDiscussDTO.communityId}"
			// + "<if test='pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != ""'>"
			// + " and d.`discuss_subject` LIKE concat( #{pageComActDiscussDTO.subject}, '%' ) " + " </if> "
			// + "<if test='pageComActDiscussDTO.begin != null '>" + "AND d.create_at BETWEEN #{pageComActDiscussDTO.begin} "
			@@ -57,6 +59,10 @@
			// + "</script>")
			IPage<ComActDiscussVO> pageDiscuss(Page page,
			@Param("pageComActDiscussDTO") PageComActDiscussDTO pageComActDiscussDTO);


			Integer getCommentNum(@Param("id") String id);


			IPage<ComActDiscussVO> pageDiscussAdmin(Page page,
			@Param("pageComActDiscussDTO") PageComActDiscussDTO pageComActDiscussDTO);
			@@ -107,7 +113,7 @@
			// + "LEFT JOIN com_act_discuss_user du ON d.id = du.discuss_id "
			// + "<if test='pageComActDiscussDTO.loginUserId != null '>"
			// + "LEFT JOIN com_act_discuss_option_user ou on do.id=ou.discuss_option_id and ou.user_id=#{pageComActDiscussDTO.loginUserId} "
			// + " </if> " + " where d.community_id = #{pageComActDiscussDTO.communityId}" + " and d.is_del = 2"
			// + " </if> " + " where d.community_id = ${pageComActDiscussDTO.communityId}" + " and d.is_del = 2"
			// + "<if test='pageComActDiscussDTO.type != null '>"
			// + " and d.`type` = #{pageComActDiscussDTO.type} " + " </if> "
			// + "<if test='pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != ""'>"
			@@ -142,7 +148,7 @@
			IPage<ComActDiscussCommentVO> pageDiscussCommentApplets(Page page,
			@Param("pageComActDiscussCommentDTO") PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

			@Select("select name,address from com_act where community_id = #{communityId}")
			@Select("select name,address from com_act where community_id = ${communityId}")
			ComActVO selectCommunity(Long communityId);

			@Select("SELECT " + "if(du.id is not null,1,0)haveSign, " + "if(ou.id is not null,1,0)haveVote " + "FROM "
			@@ -156,13 +162,13 @@

			Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("date") String date);

			@Select(" SELECT id,discuss_subject AS content,IF(type = 1,'图文','投票') AS typeName FROM com_act_discuss WHERE community_id = #{communityId} ORDER BY create_at DESC LIMIT #{pageSize}")
			@Select(" SELECT id,discuss_subject AS content,IF(type = 1,'图文','投票') AS typeName FROM com_act_discuss WHERE community_id = ${communityId} ORDER BY create_at DESC LIMIT #{pageSize}")
			List<CarouselInfoVO> screenDiscuss(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);

			@Select("<script> " + "SELECT " + " cad.id, " + " su.nick_name AS userName, " + " su.image_url, "
			+ " cad.create_at, " + " cad.type, " + " cad.discuss_subject, " + " cad.photo_pah " + "FROM "
			+ " com_act_discuss AS cad " + " LEFT JOIN sys_user AS su ON su.user_id = cad.user_id " + " <where> "
			+ "<if test='discussListDTO.communityId != null '>" + " and cad.community_id = #{discussListDTO.communityId} "
			+ "<if test='discussListDTO.communityId != null '>" + " and cad.community_id = ${discussListDTO.communityId} "
			+ " </if> " + "<if test='discussListDTO.startTime!=null and discussListDTO.startTime != ""'>"
			+ " AND DATE_FORMAT(cad.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{discussListDTO.startTime} "
			+ " </if> " + "<if test='discussListDTO.endTime!=null and discussListDTO.endTime != ""'>"
			@@ -177,13 +183,6 @@
			List<ComActDiscussOptionVO> getScreenDiscussOptionList(@Param("discussId") Long discussId);

			/**
			* 添加议事投票评论数
			* @param discussId 议事投票
			* @param num 添加数量
			*/
			void addCommentCount(@Param("discussId") Long discussId,@Param("num") Integer num);

			/**
			* 更新一起议主题状态
			* @param discussId
			* @param status
			@@ -195,7 +194,8 @@
			* @param discussId 一起议主键id
			* @param isFirstComment 是否首次参与
			*/
			void incrCommentAndJoinNumById(@Param("discussId") Long discussId, @Param("isFirstComment") boolean isFirstComment);
			void incrCommentAndJoinNumById(@Param("discussId") Long discussId, @Param("isFirstComment") boolean isFirstComment,
			@Param("isAddComment") boolean isAddComment);

			/**
			* 一起议点赞/取消点赞增加/减少点赞总数
			@@ -210,6 +210,8 @@
			* @return
			*/
			int batchUpdateViewNum(@Param("needDealMap") HashMap<Long, Integer> needDealMap);

			int deleteId(@Param("id") String id);

			/**
			* 居民自治-议事投票类型占比统计
			@@ -226,4 +228,18 @@
			* @return
			*/
			List<String> getTitles(@Param("type") int type, @Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);

			/**
			* 金沙定制页面-四长四员院落议事展示列表
			* @param pageBaseDTO
			* @return
			*/
			IPage<ComActDiscussVO> pageCourtyardDiscuss(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);

			/**
			* 金沙定制页面-院落议事基础统计数据
			* @param communityId
			* @return
			*/
			BigScreenCourtyardStatisticsInfo getCourtyardBaseData(@Param("communityId") Long communityId);
			}