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 | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 cdd7231..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
@@ -45,6 +45,7 @@
"p.is_report, " +
"p.is_publicity, " +
"p.activity_type, " +
+ "p.activity_id, " +
"p.activity_amount, " +
"p.examine_at " +
"FROM " +
@@ -83,6 +84,15 @@
"<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
"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 "+
@@ -105,6 +115,7 @@
"p.is_publicity, " +
"p.activity_type, " +
"p.activity_amount, " +
+ "p.activity_id, " +
"p.examine_at " +
"FROM " +
"com_act_easy_photo p " +
@@ -181,6 +192,7 @@
"p.handle_result, " +
"p.photo_path_list, " +
"p.activity_type, " +
+ "p.activity_id, " +
"p.activity_amount, " +
"count(pu.id)giveThumbsUpNum, " +
"p.handle_photo_list " +
@@ -293,13 +305,13 @@
@Select("SELECT " +
" count( id ) AS examineNum, " +
- " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = #{communityId} ) AS verificationNum, " +
- " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 3 AND community_id = #{communityId} ) AS rejectNum, " +
- " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = #{communityId} ) AS completeNum " +
+ " ( 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 community_id = #{communityId} and del_tag = 0")
ComActEasyPhotoStatisticsVO getEasyPhotoStatistics(@Param("communityId")Long communityId);
}
--
Gitblit v1.7.1