forked from luyan/epmet-cloud-lingshan
				
			
			
			
				Browse Source
			
			
			
			
				
		# Conflicts: # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.javamaster
				 15 changed files with 874 additions and 24 deletions
			
			
		@ -0,0 +1,33 @@ | 
				
			|||
package com.epmet.dataaggre.dto.govproject.result; | 
				
			|||
 | 
				
			|||
import lombok.Data; | 
				
			|||
import lombok.NoArgsConstructor; | 
				
			|||
 | 
				
			|||
import java.io.Serializable; | 
				
			|||
 | 
				
			|||
/** | 
				
			|||
 * @author sun | 
				
			|||
 * @dscription | 
				
			|||
 */ | 
				
			|||
@NoArgsConstructor | 
				
			|||
@Data | 
				
			|||
public class ProjectCategoryResultDTO implements Serializable { | 
				
			|||
 | 
				
			|||
	private static final long serialVersionUID = 3217246702883400582L; | 
				
			|||
	/** | 
				
			|||
	 * 项目ID | 
				
			|||
	 */ | 
				
			|||
	private String projectId; | 
				
			|||
	/** | 
				
			|||
	 * 项目标题 | 
				
			|||
	 */ | 
				
			|||
	private String title; | 
				
			|||
	/** | 
				
			|||
	 * 项目状态 | 
				
			|||
	 */ | 
				
			|||
	private String status; | 
				
			|||
	/** | 
				
			|||
	 * 二级分类Code | 
				
			|||
	 */ | 
				
			|||
	private String categoryCode; | 
				
			|||
} | 
				
			|||
@ -0,0 +1,49 @@ | 
				
			|||
/** | 
				
			|||
 * 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.dataaggre.dao.epmetuser; | 
				
			|||
 | 
				
			|||
import com.epmet.commons.mybatis.dao.BaseDao; | 
				
			|||
import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; | 
				
			|||
import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; | 
				
			|||
import com.epmet.dto.IcResiUserDTO; | 
				
			|||
import org.apache.ibatis.annotations.Mapper; | 
				
			|||
import org.apache.ibatis.annotations.Param; | 
				
			|||
 | 
				
			|||
import java.util.List; | 
				
			|||
 | 
				
			|||
/** | 
				
			|||
 * 用户基础信息 | 
				
			|||
 * | 
				
			|||
 * @author generator generator@elink-cn.com | 
				
			|||
 * @since v1.0.0 2021-10-26 | 
				
			|||
 */ | 
				
			|||
@Mapper | 
				
			|||
public interface IcResiUserDao extends BaseDao<IcResiUserEntity> { | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * @Description 根据身份证号查询负能平台用户信息 | 
				
			|||
     * @author sun | 
				
			|||
     */ | 
				
			|||
    IcResiUserDTO getIcResiUser(@Param("idCard") String idCard, @Param("customerId") String customerId); | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * @Description 查询人员的家庭成员数据 | 
				
			|||
     * @author sun | 
				
			|||
     */ | 
				
			|||
    List<ProjectAnalysisResultDTO.Home> getHomeUserList(@Param("homeId") String homeId, @Param("icUserId") String icUserId); | 
				
			|||
} | 
				
			|||
@ -0,0 +1,493 @@ | 
				
			|||
/** | 
				
			|||
 * 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.dataaggre.entity.epmetuser; | 
				
			|||
 | 
				
			|||
import com.baomidou.mybatisplus.annotation.TableName; | 
				
			|||
import com.epmet.commons.mybatis.entity.BaseEpmetEntity; | 
				
			|||
import lombok.Data; | 
				
			|||
import lombok.EqualsAndHashCode; | 
				
			|||
 | 
				
			|||
/** | 
				
			|||
 * 用户基础信息 | 
				
			|||
 * | 
				
			|||
 * @author generator generator@elink-cn.com | 
				
			|||
 * @since v1.0.0 2021-10-26 | 
				
			|||
 */ | 
				
			|||
@Data | 
				
			|||
@EqualsAndHashCode(callSuper=false) | 
				
			|||
@TableName("ic_resi_user") | 
				
			|||
public class IcResiUserEntity extends BaseEpmetEntity { | 
				
			|||
 | 
				
			|||
	private static final long serialVersionUID = 1L; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 客户Id customer.id | 
				
			|||
     */ | 
				
			|||
	private String customerId; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * | 
				
			|||
     */ | 
				
			|||
	private String agencyId; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * | 
				
			|||
     */ | 
				
			|||
	private String pids; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 网格ID | 
				
			|||
     */ | 
				
			|||
	private String gridId; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 所属小区ID | 
				
			|||
     */ | 
				
			|||
	private String villageId; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 所属楼宇Id | 
				
			|||
     */ | 
				
			|||
	private String buildId; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 单元id | 
				
			|||
     */ | 
				
			|||
	private String unitId; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 所属家庭Id | 
				
			|||
     */ | 
				
			|||
	private String homeId; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否本地户籍 | 
				
			|||
     */ | 
				
			|||
	private String isBdhj; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 姓名 | 
				
			|||
     */ | 
				
			|||
	private String name; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 手机号 | 
				
			|||
     */ | 
				
			|||
	private String mobile; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 性别 | 
				
			|||
     */ | 
				
			|||
	private String gender; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 身份证号 | 
				
			|||
     */ | 
				
			|||
	private String idCard; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 出生日期 | 
				
			|||
     */ | 
				
			|||
	private String birthday; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 备注 | 
				
			|||
     */ | 
				
			|||
	private String remarks; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 联系人 | 
				
			|||
     */ | 
				
			|||
	private String contacts; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 联系人电话 | 
				
			|||
     */ | 
				
			|||
	private String contactsMobile; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 九小场所url | 
				
			|||
     */ | 
				
			|||
	private String ninePlace; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否党员 | 
				
			|||
     */ | 
				
			|||
	private String isParty; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否低保户 | 
				
			|||
     */ | 
				
			|||
	private String isDbh; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否保障房 | 
				
			|||
     */ | 
				
			|||
	private String isEnsureHouse; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否失业 | 
				
			|||
     */ | 
				
			|||
	private String isUnemployed; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否育龄妇女 | 
				
			|||
     */ | 
				
			|||
	private String isYlfn; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否退役军人 | 
				
			|||
     */ | 
				
			|||
	private String isVeterans; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否统战人员 | 
				
			|||
     */ | 
				
			|||
	private String isUnitedFront; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否信访人员 | 
				
			|||
     */ | 
				
			|||
	private String isXfry; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否志愿者 | 
				
			|||
     */ | 
				
			|||
	private String isVolunteer; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否老年人 | 
				
			|||
     */ | 
				
			|||
	private String isOldPeople; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否空巢 | 
				
			|||
     */ | 
				
			|||
	private String isKc; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否失独 | 
				
			|||
     */ | 
				
			|||
	private String isSd; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否失能 | 
				
			|||
     */ | 
				
			|||
	private String isSn; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否失智 | 
				
			|||
     */ | 
				
			|||
	private String isSz; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否残疾 | 
				
			|||
     */ | 
				
			|||
	private String isCj; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否大病 | 
				
			|||
     */ | 
				
			|||
	private String isDb; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否慢病 | 
				
			|||
     */ | 
				
			|||
	private String isMb; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否特殊人群 | 
				
			|||
     */ | 
				
			|||
	private String isSpecial; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 文化程度【字典表】 | 
				
			|||
     */ | 
				
			|||
	private String culture; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 文化程度备注 | 
				
			|||
     */ | 
				
			|||
	private String cultureRemakes; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 特长【字典表】 | 
				
			|||
     */ | 
				
			|||
	private String specialSkill; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 兴趣爱好 | 
				
			|||
     */ | 
				
			|||
	private String hobby; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 兴趣爱好备注 | 
				
			|||
     */ | 
				
			|||
	private String hobbyRemakes; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 宗教信仰 | 
				
			|||
     */ | 
				
			|||
	private String faith; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 宗教信仰备注 | 
				
			|||
     */ | 
				
			|||
	private String faithRemakes; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 残疾类别【字典表】 | 
				
			|||
     */ | 
				
			|||
	private String cjlb; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 残疾登记(状况)【字典表】 | 
				
			|||
     */ | 
				
			|||
	private String cjzk; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 残疾证号 | 
				
			|||
     */ | 
				
			|||
	private String cjzh; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 残疾说明 | 
				
			|||
     */ | 
				
			|||
	private String cjsm; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 有无监护人【yes no】 | 
				
			|||
     */ | 
				
			|||
	private String ynJdr; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 有无技能特长【yes no】 | 
				
			|||
     */ | 
				
			|||
	private String ynJntc; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 有无劳动能力 | 
				
			|||
     */ | 
				
			|||
	private String ynLdnl; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 有无非义务教育阶段助学【yes no】 | 
				
			|||
     */ | 
				
			|||
	private String ynFywjyjdzx; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 所患大病 | 
				
			|||
     */ | 
				
			|||
	private String shdb; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 患大病时间 | 
				
			|||
     */ | 
				
			|||
	private String dbsj; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 所患慢性病 | 
				
			|||
     */ | 
				
			|||
	private String shmxb; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 患慢性病时间 | 
				
			|||
     */ | 
				
			|||
	private String mxbsj; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否参保 | 
				
			|||
     */ | 
				
			|||
	private String isCb; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 自付金额 | 
				
			|||
     */ | 
				
			|||
	private String zfje; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 救助金额 | 
				
			|||
     */ | 
				
			|||
	private String jzje; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 救助时间[yyyy-MM-dd] | 
				
			|||
     */ | 
				
			|||
	private String jzsj; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 享受救助明细序号 | 
				
			|||
     */ | 
				
			|||
	private String jzmxxh; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 健康信息备注 | 
				
			|||
     */ | 
				
			|||
	private String healthRemakes; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 工作单位 | 
				
			|||
     */ | 
				
			|||
	private String gzdw; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 职业 | 
				
			|||
     */ | 
				
			|||
	private String zy; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 离退休时间 | 
				
			|||
     */ | 
				
			|||
	private String ltxsj; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 工作信息备注 | 
				
			|||
     */ | 
				
			|||
	private String workRemake; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 退休金额 | 
				
			|||
     */ | 
				
			|||
	private String txje; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 月收入 | 
				
			|||
     */ | 
				
			|||
	private String ysr; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 籍贯 | 
				
			|||
     */ | 
				
			|||
	private String jg; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 户籍所在地 | 
				
			|||
     */ | 
				
			|||
	private String hjszd; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 现居住地 | 
				
			|||
     */ | 
				
			|||
	private String xjzd; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 人户情况 | 
				
			|||
     */ | 
				
			|||
	private String rhzk; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 居住信息备注 | 
				
			|||
     */ | 
				
			|||
	private String jzxxRemakes; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 民族【字典表】 | 
				
			|||
     */ | 
				
			|||
	private String mz; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 与户主关系【字典表】 | 
				
			|||
     */ | 
				
			|||
	private String yhzgx; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 居住情况【字典表】 | 
				
			|||
     */ | 
				
			|||
	private String jzqk; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 婚姻状况【字典表】 | 
				
			|||
     */ | 
				
			|||
	private String hyzk; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 配偶情况【字典表】 | 
				
			|||
     */ | 
				
			|||
	private String poqk; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 有无赡养人 | 
				
			|||
     */ | 
				
			|||
	private String ynSyr; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 与赡养人关系【字典表】 | 
				
			|||
     */ | 
				
			|||
	private String ysyrgx; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 赡养人电话 | 
				
			|||
     */ | 
				
			|||
	private String syrMobile; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 家庭信息备注 | 
				
			|||
     */ | 
				
			|||
	private String jtxxRemakes; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 预留字段1 | 
				
			|||
     */ | 
				
			|||
	private String field1; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 预留字段2 | 
				
			|||
     */ | 
				
			|||
	private String field2; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 预留字段3 | 
				
			|||
     */ | 
				
			|||
	private String field3; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 预留字段4 | 
				
			|||
     */ | 
				
			|||
	private String field4; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 预留字段5 | 
				
			|||
     */ | 
				
			|||
	private String field5; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 预留字段6 | 
				
			|||
     */ | 
				
			|||
	private String field6; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 预留字段7 | 
				
			|||
     */ | 
				
			|||
	private String field7; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 预留字段8 | 
				
			|||
     */ | 
				
			|||
	private String field8; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 预留字段9 | 
				
			|||
     */ | 
				
			|||
	private String field9; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 预留字段10 | 
				
			|||
     */ | 
				
			|||
	private String field10; | 
				
			|||
 | 
				
			|||
} | 
				
			|||
@ -0,0 +1,39 @@ | 
				
			|||
<?xml version="1.0" encoding="UTF-8"?> | 
				
			|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | 
				
			|||
 | 
				
			|||
<mapper namespace="com.epmet.dataaggre.dao.epmetuser.IcResiUserDao"> | 
				
			|||
 | 
				
			|||
    <select id="getIcResiUser" resultType="com.epmet.dto.IcResiUserDTO"> | 
				
			|||
        SELECT | 
				
			|||
            id, | 
				
			|||
            customer_id, | 
				
			|||
            agency_id, | 
				
			|||
            grid_id, | 
				
			|||
            home_id, | 
				
			|||
            name, | 
				
			|||
            mobile, | 
				
			|||
            gender, | 
				
			|||
            id_card, | 
				
			|||
            birthday | 
				
			|||
        FROM | 
				
			|||
            ic_resi_user | 
				
			|||
        WHERE | 
				
			|||
            del_flag = '0' | 
				
			|||
        AND customer_id = #{customerId} | 
				
			|||
        AND id_card = #{idCard} | 
				
			|||
    </select> | 
				
			|||
 | 
				
			|||
    <select id="getHomeUserList" resultType="com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO$Home"> | 
				
			|||
        SELECT | 
				
			|||
            id icUserId, | 
				
			|||
            home_id homeId, | 
				
			|||
            name icUserName | 
				
			|||
        FROM | 
				
			|||
            ic_resi_user | 
				
			|||
        WHERE | 
				
			|||
            del_flag = '0' | 
				
			|||
        AND home_id = #{homeId} | 
				
			|||
        ORDER BY id = #{icUserId} desc <!-- 指定某个人排在第一位 --> | 
				
			|||
    </select> | 
				
			|||
 | 
				
			|||
</mapper> | 
				
			|||
					Loading…
					
					
				
		Reference in new issue