From e51920eaf378f6e2042560d02a4bc4011548ff27 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 16 三月 2022 11:24:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
index c4b8e45..fe43d26 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
@@ -154,7 +154,7 @@
     </select>
     <select id="getActAddPolylineData" resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
         SELECT filed, SUM(num) AS num FROM (
-            SELECT DATE_FORMAT( publish_at, '%Y-%m' ) AS filed, COUNT(id) AS num
+            SELECT DATE_FORMAT( create_at, '%Y-%m' ) AS filed, COUNT(id) AS num
             FROM com_act_activity
             WHERE community_id = ${communityId} AND `status` IN(2,3,4,5)
             <if test="isResidentAct">
@@ -163,7 +163,7 @@
             <if test="!isResidentAct">
                 AND `type` = 1
             </if>
-            AND DATE_FORMAT( publish_at, '%Y-%m' ) &gt; DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m') GROUP BY filed
+            AND DATE_FORMAT( create_at, '%Y-%m' ) &gt; DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m') GROUP BY filed
             UNION ALL SELECT * FROM
             (
                 SELECT DATE_FORMAT(curdate(),'%Y-%m') AS filed, 0 AS num union

--
Gitblit v1.7.1