From c30b0597c3ea882dca80df67bae9e30b21b35158 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 10:34:01 +0800
Subject: [PATCH] bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 70 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 14 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 e3e76cf..e1ad360 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
@@ -25,13 +25,14 @@
"SELECT\n" +
"p.id,\n" +
"u.`name` sponsor_name,\n" +
- "u.phone sponsor_phone,\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" +
@@ -79,13 +80,14 @@
"SELECT\n" +
"p.id,\n" +
"u.`name` sponsor_name,\n" +
- "u.phone sponsor_phone,\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" +
@@ -136,12 +138,15 @@
@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" +
"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" +
@@ -160,29 +165,66 @@
"WHERE p.id=#{id}")
ComActEasyPhotoVO detailEasyPhoto(Long id);
@Select("SELECT\n" +
- "'随手拍' FUNCTION,\n" +
- "'待审核' behavior,\n" +
- "'新增随手拍动态待审核' words \n" +
+ "'1' type\n" +
"FROM\n" +
"com_act_easy_photo p \n" +
"WHERE\n" +
"p.community_id = #{communityId} \n" +
- "AND p.STATUS = 1 \n" +
- "GROUP BY\n" +
- "p.community_id\n" +
+ "AND p.STATUS = 1 \n"+
"\n" +
"union all \n" +
"\n" +
"SELECT\n" +
- "'随手拍' FUNCTION,\n" +
- "'需要进行反馈' behavior,\n" +
- "'随手拍有待反馈动态' words \n" +
+ "'1' type\n" +
"FROM\n" +
"com_act_easy_photo p \n" +
"WHERE\n" +
"p.community_id = #{communityId} \n" +
- "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId}\n" +
- "GROUP BY\n" +
- "p.community_id")
+ "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId}\n"
+ )
List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
+
+ @Select("<script> " +
+ "SELECT\n" +
+ "p.id,\n" +
+ "u.`name` sponsor_name,\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.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" +
+ " <where>" +
+ "<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" +
+ " </if> " +
+ "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
+ "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} \n" +
+ " </if> " +
+ "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
+ "AND p.`status` in (2,4) \n" +
+ " </if> " +
+ "group by p.id "+
+ "order by p.create_at desc "+
+ " </where>" +
+ "</script>"
+ )
+ IPage<ComActEasyPhotoVO> pageEasyPhotoApplets(Page page, @Param("comActEasyPhotoVO")ComActEasyPhotoVO comActEasyPhotoVO);
}
--
Gitblit v1.7.1