From d7963ef17fe5d68b5e9bcc13e21abb7379cf4dbe Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 14 十二月 2021 17:28:40 +0800
Subject: [PATCH] 大屏代码提交
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml
index 8b263af..1bf14e7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml
@@ -132,8 +132,8 @@
(select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 3 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as ptDayTotal,
(select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 4) as ybAllTotal,
(select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 4 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as ybDayTotal,
- (select IFNULL(sum(activity_amount),0) from com_act_easy_photo where `status` in (2,4) AND community_id = 2 and del_tag = 0) as allRewardAmount,
- (select IFNULL(sum(activity_amount),0) from com_act_easy_photo where `status` in (2,4) AND community_id = 2 and del_tag = 0 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as dayRewardAmount
+ (select IFNULL(sum(activity_amount),0) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0) as allRewardAmount,
+ (select IFNULL(sum(activity_amount),0) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as dayRewardAmount
FROM
com_act_easy_photo
WHERE
@@ -323,27 +323,27 @@
SELECT
IFNULL((SELECT count( e.id ) FROM `event` AS e
LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
- WHERE e.event_category = 1 AND e.event_type = 5 AND e.event_status = 2 AND egd.grid_community_id = 2), 0) +
+ WHERE e.event_category = 1 AND e.event_type = 5 AND e.event_status = 2 AND egd.grid_community_id = #{communityId}), 0) +
IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
WHERE community_id = #{communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 7), 0) AS eventTFTotal,
IFNULL(( SELECT count( e1.id ) FROM `event` AS e1
- LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id WHERE event_category = 1 AND event_type = 1 AND event_status = 2 AND egd1.grid_community_id = 2 ), 0 ) +
+ LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id WHERE event_category = 1 AND event_type = 1 AND event_status = 2 AND egd1.grid_community_id = #{communityId} ), 0 ) +
IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
WHERE community_id = #{communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 4), 0) AS eventZATotal,
- IFNULL(( SELECT count( e2.id ) FROM `event` AS e2 LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id WHERE event_category = 1 AND event_type = 3 AND event_status = 2 AND egd2.grid_community_id = 2 ), 0 ) +
+ IFNULL(( SELECT count( e2.id ) FROM `event` AS e2 LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id WHERE event_category = 1 AND event_type = 3 AND event_status = 2 AND egd2.grid_community_id = #{communityId} ), 0 ) +
IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
WHERE community_id = #{communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 5), 0) AS eventMDTotal,
- IFNULL(( SELECT count( e3.id ) FROM `event` AS e3 LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id WHERE event_category = 1 AND event_type = 6 AND event_status = 2 AND egd3.grid_community_id = 2 ), 0 ) +
+ IFNULL(( SELECT count( e3.id ) FROM `event` AS e3 LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id WHERE event_category = 1 AND event_type = 6 AND event_status = 2 AND egd3.grid_community_id = #{communityId} ), 0 ) +
IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
WHERE community_id = #{communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 3), 0) AS eventTSTotal,
IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
WHERE community_id = #{communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 8), 0) AS eventFJTotal,
- IFNULL(( SELECT count( e5.id ) FROM `event` AS e5 LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id WHERE event_category = 1 AND event_type = 2 AND event_status = 2 AND egd5.grid_community_id = 2 ), 0 ) +
+ IFNULL(( SELECT count( e5.id ) FROM `event` AS e5 LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id WHERE event_category = 1 AND event_type = 2 AND event_status = 2 AND egd5.grid_community_id = #{communityId} ), 0 ) +
IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
WHERE community_id = #{communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 6), 0) AS eventMSTotal,
@@ -352,27 +352,27 @@
IFNULL((SELECT count( e.id ) FROM `event` AS e
LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
- WHERE e.event_category = 1 AND e.event_type = 5 AND e.event_deal_status = 4 AND egd.grid_community_id = 2), 0) +
+ WHERE e.event_category = 1 AND e.event_type = 5 AND e.event_deal_status = 4 AND egd.grid_community_id = #{communityId}), 0) +
IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
WHERE community_id = #{communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 7), 0) AS eventTFDeal,
IFNULL(( SELECT count( e1.id ) FROM `event` AS e1
- LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id WHERE event_category = 1 AND event_type = 1 AND event_deal_status = 4 AND egd1.grid_community_id = 2 ), 0 ) +
+ LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id WHERE event_category = 1 AND event_type = 1 AND event_deal_status = 4 AND egd1.grid_community_id = #{communityId} ), 0 ) +
IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
WHERE community_id = #{communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 4), 0) AS eventZADeal,
- IFNULL(( SELECT count( e2.id ) FROM `event` AS e2 LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id WHERE event_category = 1 AND event_type = 3 AND event_deal_status = 4 AND egd2.grid_community_id = 2 ), 0 ) +
+ IFNULL(( SELECT count( e2.id ) FROM `event` AS e2 LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id WHERE event_category = 1 AND event_type = 3 AND event_deal_status = 4 AND egd2.grid_community_id = #{communityId} ), 0 ) +
IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
WHERE community_id = #{communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 5), 0) AS eventMDDeal,
- IFNULL(( SELECT count( e3.id ) FROM `event` AS e3 LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id WHERE event_category = 1 AND event_type = 6 AND event_deal_status = 4 AND egd3.grid_community_id = 2 ), 0 ) +
+ IFNULL(( SELECT count( e3.id ) FROM `event` AS e3 LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id WHERE event_category = 1 AND event_type = 6 AND event_deal_status = 4 AND egd3.grid_community_id = #{communityId} ), 0 ) +
IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
WHERE community_id = #{communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 3), 0) AS eventTSDeal,
IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
WHERE community_id = #{communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 8), 0) AS eventFJDeal,
- IFNULL(( SELECT count( e5.id ) FROM `event` AS e5 LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id WHERE event_category = 1 AND event_type = 2 AND event_deal_status = 4 AND egd5.grid_community_id = 2 ), 0 ) +
+ IFNULL(( SELECT count( e5.id ) FROM `event` AS e5 LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id WHERE event_category = 1 AND event_type = 2 AND event_deal_status = 4 AND egd5.grid_community_id = #{communityId} ), 0 ) +
IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
WHERE community_id = #{communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 6), 0) AS eventMSDeal,
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
index 410bc56..9ae12be 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -1068,7 +1068,7 @@
WHERE
e3.event_status = 2
AND e3.create_at LIKE CONCAT(#{nowDate},'%')) as currentNum,
- (select count(id) from com_act_easy_photo where community_id = 2 and del_tag = 0 and create_at LIKE CONCAT(#{nowDate},'%')) as sspCurrentNum
+ (select count(id) from com_act_easy_photo where community_id = #{communityId} and del_tag = 0 and create_at LIKE CONCAT(#{nowDate},'%')) as sspCurrentNum
FROM
`event` AS e
--
Gitblit v1.7.1