From d769a8683ea6f2ecbc451da71ca3079c6765a99d Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 05 八月 2021 13:05:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 312 +++++++++++++++++++++++++++++----------------------
1 files changed, 175 insertions(+), 137 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
index f101135..211c4f3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
+import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO;
import com.panzhihua.common.model.vos.screen.EastPhotoTypeVO;
import com.panzhihua.common.model.vos.screen.EastPhotoVO;
import com.panzhihua.common.model.vos.screen.EasyPhotoDataVO;
@@ -27,98 +28,113 @@
public interface ComActEasyPhotoDAO extends BaseMapper<ComActEasyPhotoDO> {
@Select("<script> " +
"select t.* from ("+
- "SELECT\n" +
- "p.id,\n" +
- "u.`name` sponsor_name,\n" +
- "u.phone phone,\n" +
- "count(pu.id)giveThumbsUpNum,\n" +
- "u.image_url,\n" +
- "p.happen_addr,\n" +
- "su.`name` handler_name,\n" +
- "p.`status`,\n" +
- "p.`detail`,\n" +
- "p.`is_need_feed_back`,\n" +
- "p.`photo_path_list`,\n" +
- "p.create_at,\n" +
- "p.feedback_at,\n" +
- "p.is_report,\n" +
- "p.is_publicity,\n" +
- "p.examine_at \n" +
- "FROM\n" +
- "com_act_easy_photo p\n" +
- "JOIN sys_user u ON p.sponsor_id = u.user_id \n" +
+ "SELECT " +
+ "p.id, " +
+ "u.`name` sponsor_name, " +
+ "u.phone phone, " +
+ "count(pu.id)giveThumbsUpNum, " +
+ "u.image_url, " +
+ "p.happen_addr, " +
+ "su.`name` handler_name, " +
+ "p.`status`, " +
+ "p.`detail`, " +
+ "p.`is_need_feed_back`, " +
+ "p.`photo_path_list`, " +
+ "p.create_at, " +
+ "p.feedback_at, " +
+ "p.is_report, " +
+ "p.is_publicity, " +
+ "p.activity_type, " +
+ "p.activity_id, " +
+ "p.activity_amount, " +
+ "p.examine_at " +
+ "FROM " +
+ "com_act_easy_photo p " +
+ "JOIN sys_user u ON p.sponsor_id = u.user_id " +
"<if test='comActEasyPhotoVO.sponsorName != null and comActEasyPhotoVO.sponsorName.trim() != ""'>" +
- "AND u.`name` like concat(#{comActEasyPhotoVO.sponsorName},'%') \n" +
+ "AND u.`name` like concat(#{comActEasyPhotoVO.sponsorName},'%') " +
" </if> " +
"<if test='comActEasyPhotoVO.userId != null and comActEasyPhotoVO.userId != 0'>" +
- "AND u.`user_id` = #{comActEasyPhotoVO.userId} \n" +
+ "AND u.`user_id` = #{comActEasyPhotoVO.userId} " +
" </if> " +
- "left join com_act_easy_photo_user pu ON p.id = pu.easy_photo_id \n" +
+ "left join com_act_easy_photo_user pu ON p.id = pu.easy_photo_id " +
"<if test='comActEasyPhotoVO.handlerName == null or comActEasyPhotoVO.handlerName.trim() == ""'>" +
- "left JOIN sys_user su ON p.handler_id = su.user_id \n" +
+ "left JOIN sys_user su ON p.handler_id = su.user_id " +
" </if> " +
"<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != ""'>" +
- " JOIN sys_user su ON p.handler_id = su.user_id \n" +
+ " JOIN sys_user su ON p.handler_id = su.user_id " +
" </if> " +
"<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != ""'>" +
- "AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%') \n" +
+ "AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%') " +
" </if> " +
"where p.del_tag = 0 and p.status !=2"+
"<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
" and p.community_id=#{comActEasyPhotoVO.communityId} " +
" </if> " +
"<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != ""'>" +
- "AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%') \n" +
+ "AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%') " +
" </if> " +
"<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
- "AND p.`status` = #{comActEasyPhotoVO.status} \n" +
+ "AND p.`status` = #{comActEasyPhotoVO.status} " +
" </if> " +
"<if test='comActEasyPhotoVO.createBegin != null '>" +
- "AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin} \n" +
+ "AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin} " +
"AND #{comActEasyPhotoVO.createEnd}" +
" </if> " +
"<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
- "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} \n" +
+ "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} " +
+ " </if> " +
+ "<if test='comActEasyPhotoVO.activityType != null'>" +
+ "AND p.activity_type =#{comActEasyPhotoVO.activityType} " +
+ " </if> " +
+ "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 1'>" +
+ " AND (p.status = 1 or (p.status > 1 and is_need_feed_back = 0)) " +
+ " </if> " +
+ "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 2'>" +
+ " AND p.status > 1 and is_need_feed_back = 1 " +
" </if> " +
"group by p.id "+
"union all "+
- "SELECT\n" +
- "p.id,\n" +
- "u.`name` sponsor_name,\n" +
- "u.phone phone,\n" +
- "count(pu.id)giveThumbsUpNum,\n" +
- "u.image_url,\n" +
- "p.happen_addr,\n" +
- "su.`name` handler_name,\n" +
- "p.`status`,\n" +
- "p.`detail`,\n" +
- "p.`is_need_feed_back`,\n" +
- "p.`photo_path_list`,\n" +
- "p.create_at,\n" +
- "p.feedback_at,\n" +
- "p.is_report,\n" +
- "p.is_publicity,\n" +
- "p.examine_at \n" +
- "FROM\n" +
- "com_act_easy_photo p\n" +
- "JOIN sys_user u ON p.sponsor_id = u.user_id \n" +
+ "SELECT " +
+ "p.id, " +
+ "u.`name` sponsor_name, " +
+ "u.phone phone, " +
+ "count(pu.id)giveThumbsUpNum, " +
+ "u.image_url, " +
+ "p.happen_addr, " +
+ "su.`name` handler_name, " +
+ "p.`status`, " +
+ "p.`detail`, " +
+ "p.`is_need_feed_back`, " +
+ "p.`photo_path_list`, " +
+ "p.create_at, " +
+ "p.feedback_at, " +
+ "p.is_report, " +
+ "p.is_publicity, " +
+ "p.activity_type, " +
+ "p.activity_amount, " +
+ "p.activity_id, " +
+ "p.examine_at " +
+ "FROM " +
+ "com_act_easy_photo p " +
+ "JOIN sys_user u ON p.sponsor_id = u.user_id " +
"<if test='comActEasyPhotoVO.sponsorName != null and comActEasyPhotoVO.sponsorName.trim() != ""'>" +
- "AND u.`name` like concat(#{comActEasyPhotoVO.sponsorName},'%') \n" +
+ "AND u.`name` like concat(#{comActEasyPhotoVO.sponsorName},'%') " +
" </if> " +
"<if test='comActEasyPhotoVO.userId != null and comActEasyPhotoVO.userId != 0'>" +
- "AND u.`user_id` = #{comActEasyPhotoVO.userId} \n" +
+ "AND u.`user_id` = #{comActEasyPhotoVO.userId} " +
" </if> " +
- "left join com_act_easy_photo_user pu ON p.id = pu.easy_photo_id \n" +
+ "left join com_act_easy_photo_user pu ON p.id = pu.easy_photo_id " +
"<if test='comActEasyPhotoVO.handlerName == null or comActEasyPhotoVO.handlerName.trim() == ""'>" +
- "left JOIN sys_user su ON p.handler_id = su.user_id \n" +
+ "left JOIN sys_user su ON p.handler_id = su.user_id " +
" </if> " +
"<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != ""'>" +
- " JOIN sys_user su ON p.handler_id = su.user_id \n" +
+ " JOIN sys_user su ON p.handler_id = su.user_id " +
" </if> " +
"<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != ""'>" +
- "AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%') \n" +
+ "AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%') " +
" </if> " +
"where p.del_tag = 0 and p.status=2 and p.is_need_feed_back=1 " +
"<if test='comActEasyPhotoVO.backUserId != null and comActEasyPhotoVO.backUserId != 0'>" +
@@ -128,115 +144,125 @@
" and p.community_id=#{comActEasyPhotoVO.communityId} " +
" </if> " +
"<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != ""'>" +
- "AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%') \n" +
+ "AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%') " +
" </if> " +
"<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
- "AND p.`status` = #{comActEasyPhotoVO.status} \n" +
+ "AND p.`status` = #{comActEasyPhotoVO.status} " +
" </if> " +
"<if test='comActEasyPhotoVO.createBegin != null '>" +
- "AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin} \n" +
+ "AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin} " +
"AND #{comActEasyPhotoVO.createEnd}" +
" </if> " +
"<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
- "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} \n" +
+ "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} " +
+ " </if> " +
+ "<if test='comActEasyPhotoVO.activityType != null'>" +
+ "AND p.activity_type =#{comActEasyPhotoVO.activityType} " +
+ " </if> " +
+ "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 1'>" +
+ " AND (p.status = 1 or (p.status > 1 and is_need_feed_back = 0)) " +
+ " </if> " +
+ "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 2'>" +
+ " AND p.status > 1 and is_need_feed_back = 1 " +
" </if> " +
" group by p.id "+
")t order by t.create_at desc "+
"</script>")
IPage<ComActEasyPhotoVO> pageEasyPhoto(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO);
- @Select("SELECT \n" +
- "p.id,\n" +
- "p.sponsor_id,\n" +
- "p.feedback_at,\n" +
- "p.examine_at,\n" +
- "p.create_at,\n" +
- "u.`name` sponsorName,\n" +
- "u.nick_name userNickName,\n" +
- "su.`name` handlerName,\n" +
- "u.`image_url`,\n" +
- "u.phone,\n" +
- "p.detail,\n" +
- "p.is_need_feed_back,\n" +
- "p.examine_at,\n" +
- "p.status,\n" +
- "p.reject_reason,\n" +
- "p.is_hide,\n" +
- "p.happen_addr,\n" +
- "p.addr_remark,\n" +
- "su.`name`,\n" +
- "p.handle_result,\n" +
- "p.photo_path_list,\n" +
- "p.activity_type,\n" +
- "p.activity_amount,\n" +
- "count(pu.id)giveThumbsUpNum,\n" +
- "p.handle_photo_list\n" +
- "FROM\n" +
- "com_act_easy_photo p\n" +
- "JOIN sys_user u on p.sponsor_id=u.user_id\n" +
- "LEFT JOIN sys_user su on p.handler_id=su.user_id\n" +
- "LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id\n" +
+ @Select("SELECT " +
+ "p.id, " +
+ "p.sponsor_id, " +
+ "p.feedback_at, " +
+ "p.examine_at, " +
+ "p.create_at, " +
+ "u.`name` sponsorName, " +
+ "u.nick_name userNickName, " +
+ "su.`name` handlerName, " +
+ "u.`image_url`, " +
+ "u.phone, " +
+ "p.detail, " +
+ "p.is_need_feed_back, " +
+ "p.examine_at, " +
+ "p.status, " +
+ "p.reject_reason, " +
+ "p.is_hide, " +
+ "p.happen_addr, " +
+ "p.addr_remark, " +
+ "su.`name`, " +
+ "p.handle_result, " +
+ "p.photo_path_list, " +
+ "p.activity_type, " +
+ "p.activity_id, " +
+ "p.activity_amount, " +
+ "count(pu.id)giveThumbsUpNum, " +
+ "p.handle_photo_list " +
+ "FROM " +
+ "com_act_easy_photo p " +
+ "JOIN sys_user u on p.sponsor_id=u.user_id " +
+ "LEFT JOIN sys_user su on p.handler_id=su.user_id " +
+ "LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id " +
"WHERE p.del_tag = 0 and p.id=#{id}")
ComActEasyPhotoVO detailEasyPhoto(Long id);
- @Select("SELECT\n" +
- "'1' type\n" +
- "FROM\n" +
- " com_act_easy_photo p \n" +
- "WHERE\n" +
- " p.del_tag = 0 and p.community_id = #{communityId} \n" +
- "AND p.STATUS = 1 \n"+
- "\n" +
- "union all \n" +
- "\n" +
- "SELECT\n" +
- "'1' type\n" +
- "FROM\n" +
- " com_act_easy_photo p \n" +
- "WHERE\n" +
- " p.del_tag = 0 and p.community_id = #{communityId} \n" +
- "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId}\n"
+ @Select("SELECT " +
+ "'1' type " +
+ "FROM " +
+ " com_act_easy_photo p " +
+ "WHERE " +
+ " p.del_tag = 0 and p.community_id = #{communityId} " +
+ "AND p.STATUS = 1 "+
+ " " +
+ "union all " +
+ " " +
+ "SELECT " +
+ "'1' type " +
+ "FROM " +
+ " com_act_easy_photo p " +
+ "WHERE " +
+ " p.del_tag = 0 and p.community_id = #{communityId} " +
+ "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId} "
)
List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
@Select("<script> " +
- "SELECT\n" +
- "p.id,\n" +
- "u.`name` sponsor_name,\n" +
- "u.`nick_name` userNickName,\n" +
- "u.phone sponsor_phone,\n" +
- "count(DISTINCT pu.id)giveThumbsUpNum,\n" +
- "count(DISTINCT c.id)commentNum,\n" +
- "u.image_url,\n" +
- "p.happen_addr,\n" +
- "su.`name` handler_name,\n" +
- "p.`status`,\n" +
- "p.`is_hide`,\n" +
- "p.`detail`,\n" +
- "p.`is_need_feed_back`,\n" +
- "p.`photo_path_list`,\n" +
- "p.create_at,\n" +
- "p.feedback_at,\n" +
- "p.activity_type,\n" +
- "p.activity_amount,\n" +
- "p.examine_at \n" +
- "FROM\n" +
- "com_act_easy_photo p\n" +
- "JOIN sys_user u ON p.sponsor_id = u.user_id \n" +
- "left join com_act_easy_photo_user pu ON p.id = pu.easy_photo_id \n" +
- "left JOIN sys_user su ON p.handler_id = su.user_id \n" +
- "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id \n" +
+ "SELECT " +
+ "p.id, " +
+ "u.`name` sponsor_name, " +
+ "u.`nick_name` userNickName, " +
+ "u.phone sponsor_phone, " +
+ "count(DISTINCT pu.id)giveThumbsUpNum, " +
+ "count(DISTINCT c.id)commentNum, " +
+ "u.image_url, " +
+ "p.happen_addr, " +
+ "su.`name` handler_name, " +
+ "p.`status`, " +
+ "p.`is_hide`, " +
+ "p.`detail`, " +
+ "p.`is_need_feed_back`, " +
+ "p.`photo_path_list`, " +
+ "p.create_at, " +
+ "p.feedback_at, " +
+ "p.activity_type, " +
+ "p.activity_amount, " +
+ "p.examine_at " +
+ "FROM " +
+ "com_act_easy_photo p " +
+ "JOIN sys_user u ON p.sponsor_id = u.user_id " +
+ "left join com_act_easy_photo_user pu ON p.id = pu.easy_photo_id " +
+ "left JOIN sys_user su ON p.handler_id = su.user_id " +
+ "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id " +
" <where>" +
" p.del_tag = 0 " +
"<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
" and p.community_id=#{comActEasyPhotoVO.communityId} " +
" </if> " +
"<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
- "AND p.`status` = #{comActEasyPhotoVO.status} \n" +
+ "AND p.`status` = #{comActEasyPhotoVO.status} " +
" </if> " +
"<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
- "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} \n" +
+ "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} " +
" </if> " +
"<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
- "AND p.`status` in (2,4) \n" +
+ "AND p.`status` in (2,4) " +
" </if> " +
"group by p.id "+
"order by p.create_at desc "+
@@ -276,4 +302,16 @@
"(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id =#{communityId} AND handle_status = 2 AND #{start} < create_at and create_at < #{end}) AS deal " +
"FROM com_act_easy_photo WHERE community_id = #{communityId} AND #{start} < create_at and create_at < #{end} ")
EastPhotoVO countByTime(@Param("start")String start, @Param("end")String end, @Param("nowDate")String nowDate, @Param("communityId")Long communityId);
+
+ @Select("SELECT " +
+ " count( id ) AS examineNum, " +
+ " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = #{communityId} and del_tag = 0 ) AS verificationNum, " +
+ " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 3 AND community_id = #{communityId} and del_tag = 0 ) AS rejectNum, " +
+ " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = #{communityId} and del_tag = 0 ) AS completeNum " +
+ "FROM " +
+ " com_act_easy_photo " +
+ "WHERE " +
+ " `status` = 1 " +
+ " AND community_id = #{communityId} and del_tag = 0")
+ ComActEasyPhotoStatisticsVO getEasyPhotoStatistics(@Param("communityId")Long communityId);
}
--
Gitblit v1.7.1