From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java | 69 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 7 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 8687ffc..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
@@ -3,7 +3,9 @@
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;
@@ -49,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"
@@ -98,11 +100,19 @@
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);
+ PartyBuildingMemberVO queryById(@Param("id") Long id, @Param("areaCode") String areaCode);
/**
* 分页查询党员数据统计
@@ -133,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);
/**
* 查询社区党组织下某个时间段统计数据
@@ -155,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);
/**
* 查询党组织表头统计数据
@@ -171,4 +189,41 @@
* @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