From e9af309deeb051725cda523a4b54c0054c7c9f6b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 17 十月 2022 18:22:30 +0800
Subject: [PATCH] 三说会堂事件操作权限处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 130 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 108 insertions(+), 22 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
index b8eff85..573ea41 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -3,10 +3,14 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMicroWishStatisticsInfo;
import com.panzhihua.common.model.vos.community.screen.work.MicroListVO;
+import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -43,26 +47,28 @@
"w.`detail`, " +
"w.form, " +
"w.reject_reason, " +
- "su.`name` responsible_name, " +
+ "su1.`name` responsible_name, " +
"w.score, " +
+ "w.img_width, " +
+ "w.finish_at, " +
+ "w.aim_num, " +
+ "w.img_height, " +
+ "w.handle_id, " +
"w.create_at " +
"FROM " +
"com_act_micro_wish w " +
"left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
- "JOIN sys_user u ON w.sponsor_id = u.user_id " +
- "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>" +
- "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') " +
- " </if> " +
+ "left JOIN sys_user u ON w.sponsor_id = u.user_id " +
"<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == ""'>" +
- "LEFT JOIN sys_user su ON w.responsible_id = su.user_id " +
+ "LEFT JOIN sys_user su1 ON w.responsible_id = su1.user_id " +
" </if> " +
"<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != ""'>" +
- " JOIN sys_user su ON w.responsible_id = su.user_id " +
- "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%') " +
+ " JOIN sys_user su1 ON w.responsible_id = su1.user_id " +
+ "AND su1.`name` like concat(#{comActMicroWishVO.responsibleName},'%') " +
" </if> " +
" <where>" +
"<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
- " and w.community_id=#{comActMicroWishVO.communityId} " +
+ " and w.community_id = ${comActMicroWishVO.communityId} " +
" </if> " +
"<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != ""'>" +
"AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%') " +
@@ -71,7 +77,7 @@
"AND w.`status` = #{comActMicroWishVO.status} " +
" </if> " +
"<if test='comActMicroWishVO.status == 3 and comActMicroWishVO.isPageMyWish==null'>" +
- "AND ( w.`status` = 3 or w.`status` = 5 ) " +
+ "AND w.`status` in (2,3) " +
" </if> " +
"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>" +
"AND w.`status` =1 " +
@@ -83,7 +89,7 @@
"AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} " +
"AND #{comActMicroWishVO.createEnd}" +
" </if> " +
- "<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'>" +
+ "<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0 and comActMicroWishVO.status != null and comActMicroWishVO.status != 7'>" +
"AND w.status in (3, 5, 6) " +
" </if> " +
"<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" +
@@ -95,16 +101,29 @@
"<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and comActMicroWishVO.status==0 '>" +
"and (w.status in(1,2,4,5,6) or (w.status=3 and w.responsible_id =#{comActMicroWishVO.backUserId})) " +
" </if> " +
+ "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>" +
+ "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') " +
+ " </if> " +
" </where>" +
" group by w.id "+
"ORDER BY w.create_at desc "+
"</script>")
IPage<ComActMicroWishVO> pageMicroWish(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 社区后台分页查询微心愿
+ * @param comActMicroWishVO 请求参数
+ * @return 微心愿列表
+ */
+ IPage<ComActMicroWishVO> pageMicroWishAdmin(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
+
+ IPage<ComActMicroWishVO> pageMicroWishApplets(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
@Select("SELECT " +
"w.id, " +
"u.name sponsor_name, " +
"u.nick_name userNickName, " +
"w.create_at, " +
+ "w.aim_num, " +
"u.image_url, " +
"w.sponsor_phone, " +
"w.`status`, " +
@@ -116,6 +135,7 @@
"su.`name` responsible_name, " +
"w.form, " +
"w.reject_reason, " +
+ "w.community_id, " +
"w.examine_at, " +
"w.finish, " +
"w.finish_photo_path_list, " +
@@ -126,11 +146,14 @@
"w.feedback_photo_path_list, " +
"w.distribution_at, " +
"w.evaluate_at, " +
+ "w.img_width, " +
+ "w.img_height, " +
+ "w.handle_id, " +
"w.evaluate " +
"FROM " +
"com_act_micro_wish w " +
- "JOIN sys_user u ON w.sponsor_id = u.user_id " +
- "LEFT JOIN sys_user su ON w.responsible_id = su.user_id " +
+ "LEFT JOIN sys_user u ON w.sponsor_id = u.user_id " +
+ "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id " +
"LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id " +
"WHERE " +
"w.id =#{id}"+
@@ -143,7 +166,7 @@
"FROM " +
"com_act_micro_wish w " +
"WHERE " +
- "w.community_id = #{communityId} " +
+ "w.community_id = ${communityId} " +
"AND w.`status` = 1 " +
" " +
"union all " +
@@ -153,7 +176,7 @@
"FROM " +
" com_act_micro_wish w " +
"WHERE " +
- " w.community_id = #{communityId} " +
+ " w.community_id = ${communityId} " +
" AND w.`status` = 3 " +
" AND w.form = 1 " +
" AND w.responsible_id = #{userId} " +
@@ -161,16 +184,19 @@
" w.community_id ")
List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
- @Update("update com_act_micro_wish set `status`=6, evaluate_at=now() where `status`=5 and TIMESTAMPDIFF(HOUR, feedback_at, SYSDATE())>=72")
+ @Update("update com_act_micro_wish set `status`=6, evaluate_at=now() where `status`=5 and TIMESTAMPDIFF(HOUR, finish_at, SYSDATE())>=72")
int updateStatusAutoConfirm();
+ @Select("select id from com_act_micro_wish where `status`=5 and TIMESTAMPDIFF(HOUR, finish_at, SYSDATE())>=72 ")
+ List<Long> getWishAutoConfirmIds();
+
@Select("SELECT COUNT(id) AS completedNum," +
- "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 4 OR status = 5)) AS willNum ," +
- "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum " +
- "FROM com_act_micro_wish WHERE community_id = #{communityId} AND status = 6 ")
+ "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = ${communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5)) AS willNum ," +
+ "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = ${communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum " +
+ "FROM com_act_micro_wish WHERE community_id = ${communityId} AND status = 6 ")
Map<String, Long> countByCommunityId(@Param("communityId") Long communityId,@Param("nowDate") String nowDate);
- @Select("SELECT photo_path_list FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) ORDER BY create_at DESC limit #{pageSize}")
+ @Select("SELECT photo_path_list FROM com_act_micro_wish WHERE community_id = ${communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) ORDER BY create_at DESC limit #{pageSize}")
List<String> getAllImgs(@Param("communityId") Long communityId,@Param("pageSize") Integer pageSize);
@Select("<script> " +
@@ -195,13 +221,13 @@
"FROM " +
" com_act_micro_wish AS camw " +
" LEFT JOIN sys_user AS su ON su.user_id = camw.sponsor_id " +
- " LEFT JOIN sys_user AS su1 ON su1.user_id = camw.responsible_id " +
+ " LEFT JOIN com_pb_service_team AS su1 ON su1.id = camw.responsible_id " +
" <where> " +
"<if test='microListDTO.status != null'>" +
"AND camw.`status` =#{microListDTO.status} " +
" </if> " +
"<if test='microListDTO.communityId != null'>" +
- "AND camw.community_id =#{microListDTO.communityId} " +
+ "AND camw.community_id = ${microListDTO.communityId} " +
" </if> " +
"<if test='microListDTO.startTime!=null and microListDTO.startTime != ""'>" +
" AND DATE_FORMAT(camw.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{microListDTO.startTime} " +
@@ -213,4 +239,64 @@
"ORDER BY camw.create_at desc "+
" </script>")
IPage<MicroListVO> getScreenMicroList(Page page, @Param("microListDTO") ScreenMicroListDTO microListDTO);
+
+ /**
+ * 微心愿处理人列表
+ * @param communityId 社区id
+ * @param type 处理人类型（1.后台用户 2.党员 3.志愿者）
+ * @return 处理人列表
+ */
+ List<SysUserVO> getWishHandleListAdmin(@Param("type") Integer type,@Param("communityId") Long communityId);
+
+ SysUserVO getUserByUserId(@Param("userId") Long userId);
+
+ /**
+ * 待实现&已实现数目及占比
+ * @param communityId
+ * @return
+ */
+ List<StatisticsCommVO> selectRealizePercent(@Param("communityId") Long communityId);
+
+ /**
+ * 获取通过的微心愿图片
+ * @param communityId
+ * @param pageSize
+ * @return
+ */
+ List<String> getPassedAllImages(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
+
+ /**
+ * 首页二级页面-微心愿基础数据查询
+ * @param communityId
+ * @return
+ */
+ BigScreenMicroWishStatisticsInfo selectIndexMicroWishBaseData(@Param("communityId") Long communityId);
+
+ List<StatisticsCommVO> getMicroWishAddPolylineData(@Param("communityId") Long communityId);
+
+ StatisticsCommVO getMicroWishTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
+
+ /**
+ * 微心愿大屏展示列表
+ * @param page
+ * @param pageBaseDTO
+ * @return
+ */
+ IPage<ComActMicroWishVO> selectScreenDisplayList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-志愿线展示列表
+ * @param page
+ * @param pageBaseDTO
+ * @return
+ */
+ IPage<ComActMicroWishVO> pagePartyBuildIngMicroWish(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-四长四员解决问题展示列表
+ * @param page
+ * @param pageBaseDTO
+ * @return
+ */
+ IPage<ComActMicroWishVO> pageFourMemberResolve(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
--
Gitblit v1.7.1