From 2eea3290641657d2ee13edd90d27f8b2ec01c209 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期六, 08 五月 2021 18:23:48 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 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 c447377..f749652 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
@@ -138,6 +138,8 @@
@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" +
@@ -150,6 +152,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" +
@@ -163,30 +166,23 @@
"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> " +
--
Gitblit v1.7.1