From bde0a39623f35d6e23aafbbc81920d095f8b1e5f Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 23 七月 2022 10:07:41 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 98 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 89 insertions(+), 9 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 e4c0539..ffbddd7 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
@@ -4,6 +4,8 @@
import java.util.List;
import java.util.Map;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -14,7 +16,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
-import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
+import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
+import com.panzhihua.common.model.vos.community.ComActActivityVO;
+import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
+import com.panzhihua.common.model.vos.community.PartyActivityStatics;
+import com.panzhihua.common.model.vos.community.PartyActivityTypeChart;
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
import com.panzhihua.common.model.vos.screen.CarouselInfoVO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
@@ -42,15 +50,18 @@
+ "a.`status`, " + "a.is_qr_code, " + "a.publish_at, " + "a.begin_at, " + "a.cover, " + "a.end_at, " + "a.volunteer_max, "
+ "count(if(s.is_volunteer=1,s.id,null))volunteer_now, "
+ "count(if(s.is_volunteer=0,s.id,null))participant_now, " + "a.participant_max, " + "a.sign_up_begin, "
- + "a.sign_up_end, " + "ca.name as communityName " + "FROM " + "com_act_activity a "
+ + "a.sign_up_end, " + "ca.name as communityName,a.type,a.party_member_max " + "FROM " + "com_act_activity a "
+ "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.communityId != null and comActActivityVO.communityId!=0'>" + "AND a.community_id = ${comActActivityVO.communityId} " + " </if> "
+
+ "<if test='comActActivityVO.phone != null and comActActivityVO.phone!=""'>" + "AND a.phone = ${comActActivityVO.phone} " + " </if> "
+ +
"<if test='comActActivityVO.areaCode !=null '>" + "AND ca.area_code = ${comActActivityVO.areaCode} " + " </if> "
+
-
+ "<if test='comActActivityVO.checkUnitId !=null '>" + "AND a.check_unit_id = #{comActActivityVO.checkUnitId} " + " </if> "
+ +
"<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != ""'>"
+ " and a.activity_name like concat(#{comActActivityVO.activityName},'%') " + " </if> "
+ "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.isIng==null'>"
@@ -60,10 +71,9 @@
+ "<if test='comActActivityVO.isApplets != null and comActActivityVO.isApplets ==1'>"
+ "AND a.`status` != 1 AND a.`status` != 6 " + " </if> " + "<if test='comActActivityVO.beginAt != null '>"
+ "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} "
- + " </if> " + "<if test='comActActivityVO.type != null and comActActivityVO.type==1 '>"
- + "AND a.volunteer_max!=0 " + " </if> "
- + "<if test='comActActivityVO.type != null and comActActivityVO.type==2 '>" + "AND a.volunteer_max=0 "
- + " </if> " + " group by a.id " + " order by a.status asc,a.publish_at desc " + "</script>")
+ + " </if> " + "<if test='comActActivityVO.type != null'>"
+ + "AND a.type=#{comActActivityVO.type} " + " </if> "
+ + " group by a.id " + " ORDER BY a.status = 99 desc,a.publish_at DESC " + "</script>")
IPage<ComActActivityVO> pageActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
// @Select("SELECT " + "u.name sponsorName, " + "ca.name communityName, "
@@ -268,8 +278,23 @@
IPage<ComActActivityVO> indexActList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO, @Param("isResidentAct") boolean isResidentAct);
/**
+ * 查询项目活动列表
+ * @param page
+ * @return
+ */
+ IPage<ActActivityListVO> selectProjectActivity(Page page);
+
+ /**
+ * 根据社工id查询活动列表
+ * @param page
+ * @param commonPage
+ * @return
+ */
+ IPage<ComActActivityVO> selectActivityBySocialWorker(Page page,@Param("commonPage") CommonPage commonPage);
+
+ /**
* [方法描述] 根据社区ID查询所属城市所在区区域代码，
- *
+ *
* @param communityId
* 社区ID
* @return String 区域code
@@ -277,4 +302,59 @@
* @date 2022/2/17 10:09
*/
String getActBelongRegionCode(@Param("communityId") Long communityId);
+
+ /**
+ * 查询党员活动数量
+ * @param communityId
+ * @return
+ */
+ PartyActivityStatics selectActivityStatics(Long communityId);
+
+ /**
+ * 党员活动饼状图
+ * @param communityId
+ * @return
+ */
+ List<PartyActivityTypeChart> selectActivityChart(Long communityId);
+
+ /**
+ * 党员活动柱状图
+ * @param communityId
+ * @param year
+ * @param date
+ * @return
+ */
+ Integer selectActivityLine(@Param("communityId") Long communityId,@Param("year")String year,@Param("date")String date);
+
+ /**
+ * 分页查询党员详情活动
+ * @param page
+ * @param commonPage
+ * @return
+ */
+ IPage<PartyMemberDetailVO> partyMemberDetail(Page page,@Param("commonPage") CommonPage commonPage);
+
+ /**
+ * 导出党员详情活动
+ * @param commonPage
+ * @return
+ */
+ List<PartyMemberDetailExcelVO> exportPartyMemberDetail(@Param("commonPage") CommonPage commonPage);
+
+ List<ComActActivityVO> selectListByRelationId(@Param("relationId") Long relationId,@Param("date")String date);
+
+ /**
+ * 查询进行中活动
+ * @param communityId 社区id
+ * @return 活动列表
+ */
+ List<ComActActivityVO> selectListByCommunityId(@Param("communityId") Long communityId,@Param("date") String date,@Param("phone")String phone);
+
+ /**
+ * 获取项目活动
+ * @param page
+ * @param comActActivityVO
+ * @return
+ */
+ IPage<ComActActivityVO> pageProjectActivity(@Param("page") Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
}
--
Gitblit v1.7.1