From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
index c3c0d84..ca94802 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
@@ -109,9 +109,10 @@
/**
* 根据id查询党员信息
* @param id 主键id
+ * @param areaCode
* @return 党员信息
*/
- PartyBuildingMemberVO queryById(@Param("id") Long id);
+ PartyBuildingMemberVO queryById(@Param("id") Long id, @Param("areaCode") String areaCode);
/**
* 分页查询党员数据统计
@@ -142,19 +143,24 @@
* @param orgIds 党组织id集合
* @param startTime 查询开始时间
* @param endTime 查询结束时间
+ * @param areaCode
* @return 社区党组织左下统计数据
*/
- ComDataStatisticsOrgVo getOrgDataStatisticsLeftDown(@Param("communityId") Long communityId,@Param("orgIds") List<Long> orgIds
- ,@Param("startTime") String startTime,@Param("endTime") String endTime);
+ ComDataStatisticsOrgVo getOrgDataStatisticsLeftDown(@Param("communityId") Long communityId, @Param("orgIds") List<Long> orgIds
+ , @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaCode") String areaCode);
/**
* 分页查询社区党组织下党员
* @param page 分页参数
* @param communityId 社区id
* @param orgIds 党组织id集合
+ * @param areaCode
* @return 党员列表
*/
- IPage<PartyBuildingMemberVO> getOrgDataStatisticsMember(Page page,@Param("communityId") Long communityId,@Param("orgIds") List<Long> orgIds);
+ IPage<PartyBuildingMemberVO> getOrgDataStatisticsMember(@Param("page") Page page,
+ @Param("communityId") Long communityId,
+ @Param("orgIds") List<Long> orgIds,
+ @Param("areaCode") String areaCode);
/**
* 查询社区党组织下某个时间段统计数据
@@ -164,7 +170,10 @@
* @param endDate 查询结束时间
* @return 社区党组织下某个时间段统计数据
*/
- Map<String,Object> getOrgDataStatisticsRightDown(@Param("communityId") Long communityId,@Param("orgIds") List<Long> orgIds,@Param("startDate") String startDate,@Param("endDate") String endDate);
+ Map<String,Object> getOrgDataStatisticsRightDown(@Param("communityId") Long communityId,
+ @Param("orgIds") List<Long> orgIds,
+ @Param("startDate") String startDate,
+ @Param("endDate") String endDate);
/**
* 查询党组织表头统计数据
@@ -208,4 +217,13 @@
@Select("SELECT caa.community_id FROM com_act caa WHERE caa.`name` = ( select ca.`name` FROM com_act ca WHERE ca.community_id =#{id})")
List<Long> selectIds(@Param("id") Long id);
+
+ /**
+ * 根据区域名称查询社区id
+ * @param area
+ * @return
+ */
+ @Select("select distinct community_id from com_area_town_community where area=#{area}")
+ List<Long> selectDistinctCommunityId(@Param("area") String area);
+
}
--
Gitblit v1.7.1