From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java | 87 +++++++++++++++++++++++++++++++------------
1 files changed, 63 insertions(+), 24 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 ddbc980..3761ef5 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
@@ -92,33 +92,72 @@
+ " ORDER BY join_time ASC " + " LIMIT 3 " + "</script>")
List<PartyBuildingMemberVO> defaultPartyactivity(@Param("communityId") Long communityId);
+// @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 MONTH ),'%Y-%m') as idxName " + "FROM " + " ( "
+// + " SELECT @cdate := date_add(now(), INTERVAL 1 MONTH ) " + " FROM com_pb_activity LIMIT 12 " + " )d "
+// + " ORDER BY idxName " + ")m LEFT JOIN " + "( " + "SELECT "
+// + " date_format(activity_time_begin, '%Y-%m') 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( DATE_ADD( STR_TO_DATE(#{queryDTO.date}, '%Y-%m-%d'), INTERVAL 1 MONTH ), '%Y-%m-%d' ) AND "
+// + " activity_time_begin > DATE_FORMAT( DATE_ADD( STR_TO_DATE(#{queryDTO.date}, '%Y-%m-%d'), INTERVAL - 12 MONTH ), '%Y-%m-%d') "
+// + " GROUP BY idxName " + " ORDER BY idxName ASC " + " ) d ON m.idxName = d.idxName "
+// + " WHERE m.idxName > '2020-12-31' " + " 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);
+
+
+
+
+
@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 MONTH ),'%Y-%m') as idxName " + "FROM " + " ( "
- + " SELECT @cdate := date_add(now(), INTERVAL 1 MONTH ) " + " FROM com_pb_activity LIMIT 12 " + " )d "
- + " ORDER BY idxName " + ")m LEFT JOIN " + "( " + "SELECT "
- + " date_format(activity_time_begin, '%Y-%m') 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( DATE_ADD( STR_TO_DATE(#{queryDTO.date}, '%Y-%m-%d'), INTERVAL 1 MONTH ), '%Y-%m-%d' ) AND "
- + " activity_time_begin > DATE_FORMAT( DATE_ADD( STR_TO_DATE(#{queryDTO.date}, '%Y-%m-%d'), INTERVAL - 12 MONTH ), '%Y-%m-%d') "
- + " GROUP BY idxName " + " ORDER BY idxName ASC " + " ) d ON m.idxName = d.idxName "
- + " WHERE m.idxName > '2020-12-31' " + " ORDER BY m.idxName " + "</script>")
+ + " FROM " + " ( " + " SELECT "
+ + " DATE_FORMAT(@cdate := date_add( @cdate, INTERVAL - 1 MONTH ),'%Y-%m') as idxName " + "FROM " + " ( "
+ + " SELECT @cdate := date_add(now(), INTERVAL 1 MONTH ) " + " FROM com_act_activity LIMIT 12 " + " )d "
+ + " ORDER BY idxName " + ")m LEFT JOIN " + "( " + "SELECT "
+ + " date_format(begin_at, '%Y-%m') AS idxName, " + " COUNT(id) AS total "
+ + " FROM com_act_activity " + " WHERE "
+ + " community_id = ${queryDTO.communityId} AND STATUS IN ( 3, 4, 5 ,6) AND "
+ + " begin_at < DATE_FORMAT( DATE_ADD( STR_TO_DATE(#{queryDTO.date}, '%Y-%m-%d'), INTERVAL 1 MONTH ), '%Y-%m-%d' ) AND "
+ + " begin_at > DATE_FORMAT( DATE_ADD( STR_TO_DATE(#{queryDTO.date}, '%Y-%m-%d'), INTERVAL - 12 MONTH ), '%Y-%m-%d') "
+ + " GROUP BY idxName " + " ORDER BY idxName ASC " + " ) d ON m.idxName = d.idxName "
+ + " WHERE m.idxName > '2020-12-31' " + " ORDER BY m.idxName " + "</script>")
List<BigScreenStatisticPartyActivity>
- partyactivity(@Param("queryDTO") BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
+ 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>")
+ + " 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_act_activity LIMIT 7 ) d "
+ + " ORDER BY " + " idxName " + " ) m " + " LEFT JOIN ( " + " SELECT "
+ + " date_format( begin_at, '%Y-%m-%d' ) AS idxName, " + " COUNT( id ) AS total " + " FROM "
+ + " com_act_activity " + " WHERE " + " community_id = ${queryDTO.communityId} "
+ + " AND STATUS IN ( 3, 4, 5 ,6) "
+ + " AND begin_at < DATE_FORMAT( STR_TO_DATE( #{queryDTO.startTime}, '%Y-%m-%d' ), '%Y-%m-%d' ) "
+ + " AND begin_at > 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);
+ partyactivityByWeek(@Param("queryDTO") BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
+
+
+
+
+
}
--
Gitblit v1.7.1