Browse Source
# Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.javadev
jianjun
3 years ago
29 changed files with 1087 additions and 287 deletions
@ -0,0 +1,191 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.alibaba.excel.annotation.ExcelIgnore; |
|||
import com.alibaba.excel.annotation.ExcelProperty; |
|||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* desc:房屋和房屋成员返回结果类 |
|||
* |
|||
* @author: LiuJanJun |
|||
* @date: 2022/5/9 1:58 下午 |
|||
* @version: 1.0 |
|||
*/ |
|||
@Data |
|||
public class HouseMemberResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
@ColumnWidth(value = 7) |
|||
@ExcelProperty(value = "序号",index = 0) |
|||
private Integer num; |
|||
|
|||
@ExcelProperty(value = {"房屋信息","所属组织"},index = 1) |
|||
private String agencyName; |
|||
@ExcelProperty(value = {"房屋信息","所属网格"},index = 2) |
|||
private String gridName; |
|||
@ExcelIgnore |
|||
private String neighborHoodId; |
|||
@ExcelProperty(value = {"房屋信息","所属小区"},index = 3) |
|||
private String neighborHoodName; |
|||
@ExcelIgnore |
|||
private String buildingId; |
|||
@ExcelIgnore |
|||
private String houseId; |
|||
@ExcelProperty(value = {"房屋信息","所属楼栋"},index = 4) |
|||
private String buildingName; |
|||
@ExcelProperty(value = {"房屋信息","单元"},index = 5) |
|||
private String unitName; |
|||
/** |
|||
* 门牌号 |
|||
*/ |
|||
@ExcelProperty(value = {"房屋信息","门牌号"},index = 6) |
|||
private String doorName; |
|||
/** |
|||
* 房屋类型，1楼房，2平房，3别墅 |
|||
*/ |
|||
@ExcelProperty(value = {"房屋信息","房屋类型"},index = 7) |
|||
private String houseType; |
|||
|
|||
/** |
|||
* 房屋用途 |
|||
*/ |
|||
@ExcelProperty(value = {"房屋信息","房屋用途"},index = 8) |
|||
private String purpose; |
|||
/** |
|||
* 房屋状态 |
|||
*/ |
|||
@ExcelProperty(value = {"房屋信息","房屋状态"},index = 9) |
|||
private String rentFlag; |
|||
|
|||
/** |
|||
* 房主姓名 |
|||
*/ |
|||
@ExcelProperty(value = {"房屋信息","房主姓名"},index = 10) |
|||
private String ownerName; |
|||
/** |
|||
* 房主电话 |
|||
*/ |
|||
@ExcelProperty(value = {"房屋信息","房主电话"},index = 11) |
|||
private String ownerPhone; |
|||
/** |
|||
* 房主身份证 |
|||
*/ |
|||
@ExcelProperty(value = {"房屋信息","房主身份证"},index = 12) |
|||
private String ownerIdCard; |
|||
|
|||
|
|||
//居民信息/**/
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
@ExcelIgnore |
|||
private String id; |
|||
|
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","姓名"},index = 13) |
|||
private String name; |
|||
|
|||
/** |
|||
* 性别 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","性别"},index = 14) |
|||
private String gender; |
|||
|
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","手机号"},index = 15) |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","身份证号"},index = 16) |
|||
private String idCard; |
|||
|
|||
/** |
|||
* 出生日期 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","出生日期"},index = 17) |
|||
private String birthday; |
|||
|
|||
/** |
|||
* 户籍所在地 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","户籍所在地"},index = 18) |
|||
private String hjszd; |
|||
|
|||
/** |
|||
* 与户主关系【字典表】 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","与户主关系"},index = 19) |
|||
private String yhzgx; |
|||
|
|||
/** |
|||
* 是否党员 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","是否党员"},index = 20) |
|||
private String isParty; |
|||
|
|||
/** |
|||
* 是否租户 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","是否租户"},index = 21) |
|||
private String isTenant; |
|||
|
|||
/** |
|||
* 是否流动人口 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","是否流动人口"},index = 22) |
|||
private String isFloating; |
|||
|
|||
/** |
|||
* 工作单位 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","工作单位"},index = 23) |
|||
private String gzdw; |
|||
|
|||
/** |
|||
* 民族【字典表】 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","民族"},index = 24) |
|||
private String mz; |
|||
|
|||
/** |
|||
* 籍贯 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","籍贯"},index = 25) |
|||
private String jg; |
|||
|
|||
/** |
|||
* 婚姻状况【字典表】 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","婚姻状况"},index = 26) |
|||
private String hyzk; |
|||
|
|||
/** |
|||
* 文化程度【字典表】 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","文化程度"},index = 27) |
|||
private String culture; |
|||
|
|||
/** |
|||
* 宗教信仰 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","宗教信仰"},index = 28) |
|||
private String faith; |
|||
|
|||
/** |
|||
* 备注 |
|||
*/ |
|||
@ExcelProperty(value = {"实际居住人信息","备注"},index = 29) |
|||
private String remarks; |
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,48 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description 用户基础信息 |
|||
* @Author yinzuomei |
|||
* @Date 2021/11/1 10:34 上午 |
|||
*/ |
|||
@Data |
|||
public class IcHouseMemberResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 5621052927788129250L; |
|||
|
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 性别 |
|||
*/ |
|||
private String gender; |
|||
|
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
private String idCard; |
|||
|
|||
/** |
|||
* 出生日期 |
|||
*/ |
|||
private String birthday; |
|||
|
|||
/** |
|||
* 备注 |
|||
*/ |
|||
private String remarks; |
|||
|
|||
|
|||
} |
|||
|
|||
@ -0,0 +1,22 @@ |
|||
package com.epmet.resi.partymember.dto.partymember.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 党员风采列表接口参数 |
|||
* |
|||
* @author work@yujt.net.cn |
|||
* @date 2022/5/9/0009 14:22 |
|||
*/ |
|||
@Data |
|||
public class StyleShowListResiFormDTO extends StyleShowListFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -7548077165302515633L; |
|||
|
|||
@NotBlank(message = "所属组织不能为空") |
|||
private String agencyId; |
|||
|
|||
} |
|||
@ -1,24 +1,57 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 租客，房东信息 |
|||
* desc:居民信息查询条件 |
|||
* |
|||
* @author zhy |
|||
* @date 2022/4/26 10:54 |
|||
*/ |
|||
@Data |
|||
public class RentTenantDataFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 9156247659994638103L; |
|||
public class RentTenantDataFormDTO extends PageFormDTO { |
|||
|
|||
@NotBlank(message = "userId不能为空") |
|||
private static final long serialVersionUID = 803398545727377361L; |
|||
|
|||
public interface RentTenantDataForm{} |
|||
|
|||
@NotBlank(message = "userId不能为空", groups = RentTenantDataForm.class) |
|||
private String userId; |
|||
|
|||
@NotBlank(message = "tokenDto获取customerId不能为空") |
|||
@NotBlank(message = "tokenDto获取customerId不能为空", groups = RentTenantDataForm.class) |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 组织Id |
|||
*/ |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* pids |
|||
*/ |
|||
private String pids; |
|||
|
|||
/** |
|||
* 网格Id |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 小区ID |
|||
*/ |
|||
private String neighborHoodId; |
|||
|
|||
/** |
|||
* 楼栋ID |
|||
*/ |
|||
private String buildingId; |
|||
|
|||
/** |
|||
* 房间ID |
|||
*/ |
|||
private String houseId; |
|||
|
|||
} |
|||
|
|||
@ -0,0 +1,181 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.LinkedHashMap; |
|||
import java.util.List; |
|||
|
|||
|
|||
/** |
|||
* 房屋内居民结果 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-10-26 |
|||
*/ |
|||
@Data |
|||
public class HouseIcResiUserResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
|
|||
/** |
|||
* 客户Id customer.id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* |
|||
*/ |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 网格ID |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 所属小区ID |
|||
*/ |
|||
private String villageId; |
|||
|
|||
/** |
|||
* 所属楼宇Id |
|||
*/ |
|||
private String buildId; |
|||
|
|||
/** |
|||
* 单元id |
|||
*/ |
|||
private String unitId; |
|||
|
|||
/** |
|||
* 所属家庭Id |
|||
*/ |
|||
private String homeId; |
|||
|
|||
/** |
|||
* 屋内的居民 |
|||
*/ |
|||
private List<HouseMemberResultDTO> houseMemberList; |
|||
|
|||
/** |
|||
* 屋内的居民 |
|||
*/ |
|||
private LinkedHashMap<String,Object> houseMemberList2; |
|||
|
|||
@Data |
|||
public static class HouseMemberResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 性别 |
|||
*/ |
|||
private String gender; |
|||
|
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
private String idCard; |
|||
|
|||
/** |
|||
* 出生日期 |
|||
*/ |
|||
private String birthday; |
|||
|
|||
/** |
|||
* 户籍所在地 |
|||
*/ |
|||
private String hjszd; |
|||
|
|||
/** |
|||
* 与户主关系【字典表】 |
|||
*/ |
|||
private String yhzgx; |
|||
|
|||
/** |
|||
* 是否党员 |
|||
*/ |
|||
private String isParty; |
|||
|
|||
/** |
|||
* 是否租户 |
|||
*/ |
|||
private String isTenant; |
|||
|
|||
/** |
|||
* 是否流动人口 |
|||
*/ |
|||
private String isFloating; |
|||
|
|||
/** |
|||
* 工作单位 |
|||
*/ |
|||
private String gzdw; |
|||
|
|||
/** |
|||
* 民族【字典表】 |
|||
*/ |
|||
private String mz; |
|||
|
|||
/** |
|||
* 籍贯 |
|||
*/ |
|||
private String jg; |
|||
|
|||
/** |
|||
* 婚姻状况【字典表】 |
|||
*/ |
|||
private String hyzk; |
|||
|
|||
/** |
|||
* 文化程度【字典表】 |
|||
*/ |
|||
private String culture; |
|||
|
|||
/** |
|||
* 宗教信仰 |
|||
*/ |
|||
private String faith; |
|||
|
|||
/** |
|||
* 备注 |
|||
*/ |
|||
private String remarks; |
|||
|
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,48 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description 用户基础信息 |
|||
* @Author yinzuomei |
|||
* @Date 2021/11/1 10:34 上午 |
|||
*/ |
|||
@Data |
|||
public class IcResiUserBaseResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 5621052927788129250L; |
|||
|
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 性别 |
|||
*/ |
|||
private String gender; |
|||
|
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
private String idCard; |
|||
|
|||
/** |
|||
* 出生日期 |
|||
*/ |
|||
private String birthday; |
|||
|
|||
/** |
|||
* 备注 |
|||
*/ |
|||
private String remarks; |
|||
|
|||
|
|||
} |
|||
|
|||
@ -1,173 +0,0 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description TODO |
|||
* @Author yinzuomei |
|||
* @Date 2021/11/1 10:34 上午 |
|||
*/ |
|||
@Data |
|||
public class IcResiUserPageResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 5621052927788129250L; |
|||
private String icResiUserId; |
|||
private String gridId; |
|||
private String gridName; |
|||
/** |
|||
* 所属小区ID |
|||
*/ |
|||
private String villageId; |
|||
private String vallageName; |
|||
|
|||
|
|||
/** |
|||
* 所属楼宇Id |
|||
*/ |
|||
private String buildId; |
|||
private String buildName; |
|||
|
|||
/** |
|||
* 单元id |
|||
*/ |
|||
private String unitId; |
|||
private String unitName; |
|||
|
|||
/** |
|||
* 所属家庭Id |
|||
*/ |
|||
private String homeId; |
|||
private String homeName; |
|||
|
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 性别 |
|||
*/ |
|||
private String gender; |
|||
|
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
private String idCard; |
|||
|
|||
/** |
|||
* 出生日期 |
|||
*/ |
|||
private String birthday; |
|||
|
|||
/** |
|||
* 备注 |
|||
*/ |
|||
private String remarks; |
|||
|
|||
/** |
|||
* 是否党员 |
|||
*/ |
|||
private Boolean isParty; |
|||
|
|||
/** |
|||
* 是否低保户 |
|||
*/ |
|||
private Boolean isDbh; |
|||
|
|||
/** |
|||
* 是否保障房 |
|||
*/ |
|||
private Boolean isEnsureHouse; |
|||
|
|||
/** |
|||
* 是否失业 |
|||
*/ |
|||
private Boolean isUnemployed; |
|||
|
|||
/** |
|||
* 是否育龄妇女 |
|||
*/ |
|||
private Boolean isYlfn; |
|||
|
|||
/** |
|||
* 是否退役军人 |
|||
*/ |
|||
private Boolean isVeterans; |
|||
|
|||
/** |
|||
* 是否统战人员 |
|||
*/ |
|||
private Boolean isUnitedFront; |
|||
|
|||
/** |
|||
* 是否信访人员 |
|||
*/ |
|||
private Boolean isXfry; |
|||
|
|||
/** |
|||
* 是否志愿者 |
|||
*/ |
|||
private Boolean isVolunteer; |
|||
|
|||
/** |
|||
* 是否老年人 |
|||
*/ |
|||
private Boolean isOldPeople; |
|||
|
|||
/** |
|||
* 是否空巢 |
|||
*/ |
|||
private Boolean isKc; |
|||
|
|||
/** |
|||
* 是否失独 |
|||
*/ |
|||
private Boolean isSd; |
|||
|
|||
/** |
|||
* 是否失能 |
|||
*/ |
|||
private Boolean isSn; |
|||
|
|||
/** |
|||
* 是否失智 |
|||
*/ |
|||
private Boolean isSz; |
|||
|
|||
/** |
|||
* 是否残疾 |
|||
*/ |
|||
private Boolean isCj; |
|||
|
|||
/** |
|||
* 是否大病 |
|||
*/ |
|||
private Boolean isDb; |
|||
|
|||
/** |
|||
* 是否慢病 |
|||
*/ |
|||
private Boolean isMb; |
|||
|
|||
/** |
|||
* 是否特殊人群 |
|||
*/ |
|||
private Boolean isSpecial; |
|||
|
|||
|
|||
// 以下属性都需要单独处理，不是直接取数据库的字段
|
|||
private String demandCategoryIds; |
|||
|
|||
private String demandName; |
|||
|
|||
/** |
|||
* 房屋类型，1楼房，2平房，3别墅 |
|||
*/ |
|||
private String houseType;} |
|||
|
|||
Binary file not shown.
Loading…
Reference in new issue