From e9d5fb4b01c383fa5b01bf5e730d4e3da73f266e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 30 十二月 2021 11:27:15 +0800
Subject: [PATCH] 12/30 河门口大屏特殊修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
index 905579a..0d04a87 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -50,7 +50,7 @@
+ "left join sys_user u on a.sponsor_id=u.user_id " + "left join (select * from com_act_act_sign where `status` = 1) s on a.id=s.activity_id "
+ "left join com_act ca on a.community_id=ca.community_id " + " where 1=1 " +
- "<if test='comActActivityVO.choice == 0 '>" + "AND a.community_id = #{comActActivityVO.communityId} " + " </if> "
+ "<if test='comActActivityVO.choice == 0 '>" + "AND a.community_id = ${comActActivityVO.communityId} " + " </if> "
+
"<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != ""'>"
@@ -119,7 +119,7 @@
// + "a.publish_at, " + "a.is_qr_code, " + "a.begin_at, " + "a.end_at, " + "a.sign_up_begin, " + "a.sign_up_end " + "FROM "
// + " com_act_activity a " + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id "
// + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id " + "WHERE "
-// + " a.`status` = 1 and a.community_id = #{comActActivityVO.communityId} "
+// + " a.`status` = 1 and a.community_id = ${comActActivityVO.communityId} "
// + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=""'>"
// + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' ) " + " </if> "
// + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.status !=1'>"
@@ -131,7 +131,7 @@
// + "count(if(s.is_volunteer=1,s.id,null))volunteer_now, " + "a.`status`, " + "a.publish_at, " + "a.is_qr_code, " + "a.begin_at, "
// + "a.end_at, " + "a.sign_up_begin, " + "a.sign_up_end " + "FROM " + " com_act_activity a "
// + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id " + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id "
-// + "WHERE " + " a.`status` != 1 and a.community_id = #{comActActivityVO.communityId} "
+// + "WHERE " + " a.`status` != 1 and a.community_id = ${comActActivityVO.communityId} "
// + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=""'>"
// + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' ) " + " </if> "
// + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 '>"
@@ -153,37 +153,37 @@
int updateStatusToBeginAfterSingEnd();
@Select("select GROUP_CONCAT(t.x1,',',t.x2,',',t.x3,',',t.x4) from ( " + "SELECT "
- + "(select COUNT(d.id) from com_act_discuss d where d.community_id = #{communityId})x1, "
- + "(select COUNT(w.id) from com_act_micro_wish w where w.community_id = #{communityId})x2, "
- + "(select COUNT(p.id) from com_act_easy_photo p where p.community_id = #{communityId})x3, "
- + " COUNT( a.id ) x4 " + "FROM " + " com_pb_activity a " + "WHERE " + " a.community_id = #{communityId})t")
+ + "(select COUNT(d.id) from com_act_discuss d where d.community_id = ${communityId})x1, "
+ + "(select COUNT(w.id) from com_act_micro_wish w where w.community_id = ${communityId})x2, "
+ + "(select COUNT(p.id) from com_act_easy_photo p where p.community_id = ${communityId})x3, "
+ + " COUNT( a.id ) x4 " + "FROM " + " com_pb_activity a " + "WHERE " + " a.community_id = ${communityId})t")
String selectCommunityGovernanceTrendsVO(Long communityId);
@Select(" " + " SELECT "
- + " (select COUNT(d.id) from com_act_discuss d where DATE_FORMAT(d.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and d.community_id = #{communityId})discuss, "
- + " (select COUNT(w.id) from com_act_micro_wish w where DATE_FORMAT(w.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and w.community_id = #{communityId})microWish, "
- + " (select COUNT(p.id) from com_act_easy_photo p where DATE_FORMAT(p.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and p.community_id = #{communityId})eashPhoto, "
- + " (select COUNT(pa.id) from com_pb_activity pa where DATE_FORMAT(pa.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and pa.community_id = #{communityId})pbActivity, "
+ + " (select COUNT(d.id) from com_act_discuss d where DATE_FORMAT(d.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and d.community_id = ${communityId})discuss, "
+ + " (select COUNT(w.id) from com_act_micro_wish w where DATE_FORMAT(w.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and w.community_id = ${communityId})microWish, "
+ + " (select COUNT(p.id) from com_act_easy_photo p where DATE_FORMAT(p.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and p.community_id = ${communityId})eashPhoto, "
+ + " (select COUNT(pa.id) from com_pb_activity pa where DATE_FORMAT(pa.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and pa.community_id = ${communityId})pbActivity, "
+ " COUNT( a.id ) actActivity " + " FROM " + " com_pb_activity a " + " WHERE "
+ " DATE_FORMAT( a.create_at, '%Y-%m-%d' )=DATE_FORMAT(#{date},'%Y-%m-%d') "
- + " AND a.community_id = #{communityId}")
+ + " AND a.community_id = ${communityId}")
CommunityActivitiesVO selectCommunityActivitiesVO(@Param("communityId") Long communityId, @Param("date") Date date);
@Select("SELECT " + " count( caa.id ) as totalNum, "
- + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and volunteer_min = 0 and community_id = #{communityId}) as commonNum, "
- + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and volunteer_min > 0 and community_id = #{communityId}) as volunteerNum, "
- + " (select count(caas.user_id) from (select * from com_act_act_sign where `status` = 1) as caas left join com_act_activity as caa on caa.id = caas.activity_id where caa.`status` IN (1,2,3,4,5) and is_volunteer = 0 and caa.community_id = #{communityId}) as commonPeopleNum, "
- + " (select count(caas.user_id) from (select * from com_act_act_sign where `status` = 1) as caas left join com_act_activity as caa on caa.id = caas.activity_id where caa.`status` IN (1,2,3,4,5) and is_volunteer = 1 and caa.community_id = #{communityId}) as volunteerPeopleNum, "
- + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and community_id = #{communityId} and create_at between date_sub(curdate() - day(curdate()) +1,interval 1 month) and now()) as currentNum "
+ + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and volunteer_min = 0 and community_id = ${communityId}) as commonNum, "
+ + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and volunteer_min > 0 and community_id = ${communityId}) as volunteerNum, "
+ + " (select count(caas.user_id) from (select * from com_act_act_sign where `status` = 1) as caas left join com_act_activity as caa on caa.id = caas.activity_id where caa.`status` IN (1,2,3,4,5) and is_volunteer = 0 and caa.community_id = ${communityId}) as commonPeopleNum, "
+ + " (select count(caas.user_id) from (select * from com_act_act_sign where `status` = 1) as caas left join com_act_activity as caa on caa.id = caas.activity_id where caa.`status` IN (1,2,3,4,5) and is_volunteer = 1 and caa.community_id = ${communityId}) as volunteerPeopleNum, "
+ + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and community_id = ${communityId} and create_at between date_sub(curdate() - day(curdate()) +1,interval 1 month) and now()) as currentNum "
+ "FROM " + " com_act_activity AS caa " + "WHERE "
- + " caa.`status` IN (1,2,3,4,5) and community_id = #{communityId}")
+ + " caa.`status` IN (1,2,3,4,5) and community_id = ${communityId}")
Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("nowDate") String nowDate);
@Select("SELECT id,activity_name as content,IF(volunteer_max = 0,'居民活动','志愿者活动') AS typeName FROM com_act_activity "
- + "WHERE community_id = #{communityId} AND (status = 3 OR status = 4 OR status = 5) ORDER BY create_at DESC LIMIT #{pageSize}")
+ + "WHERE community_id = ${communityId} AND (status = 3 OR status = 4 OR status = 5) ORDER BY create_at DESC LIMIT #{pageSize}")
List<CarouselInfoVO> screenActivity(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
- @Select("SELECT cover FROM com_act_activity WHERE community_id = #{communityId}")
+ @Select("SELECT cover FROM com_act_activity WHERE community_id = ${communityId}")
List<String> listImg(@Param("communityId") Long communityId);
@Select("<script> " + "SELECT " + " caa.id, " + " su.`name` AS userName , " + " su.image_url, "
@@ -193,7 +193,7 @@
+ " caa.content, " + " caa.activity_addr " + "FROM " + " com_act_activity AS caa "
+ " LEFT JOIN sys_user AS su ON su.user_id = caa.sponsor_id" + " <where> "
+ "<if test='actActivityListDTO.communityId != null '>"
- + " and caa.community_id = #{actActivityListDTO.communityId} " + " </if> "
+ + " and caa.community_id = ${actActivityListDTO.communityId} " + " </if> "
+ "<if test='actActivityListDTO.startTime!=null and actActivityListDTO.startTime != ""'>"
+ " AND DATE_FORMAT(caa.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{actActivityListDTO.startTime} "
+ " </if> " + "<if test='actActivityListDTO.endTime!=null and actActivityListDTO.endTime != ""'>"
--
Gitblit v1.7.1