| 
						
						
							
								
							
						
						
					 | 
					@ -65,7 +65,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                                                @Param("staffOrgPath") String staffOrgPath, | 
					 | 
					 | 
					                                                @Param("staffOrgPath") String staffOrgPath, | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                                                @Param("resultTableName") String resultTableName, | 
					 | 
					 | 
					                                                @Param("resultTableName") String resultTableName, | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                                                @Param("keyword") String keyword, | 
					 | 
					 | 
					                                                @Param("keyword") String keyword, | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					                                                @Param("groupByTables")Set<String> groupByTables); | 
					 | 
					 | 
					                                                @Param("groupByTables") Set<String> groupByTables); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    /** | 
					 | 
					 | 
					    /** | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * 查询主表 | 
					 | 
					 | 
					     * 查询主表 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -131,10 +131,10 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     */ | 
					 | 
					 | 
					     */ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    List<SearchByNameResultDTO> searchByName(@Param("name") String name, | 
					 | 
					 | 
					    List<SearchByNameResultDTO> searchByName(@Param("name") String name, | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                                             @Param("columnName") String columnName, | 
					 | 
					 | 
					                                             @Param("columnName") String columnName, | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					                                             @Param("level")String level, | 
					 | 
					 | 
					                                             @Param("level") String level, | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                                             @Param("id")String id, | 
					 | 
					 | 
					                                             @Param("id") String id, | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					                                             @Param("agencyId") String agencyId, | 
					 | 
					 | 
					                                             @Param("agencyId") String agencyId, | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					                                             @Param("pageNo") Integer pageNo,@Param("customerId") String customerId); | 
					 | 
					 | 
					                                             @Param("pageNo") Integer pageNo, @Param("customerId") String customerId); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    Set<String> selectUserDemandCode(String icResiUserId); | 
					 | 
					 | 
					    Set<String> selectUserDemandCode(String icResiUserId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -162,11 +162,12 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    /** | 
					 | 
					 | 
					    /** | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * desc:根据身份证号获取居民信息 | 
					 | 
					 | 
					     * desc:根据身份证号获取居民信息 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * @param idCard | 
					 | 
					 | 
					     * @param idCard | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * @param customerId | 
					 | 
					 | 
					     * @param customerId | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * @return | 
					 | 
					 | 
					     * @return | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     */ | 
					 | 
					 | 
					     */ | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					    IcResiUserDTO getResiUserByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); | 
					 | 
					 | 
					    IcResiUserDTO getResiUserByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    /** | 
					 | 
					 | 
					    /** | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * @param agencyId | 
					 | 
					 | 
					     * @param agencyId | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -273,7 +274,8 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     */ | 
					 | 
					 | 
					     */ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    Map<String, BigDecimal> getDataAnalyseCount(@Param("customerId") String customerId, @Param("tableName") String tableName, | 
					 | 
					 | 
					    Map<String, BigDecimal> getDataAnalyseCount(@Param("customerId") String customerId, @Param("tableName") String tableName, | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                                                @Param("columnList") List<String> columnList, @Param("id") String id, @Param("level") String level); | 
					 | 
					 | 
					                                                @Param("columnList") List<String> columnList, @Param("id") String id, @Param("level") String level); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					    List<Map<String, String>> getIcUserList(@Param("customerId") String customerId, @Param("columns")List<String> columns); | 
					 | 
					 | 
					
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					    List<Map<String, String>> getIcUserList(@Param("customerId") String customerId, @Param("columns") List<String> columns); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    /** | 
					 | 
					 | 
					    /** | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * Desc: 根据房屋IDs查询房屋下是否有存在居民的 | 
					 | 
					 | 
					     * Desc: 根据房屋IDs查询房屋下是否有存在居民的 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -304,6 +306,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    /** | 
					 | 
					 | 
					    /** | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * desc:根据维度获取居民信息表的数据[正常状态的居民] | 
					 | 
					 | 
					     * desc:根据维度获取居民信息表的数据[正常状态的居民] | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * @param formDTO | 
					 | 
					 | 
					     * @param formDTO | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * @return | 
					 | 
					 | 
					     * @return | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     */ | 
					 | 
					 | 
					     */ | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -318,10 +321,11 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     */ | 
					 | 
					 | 
					     */ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    List<String> listUserIds(@Param("customerId") String customerId, @Param("gridId") String gridId); | 
					 | 
					 | 
					    List<String> listUserIds(@Param("customerId") String customerId, @Param("gridId") String gridId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					    List<String> getAllUserIds(@Param("idCard") String idCard, @Param("customerId")String customerId); | 
					 | 
					 | 
					    List<String> getAllUserIds(@Param("idCard") String idCard, @Param("customerId") String customerId); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    /** | 
					 | 
					 | 
					    /** | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * 获取客户下志愿者信息 | 
					 | 
					 | 
					     * 获取客户下志愿者信息 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * @Param customerId | 
					 | 
					 | 
					     * @Param customerId | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * @Return {@link List< IcVolunteerPolyDTO>} | 
					 | 
					 | 
					     * @Return {@link List< IcVolunteerPolyDTO>} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * @Author zhaoqifeng | 
					 | 
					 | 
					     * @Author zhaoqifeng | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -329,12 +333,35 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     */ | 
					 | 
					 | 
					     */ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    List<IcVolunteerPolyDTO> getVolunteerList(@Param("customerId") String customerId, @Param("userId") String userId); | 
					 | 
					 | 
					    List<IcVolunteerPolyDTO> getVolunteerList(@Param("customerId") String customerId, @Param("userId") String userId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					    int selectCountByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); | 
					 | 
					 | 
					    /** | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					
 | 
					 | 
					 | 
					     * 统计数据 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @param idCard | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @param customerId | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @return int | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @author LZN | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @date 2022/6/23 9:47 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     */ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					    int selectCountByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					    /** | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * 根据身份证号修改数据 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @param entity | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @return void | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @author LZN | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @date 2022/6/23 9:47 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     */ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    void updateIcResiUserByIdCard(@Param("entity") IcResiUserEntity entity); | 
					 | 
					 | 
					    void updateIcResiUserByIdCard(@Param("entity") IcResiUserEntity entity); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					    String seletIdByIdCard(@Param("customerId") String customerId,@Param("idCard") String idCard); | 
					 | 
					 | 
					    /** | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * 根据身份证号查询id | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @param customerId | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @param idCard | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @return | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     */ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					    String seletIdByIdCard(@Param("customerId") String customerId, @Param("idCard") String idCard); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					} | 
					 | 
					 | 
					} | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
					 | 
					
  |