From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java
index 841d4af..df92c17 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java
@@ -123,7 +123,7 @@
@Select("<script> " +
" SELECT pm.id, pm.member_id, pm.user_id, pm.name, " +
" case " +
- " when me.photo_path is NOT NULL then me.photo_path \n" +
+ " when me.photo_path is NOT NULL then me.photo_path " +
" when CAST(SUBSTRING(me.id_card , 17, 1) AS SIGNED)%2=1 then 'https://www.psciio.com/idcard/tst/idcard/a723e5bcbd594a48956ef9354c8b477c.jpg' " +
" ELSE 'https://www.psciio.com/idcard/tst/idcard/cfb9b58913074068bba8c7002f91e7ff.jpg' END AS photo_path " +
" ,COUNT(pa.id) AS total " +
@@ -179,4 +179,42 @@
" ORDER BY m.idxName " +
"</script>")
List<BigScreenStatisticPartyActivity> partyactivity(@Param("queryDTO")BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
+
+ @Select("<script> " +
+ "SELECT " +
+ " m.idxName, " +
+ "CASE " +
+ " " +
+ " WHEN d.total IS NOT NULL THEN " +
+ " d.total ELSE 0 " +
+ " END AS total " +
+ "FROM " +
+ " ( " +
+ " SELECT " +
+ " DATE_FORMAT( @cdate := date_add( @cdate, INTERVAL - 1 DAY ), '%Y-%m-%d' ) AS idxName " +
+ " FROM " +
+ " ( SELECT @cdate := date_add( #{queryDTO.endTime}, INTERVAL 1 DAY ) FROM com_pb_activity LIMIT 7 ) d " +
+ " ORDER BY " +
+ " idxName " +
+ " ) m " +
+ " LEFT JOIN ( " +
+ " SELECT " +
+ " date_format( activity_time_begin, '%Y-%m-%d' ) AS idxName, " +
+ " COUNT( id ) AS total " +
+ " FROM " +
+ " com_pb_activity " +
+ " WHERE " +
+ " community_id = #{queryDTO.communityId} " +
+ " AND STATUS IN ( 3, 4, 5 ) " +
+ " AND activity_time_begin < DATE_FORMAT( STR_TO_DATE( #{queryDTO.startTime}, '%Y-%m-%d' ), '%Y-%m-%d' ) " +
+ " AND activity_time_begin > DATE_FORMAT( STR_TO_DATE( #{queryDTO.endTime}, '%Y-%m-%d' ), '%Y-%m-%d' ) " +
+ " GROUP BY " +
+ " idxName " +
+ " ORDER BY " +
+ " idxName ASC " +
+ " ) d ON m.idxName = d.idxName " +
+ "ORDER BY " +
+ " m.idxName" +
+ " </script>")
+ List<BigScreenStatisticPartyActivity> partyactivityByWeek(@Param("queryDTO")BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
}
--
Gitblit v1.7.1