From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 211c4f3..83263e4 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
@@ -169,6 +169,8 @@
")t order by t.create_at desc "+
"</script>")
IPage<ComActEasyPhotoVO> pageEasyPhoto(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO);
+
+ IPage<ComActEasyPhotoVO> pageEasyPhotoAdmin(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO);
@Select("SELECT " +
"p.id, " +
"p.sponsor_id, " +
@@ -178,6 +180,7 @@
"u.`name` sponsorName, " +
"u.nick_name userNickName, " +
"su.`name` handlerName, " +
+ "su1.`name` completeName, " +
"u.`image_url`, " +
"u.phone, " +
"p.detail, " +
@@ -200,6 +203,7 @@
"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 sys_user su1 on p.complete_id=su1.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);
@@ -303,15 +307,15 @@
"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")
+// @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