From 38dc14bef5a71542aa97bf0b2c1ce9581d2e50b1 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 10 六月 2021 14:13:38 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 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 1cc19ae..b214622 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,7 +25,7 @@
"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" +
@@ -36,6 +36,8 @@
"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" +
@@ -56,7 +58,7 @@
"<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != ""'>" +
"AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%') \n" +
" </if> " +
- "where p.status !=2"+
+ "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> " +
@@ -80,7 +82,7 @@
"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" +
@@ -91,6 +93,8 @@
"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" +
@@ -111,7 +115,7 @@
"<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != ""'>" +
"AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%') \n" +
" </if> " +
- "where p.status=2 and p.is_need_feed_back=1 " +
+ "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'>" +
"and p.handler_id=#{comActEasyPhotoVO.backUserId}"+
" </if> " +
@@ -138,8 +142,11 @@
@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" +
@@ -150,6 +157,7 @@
"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" +
@@ -160,46 +168,41 @@
"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" +
- "WHERE p.id=#{id}")
+ "WHERE p.del_tag = 0 and 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" +
+ " 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" +
+ " p.del_tag = 0 and p.community_id = #{communityId} \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" +
+ " 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")
+ " 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"
+ )
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(pu.id)giveThumbsUpNum,\n" +
- "count(c.id)commentNum,\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" +
@@ -213,6 +216,7 @@
"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>" +
+ " p.del_tag = 0 " +
"<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
" and p.community_id=#{comActEasyPhotoVO.communityId} " +
" </if> " +
--
Gitblit v1.7.1