From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java | 182 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 150 insertions(+), 32 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 f94443d..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
@@ -1,7 +1,13 @@
package com.panzhihua.service_dangjian.dao;
import java.util.List;
+import java.util.Map;
+import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO;
+import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
+import com.panzhihua.common.model.vos.PartyMemberListExcelVO;
+import com.panzhihua.common.model.vos.partybuilding.*;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComDataStatisticsMemberExcelVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -10,10 +16,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.panzhihua.common.model.vos.partybuilding.ComPbMemberExcelVO;
-import com.panzhihua.common.model.vos.partybuilding.PagePartyBuildingMemberVO;
-import com.panzhihua.common.model.vos.partybuilding.PagePartyOrganizationVO;
-import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
/**
@@ -24,17 +26,6 @@
**/
@Mapper
public interface ComPbMemberDAO extends BaseMapper<ComPbMemberDO> {
- // -------------------动态模板-------------
- // @Select("<script> " +
- // " <where>" +
- // "<if test='nameCn != null and nameCn.trim() != ""'>" +
- // " </if> " +
- // "<if test='nameCn != null and nameCn.trim() != ""'>" +
- // " </if> " +
- // "<if test='nameCn != null and nameCn.trim() != ""'>" +
- // " </if> " +
- // " </where>" +
- // "</script>")
@Select("<script> " + "SELECT\n" + "o.`name` orgName,\n" + "m.org_id,\n" + "m.id_card,\n" + "m.`id`,\n"
+ "u.phone,\n" + "m.`name`,\n" + "m.photo_path,\n" + "TIMESTAMPDIFF(\n" + "YEAR,\n" + "m.employment_time,\n"
@@ -60,8 +51,8 @@
@Select("select name from sys_user where user_id=#{createBy}")
String selectNameByUserId(Long createBy);
- @Update("update sys_user u set u.is_partymember=0 where u.id_card=#{idCard}")
- void updateUserIsPartymember(String idCard);
+ @Update("update sys_user u set u.is_partymember=0 where u.phone=#{phone}")
+ void updateUserIsPartymember(String phone);
@Select("<script> " + "SELECT\n" + "o.`name` orgName,\n" + "m.org_id,\n" + "m.id_card,\n" + "m.`id`,\n"
+ "u.phone,\n" + "m.`name`,\n" + "m.photo_path,\n" + "TIMESTAMPDIFF(\n" + "YEAR,\n" + "m.employment_time,\n"
@@ -79,21 +70,12 @@
IPage<PartyBuildingMemberVO> pagePartyBuildingMemberVO(Page page,
@Param("pagePartyBuildingMemberVO") PagePartyBuildingMemberVO pagePartyBuildingMemberVO);
- @Select("<script> " + "SELECT\n" + "o.`name` orgName,\n" + "m.org_id,\n" + "m.id_card,\n" + "m.`id`,\n"
- + "u.phone,\n" + "m.`name`,\n" + "m.photo_path,\n" + "TIMESTAMPDIFF(\n" + "YEAR,\n" + "m.employment_time,\n"
- + "DATE_FORMAT( NOW(), '%Y-%m-%d' )) partyAge,\n" + "m.join_time,\n" + "m.audit_result, \n"
- + "m.employment_time,\n" + "CASE\n" + "WHEN u.id_card IS NULL THEN\n" + "'未注册' ELSE '已注册' \n" + "END STATUS,"
- + " m.create_at \n" + "FROM\n" + "com_pb_member m\n" + "LEFT JOIN sys_user u ON m.id_card = u.id_card\n"
- + "LEFT JOIN com_pb_org o ON m.org_id = o.id" + " where m.audit_result in (0,3) "
- + "<if test='pagePartyBuildingMemberVO.phone != null and pagePartyBuildingMemberVO.phone != ""'>"
- + " and u.phone LIKE CONCAT('%',#{pagePartyBuildingMemberVO.phone},'%') " + " </if> "
- + "<if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name != ""'>"
- + " and u.name like concat ('%',#{pagePartyBuildingMemberVO.name},'%')" + " </if> "
- + "<if test='pagePartyBuildingMemberVO.auditStatus != null'>"
- + " and m.audit_result = #{pagePartyBuildingMemberVO.auditStatus}" + " </if> "
- + "<if test='pagePartyBuildingMemberVO.communityId != null'>"
- + " and m.community_id = ${pagePartyBuildingMemberVO.communityId}" + " </if> " + " order by m.join_time desc "
- + "</script>")
+ /**
+ * 分页查询待认证党员列表
+ * @param page 分页参数
+ * @param pagePartyBuildingMemberVO 请求参数
+ * @return 待认证党员列表
+ */
IPage<PartyBuildingMemberVO> pagePartyBuildingMembersVO(Page page,
@Param("pagePartyBuildingMemberVO") PagePartyBuildingMemberVO pagePartyBuildingMemberVO);
@@ -108,4 +90,140 @@
+ "<if test='organizationVO.name != null and organizationVO.name != ""'>"
+ " and cpm.name like concat (#{organizationVO.name},'%')" + " </if> " + "</script>")
List<ComPbMemberExcelVO> exportPbMember(@Param("organizationVO") PagePartyOrganizationVO organizationVO);
+
+ /**
+ * 分页查询党员列表
+ * @param page 分页参数
+ * @param buildingMemberVO 请求参数
+ * @return 党员列表
+ */
+ IPage<PartyBuildingMemberVO> queryAllByLimit(Page page,@Param("dto") PagePartyOrganizationVO buildingMemberVO);
+
+ /**
+ * 导出党员列表
+ * @param buildingMemberVO 请求参数
+ * @return 党员列表
+ */
+ List<PartyMemberListExcelVO> exportPartyMemberList(@Param("dto") PagePartyOrganizationVO buildingMemberVO);
+
+ /**
+ * 根据id查询党员信息
+ * @param id 主键id
+ * @param areaCode
+ * @return 党员信息
+ */
+ PartyBuildingMemberVO queryById(@Param("id") Long id, @Param("areaCode") String areaCode);
+
+ /**
+ * 分页查询党员数据统计
+ * @param statisticsMemberDto 请求参数
+ * @return 党员数据统计
+ */
+ IPage<ComDataStatisticsMemberVo> pageDataStatisticsMember(Page page, @Param("dto") PageComDataStatisticsMemberDto statisticsMemberDto);
+
+ /**
+ * 查询人口活动统计数据
+ * @param userId 用户id
+ * @param communityId 社区id
+ * @return 人口活动统计数据
+ */
+ ComDataStatisticsMemberVo getMemberStatistics(@Param("userId") Long userId,@Param("communityId") Long communityId);
+
+ /**
+ * 查询社区党组织下的统计数据
+ * @param communityId 社区id
+ * @param orgIds 党组织id集合
+ * @return 社区党组织下统计数据
+ */
+ ComDataStatisticsOrgVo getOrgDataStatistics(@Param("communityId") Long communityId,@Param("orgIds") List<Long> orgIds);
+
+ /**
+ * 查询社区党组织左下统计数据
+ * @param communityId 社区id
+ * @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, @Param("areaCode") String areaCode);
+
+ /**
+ * 分页查询社区党组织下党员
+ * @param page 分页参数
+ * @param communityId 社区id
+ * @param orgIds 党组织id集合
+ * @param areaCode
+ * @return 党员列表
+ */
+ IPage<PartyBuildingMemberVO> getOrgDataStatisticsMember(@Param("page") Page page,
+ @Param("communityId") Long communityId,
+ @Param("orgIds") List<Long> orgIds,
+ @Param("areaCode") String areaCode);
+
+ /**
+ * 查询社区党组织下某个时间段统计数据
+ * @param communityId 社区id
+ * @param orgIds 党组织id集合
+ * @param startDate 查询开始时间
+ * @param endDate 查询结束时间
+ * @return 社区党组织下某个时间段统计数据
+ */
+ Map<String,Object> getOrgDataStatisticsRightDown(@Param("communityId") Long communityId,
+ @Param("orgIds") List<Long> orgIds,
+ @Param("startDate") String startDate,
+ @Param("endDate") String endDate);
+
+ /**
+ * 查询党组织表头统计数据
+ * @param communityId
+ * 社区id
+ * @return 党组织表头统计数据
+ */
+ ComDataStatisticsHeaderOrgVo getHeaderOrgDataStatistics(@Param("communityId") Long communityId);
+
+ /**
+ * 党员数据统计-党员导出数据查询
+ * @param statisticsMemberDto 请求参数
+ * @return 党员导出数据
+ */
+ List<ComDataStatisticsMemberExcelVo> exportDataStatisticsMember(@Param("dto") PageComDataStatisticsMemberDto statisticsMemberDto);
+
+ /**
+ * 根据报到单位id查询党员列表
+ * @param page 分页参数
+ * @param partyBuildingMemberVO 请求参数
+ * @return 党员列表
+ */
+ IPage<PartyBuildingMemberVO> getPbMemberByApplets(Page page,@Param("dto") PartyBuildingMemberVO partyBuildingMemberVO);
+
+ /**
+ * 小程序获取报道单位党员列表
+ * @param id
+ * @return
+ */
+ PartyBuildingMemberVO getDetailByApp(Long id);
+
+ PartyBuildingMemberVO selectDetail(@Param("phone") String phone,@Param("type")Integer type);
+
+ /**
+ * 分页查询注册党员列表
+ * @param page
+ * @param dto
+ * @return
+ */
+ IPage<PartyBuildingMemberVO> pageRegisterMember(@Param("page") Page page, @Param("dto") PageMemberForInviteDTO dto);
+
+ @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