Merge branches 'dev_change_communitySelfOrganization' and 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_change_communitySelfOrganization

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/ResiUserInfoCache.java

@@ -0,0 +1,99 @@
+package com.epmet.commons.tools.redis.common.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 房屋信息缓存
+ * @author Administrator
+ */
+@Data
+public class ResiUserInfoCache implements Serializable {
+    private String id;
+
+    /**
+     * 客户Id
+     * */
+    private String customerId;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 手机号(注册手机号)
+     */
+    private String mobile;
+
+    /**
+     * 姓氏
+     */
+    private String surname;
+
+    /**
+     * 名
+     */
+    private String name;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 身份证号
+     */
+    private String idNum;
+
+    /**
+     * 性别（1男2女0未知）
+     */
+    private String gender;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 小区名称
+     */
+    private String district;
+
+    /**
+     * 楼栋单元
+     */
+    private String buildingAddress;
+
+    /**
+     * 昵称(目前来源于微信昵称，后续系统可支持用户有昵称)
+     */
+    private String nickname;
+
+    /**
+     * 头像（目前来源于微信，后续系统顾客支持上传头像）
+     */
+    private String headImgUrl;
+
+    /**
+     * 网格Id
+     * */
+    private String registeredGridId;
+
+    /**
+     * xx机关-yy网格
+     * */
+    private String registeredGridName;
+
+    /**
+     * 显示昵称 xx网格-y先生/女士
+     * */
+    private String showName;
+
+    /**
+     * xxx街道-尹女士
+     */
+    private String userShowName;
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java

@@ -0,0 +1,79 @@
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 附加积分计算
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class PointAditiveCalcDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 积分类别;德育积分moral_education；党建积分party_building
+     */
+	private String categoryCode;
+
+    /**
+     * 积分主体ID;居民端用户ID或房屋ID
+     */
+	private String subjectId;
+
+    /**
+     * 已用积分;累计已花费
+     */
+	private Integer spend;
+
+    /**
+     * 总分;累计积分
+     */
+	private Integer total;
+
+    /**
+     * 删除标识;0.未删除 1.已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java

@@ -0,0 +1,95 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 附加积分记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class PointAditiveRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 标题;积分变动标题或业务场景标题
+     */
+	private String title;
+
+    /**
+     * 说明;积分变动的说明
+     */
+	private String statement;
+
+    /**
+     * 分值
+     */
+	private Integer pointValue;
+
+    /**
+     * 积分类别;德育积分moral_education；党建积分party_building
+     */
+	private String categoryCode;
+
+    /**
+     * 积分主体ID;居民端用户ID或房屋ID
+     */
+	private String subjectId;
+
+    /**
+     * 业务主键
+     */
+	private String businessId;
+
+    /**
+     * 业务编码;积分申请point_apply；积分奖励point_reward；积分扣罚point_fine；积分花费point_cost；驳回积分申请point_reject
+     */
+	private String businessCode;
+
+    /**
+     * 删除标识;0.未删除 1.已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAnnexDTO.java

@@ -0,0 +1,80 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 积分相关附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class PointAnnexDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 业务ID;业务主键，包括积分申请、奖扣等业务
+     */
+	private String businessId;
+
+    /**
+     * 业务编码;积分申请point_apply，积分奖励point_reward，积分扣罚point_fine，积分花费point_cost
+     */
+	private String businessCode;
+
+    /**
+     * 附件访问地址
+     */
+	private String url;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 删除标识;0.未删除 1.已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointApplyDTO.java

@@ -0,0 +1,174 @@
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 积分申请
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class PointApplyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 类别ID
+     */
+	private String categoryId;
+
+    /**
+     * 类别名称
+     */
+	private String categoryName;
+
+    /**
+     * 类别编码;德育积分moral_education；党建积分party_building
+     */
+	private String categoryCode;
+
+    /**
+     * 积分规则ID
+     */
+	private String ruleId;
+
+    /**
+     * 积分规则名称
+     */
+	private String ruleName;
+
+    /**
+     * 申请标题;30字内
+     */
+	private String title;
+
+    /**
+     * 申请内容说明;1000字内
+     */
+	private String statement;
+
+    /**
+     * 申请状态;0已提交；1已驳回；2已通过
+     */
+	private String status;
+
+    /**
+     * 申请人所属网格名称
+     */
+	private String gridName;
+
+    /**
+     * 申请人所属网格ID
+     */
+	private String gridId;
+
+    /**
+     * 申请人所属组织ID
+     */
+	private String agencyId;
+
+    /**
+     * 上级组织ID路径
+     */
+	private String agencyPids;
+
+    /**
+     * 用户ID;申请人ID（居民端用户ID）
+     */
+	private String userId;
+
+    /**
+     * 居民ID;申请人居民ID（IC_RESI_USER表主键）
+     */
+	private String icResiUser;
+
+    /**
+     * 房屋ID;房屋或家庭ID
+     */
+	private String houseId;
+
+    /**
+     * 房屋名称;完整拼接的名称
+     */
+	private String houseAllName;
+
+    /**
+     * 头像
+     */
+	private String headImgUrl;
+
+    /**
+     * 昵称
+     */
+	private String nickname;
+
+    /**
+     * 性别;未知0；男1；女2
+     */
+	private String gender;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 审核备注
+     */
+	private String remark;
+
+    /**
+     * 删除标识;0.未删除 1.已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointApplyFormDTO.java

@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/6/14 14:08
+ */
+@NoArgsConstructor
+@Data
+public class PointApplyFormDTO implements Serializable {
+    private static final long serialVersionUID = 4850146857511834988L;
+    private String customerId;
+    private String userId;
+    @NotBlank(message = "申请类别不能为空", groups = {AddGroup.class})
+    private String ruleId;
+    @NotBlank(message = "标题不能为空", groups = {AddGroup.class})
+    private String title;
+    @NotBlank(message = "申请内容不能为空", groups = {AddGroup.class})
+    private String statement;
+    @NotBlank(message = "分类不能为空", groups = {AddGroup.class})
+    private String categoryCode;
+    private List<String> annexList;
+    private String gridId;
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyTotalPointResultDTO.java

@@ -0,0 +1,37 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/6/14 15:39
+ */
+@Data
+public class MyTotalPointResultDTO implements Serializable {
+    private static final long serialVersionUID = 15299506166024546L;
+    /**
+     * 德育积分moral_education；党建积分party_building；活跃积分active
+     */
+    private String categoryCode;
+    /**
+     * 总积分
+     */
+    private Integer total;
+    /**
+     * 已花费积分
+     */
+    private Integer spend;
+    /**
+     * 可用积分
+     */
+    private Integer usable;
+
+    public MyTotalPointResultDTO() {
+        this.total = 0;
+        this.spend = 0;
+        this.usable = 0;
+    }
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java

@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.common;
+
+import com.epmet.commons.tools.constant.Constant;
+
+/**
+ * 身边党员-积分排行 入参常量
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+public interface CommonConstant extends Constant {
+    /**
+     * 德育积分
+     */
+    String MORAL_EDUCATION = "moral_education";
+    /**
+     * 党建积分
+     */
+    String PARTY_BUILDING = "party_building";
+    /**
+     * 活跃积分
+     */
+    String ACTIVE = "active";
+    /**
+     * 积分申请
+     */
+    String POINT_APPLY = "point_apply";
+    /**
+     * 积分奖励
+     */
+    String POINT_REWARD = "point_reward";
+    /**
+     * 积分扣罚
+     */
+    String POINT_FINE = "point_fine";
+    /**
+     * 积分花费
+     */
+    String POINT_COST = "point_cost";
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/ApplyStatusEnum.java

@@ -0,0 +1,49 @@
+package com.epmet.common.enu;
+
+import java.util.Objects;
+
+/**
+ * @author Administrator
+ */
+
+public enum ApplyStatusEnum {
+    //审核状态
+    AUDITING("0", "未审核"),
+    REJECT("1", "未通过"),
+    PASSED("2", "已通过");
+
+    private String code;
+    private String name;
+
+
+    ApplyStatusEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static String getName(String code) {
+        ApplyStatusEnum[] applyStatusEnums = values();
+        for (ApplyStatusEnum applyStatusEnum : applyStatusEnums) {
+            if (Objects.equals(applyStatusEnum.getCode(), code)) {
+                return applyStatusEnum.getName();
+            }
+        }
+        return null;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointApplyController.java

@@ -0,0 +1,84 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.PointApplyDTO;
+import com.epmet.dto.form.PointApplyFormDTO;
+import com.epmet.service.PointApplyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+/**
+ * 积分申请
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@RestController
+@RequestMapping("apply")
+public class PointApplyController {
+
+    @Autowired
+    private PointApplyService pointApplyService;
+
+    @RequestMapping("page")
+    public Result<PageData<PointApplyDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<PointApplyDTO> page = pointApplyService.page(params);
+        return new Result<PageData<PointApplyDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<PointApplyDTO> get(@PathVariable("id") String id){
+        PointApplyDTO data = pointApplyService.get(id);
+        return new Result<PointApplyDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody PointApplyDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        pointApplyService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody PointApplyDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        pointApplyService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        pointApplyService.delete(ids);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("submit")
+    public Result submit(@LoginUser TokenDto tokenDto, @RequestBody PointApplyFormDTO formDTO){
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        pointApplyService.submit(formDTO);
+        return new Result();
+    }
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java

@@ -232,5 +232,10 @@ public class ResiPointController {
         return new Result<GridPointRankResultDTO>().ok(userPointStatisticalDailyService.gridPointRank(tokenDto, formDTO));
     }
 
+    @PostMapping("total")
+    public Result<List<MyTotalPointResultDTO>> totalPoint(@LoginUser TokenDto tokenDto) {
+        return new Result<List<MyTotalPointResultDTO>>().ok(userPointTotalService.totalPoint(tokenDto));
+    }
+
 
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.PointAditiveCalcEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 附加积分计算
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface PointAditiveCalcDao extends BaseDao<PointAditiveCalcEntity> {
+	
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.PointAditiveRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 附加积分记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface PointAditiveRecordDao extends BaseDao<PointAditiveRecordEntity> {
+	
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAnnexDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.PointAnnexEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 积分相关附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface PointAnnexDao extends BaseDao<PointAnnexEntity> {
+	
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointApplyDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.PointApplyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 积分申请
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface PointApplyDao extends BaseDao<PointApplyEntity> {
+	
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java

@@ -0,0 +1,46 @@
+package com.epmet.entity;
+
+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 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("point_aditive_calc")
+public class PointAditiveCalcEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 积分类别;德育积分moral_education；党建积分party_building
+     */
+	private String categoryCode;
+
+    /**
+     * 积分主体ID;居民端用户ID或房屋ID
+     */
+	private String subjectId;
+
+    /**
+     * 已用积分;累计已花费
+     */
+	private Integer spend;
+
+    /**
+     * 总分;累计积分
+     */
+	private Integer total;
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java

@@ -0,0 +1,61 @@
+package com.epmet.entity;
+
+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 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("point_aditive_record")
+public class PointAditiveRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 标题;积分变动标题或业务场景标题
+     */
+	private String title;
+
+    /**
+     * 说明;积分变动的说明
+     */
+	private String statement;
+
+    /**
+     * 分值
+     */
+	private Integer pointValue;
+
+    /**
+     * 积分类别;德育积分moral_education；党建积分party_building
+     */
+	private String categoryCode;
+
+    /**
+     * 积分主体ID;居民端用户ID或房屋ID
+     */
+	private String subjectId;
+
+    /**
+     * 业务主键
+     */
+	private String businessId;
+
+    /**
+     * 业务编码;积分申请point_apply；积分奖励point_reward；积分扣罚point_fine；积分花费point_cost；驳回积分申请point_reject
+     */
+	private String businessCode;
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAnnexEntity.java

@@ -0,0 +1,45 @@
+package com.epmet.entity;
+
+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 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("point_annex")
+public class PointAnnexEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 业务ID;业务主键，包括积分申请、奖扣等业务
+     */
+	private String businessId;
+
+    /**
+     * 业务编码;积分申请point_apply，积分奖励point_reward，积分扣罚point_fine，积分花费point_cost
+     */
+	private String businessCode;
+
+    /**
+     * 附件访问地址
+     */
+	private String url;
+
+	/**
+	 * 排序
+	 */
+	private Integer sort;
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointApplyEntity.java

@@ -0,0 +1,144 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 积分申请
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("point_apply")
+public class PointApplyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 类别ID
+     */
+	private String categoryId;
+
+    /**
+     * 类别名称
+     */
+	private String categoryName;
+
+    /**
+     * 类别编码;德育积分moral_education；党建积分party_building
+     */
+	private String categoryCode;
+
+    /**
+     * 积分规则ID
+     */
+	private String ruleId;
+
+    /**
+     * 积分规则名称
+     */
+	private String ruleName;
+
+    /**
+     * 申请标题;30字内
+     */
+	private String title;
+
+    /**
+     * 申请内容说明;1000字内
+     */
+	private String statement;
+
+    /**
+     * 申请状态;0已提交；1已驳回；2已通过
+     */
+	private String status;
+
+    /**
+     * 申请人所属网格名称
+     */
+	private String gridName;
+
+    /**
+     * 申请人所属网格ID
+     */
+	private String gridId;
+
+    /**
+     * 申请人所属组织ID
+     */
+	private String agencyId;
+
+    /**
+     * 上级组织ID路径
+     */
+	private String agencyPids;
+
+    /**
+     * 用户ID;申请人ID（居民端用户ID）
+     */
+	private String userId;
+
+    /**
+     * 居民ID;申请人居民ID（IC_RESI_USER表主键）
+     */
+	private String icResiUser;
+
+    /**
+     * 房屋ID;房屋或家庭ID
+     */
+	private String houseId;
+
+    /**
+     * 房屋名称;完整拼接的名称
+     */
+	private String houseAllName;
+
+    /**
+     * 头像
+     */
+	private String headImgUrl;
+
+    /**
+     * 昵称
+     */
+	private String nickname;
+
+    /**
+     * 性别;未知0；男1；女2
+     */
+	private String gender;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 审核备注
+     */
+	private String remark;
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java

@@ -0,0 +1,78 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.PointAditiveCalcDTO;
+import com.epmet.entity.PointAditiveCalcEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 附加积分计算
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+public interface PointAditiveCalcService extends BaseService<PointAditiveCalcEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PointAditiveCalcDTO>
+     * @author generator
+     * @date 2022-06-14
+     */
+    PageData<PointAditiveCalcDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PointAditiveCalcDTO>
+     * @author generator
+     * @date 2022-06-14
+     */
+    List<PointAditiveCalcDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PointAditiveCalcDTO
+     * @author generator
+     * @date 2022-06-14
+     */
+    PointAditiveCalcDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-06-14
+     */
+    void save(PointAditiveCalcDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-06-14
+     */
+    void update(PointAditiveCalcDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-06-14
+     */
+    void delete(String[] ids);
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveRecordService.java

@@ -0,0 +1,78 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.PointAditiveRecordDTO;
+import com.epmet.entity.PointAditiveRecordEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 附加积分记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+public interface PointAditiveRecordService extends BaseService<PointAditiveRecordEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PointAditiveRecordDTO>
+     * @author generator
+     * @date 2022-06-14
+     */
+    PageData<PointAditiveRecordDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PointAditiveRecordDTO>
+     * @author generator
+     * @date 2022-06-14
+     */
+    List<PointAditiveRecordDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PointAditiveRecordDTO
+     * @author generator
+     * @date 2022-06-14
+     */
+    PointAditiveRecordDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-06-14
+     */
+    void save(PointAditiveRecordDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-06-14
+     */
+    void update(PointAditiveRecordDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-06-14
+     */
+    void delete(String[] ids);
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java

@@ -0,0 +1,78 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.PointAnnexDTO;
+import com.epmet.entity.PointAnnexEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 积分相关附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+public interface PointAnnexService extends BaseService<PointAnnexEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PointAnnexDTO>
+     * @author generator
+     * @date 2022-06-14
+     */
+    PageData<PointAnnexDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PointAnnexDTO>
+     * @author generator
+     * @date 2022-06-14
+     */
+    List<PointAnnexDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PointAnnexDTO
+     * @author generator
+     * @date 2022-06-14
+     */
+    PointAnnexDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-06-14
+     */
+    void save(PointAnnexDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-06-14
+     */
+    void update(PointAnnexDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-06-14
+     */
+    void delete(String[] ids);
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointApplyService.java

@@ -0,0 +1,88 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.PointApplyDTO;
+import com.epmet.dto.form.PointApplyFormDTO;
+import com.epmet.entity.PointApplyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 积分申请
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+public interface PointApplyService extends BaseService<PointApplyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PointApplyDTO>
+     * @author generator
+     * @date 2022-06-14
+     */
+    PageData<PointApplyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PointApplyDTO>
+     * @author generator
+     * @date 2022-06-14
+     */
+    List<PointApplyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PointApplyDTO
+     * @author generator
+     * @date 2022-06-14
+     */
+    PointApplyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-06-14
+     */
+    void save(PointApplyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-06-14
+     */
+    void update(PointApplyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-06-14
+     */
+    void delete(String[] ids);
+
+    /**
+     * 申请德育积分/党建积分
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/6/14 14:14
+     */
+    void submit(PointApplyFormDTO formDTO);
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java

@@ -18,8 +18,10 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.form.CommonUserFormDTO;
 import com.epmet.dto.form.ResiPointRankFormDTO;
+import com.epmet.dto.result.MyTotalPointResultDTO;
 import com.epmet.dto.result.ResiPointDetailResultDTO;
 import com.epmet.dto.result.ResiPointRankListResultDTO;
 import com.epmet.entity.UserPointTotalEntity;
@@ -69,4 +71,14 @@ public interface UserPointTotalService extends BaseService<UserPointTotalEntity>
      * @date 2020.07.22 15:58
      **/
     ResiPointDetailResultDTO getMyPointGroupByCustomer(CommonUserFormDTO customerUserParam);
+
+    /**
+     * 积分总分
+     *
+     * @Param tokenDto
+     * @Return {@link MyTotalPointResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/6/14 15:46
+     */
+    List<MyTotalPointResultDTO> totalPoint(TokenDto tokenDto);
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java

@@ -0,0 +1,82 @@
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.PointAditiveCalcDao;
+import com.epmet.dto.PointAditiveCalcDTO;
+import com.epmet.entity.PointAditiveCalcEntity;
+import com.epmet.service.PointAditiveCalcService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 附加积分计算
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Service
+public class PointAditiveCalcServiceImpl extends BaseServiceImpl<PointAditiveCalcDao, PointAditiveCalcEntity> implements PointAditiveCalcService {
+
+    @Override
+    public PageData<PointAditiveCalcDTO> page(Map<String, Object> params) {
+        IPage<PointAditiveCalcEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PointAditiveCalcDTO.class);
+    }
+
+    @Override
+    public List<PointAditiveCalcDTO> list(Map<String, Object> params) {
+        List<PointAditiveCalcEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PointAditiveCalcDTO.class);
+    }
+
+    private QueryWrapper<PointAditiveCalcEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PointAditiveCalcEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PointAditiveCalcDTO get(String id) {
+        PointAditiveCalcEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PointAditiveCalcDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PointAditiveCalcDTO dto) {
+        PointAditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveCalcEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PointAditiveCalcDTO dto) {
+        PointAditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveCalcEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java

@@ -0,0 +1,84 @@
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.PointAditiveRecordDao;
+import com.epmet.dto.PointAditiveRecordDTO;
+import com.epmet.entity.PointAditiveRecordEntity;
+import com.epmet.service.PointAditiveRecordService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 附加积分记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Service
+public class PointAditiveRecordServiceImpl extends BaseServiceImpl<PointAditiveRecordDao, PointAditiveRecordEntity> implements PointAditiveRecordService {
+
+
+    @Override
+    public PageData<PointAditiveRecordDTO> page(Map<String, Object> params) {
+        IPage<PointAditiveRecordEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PointAditiveRecordDTO.class);
+    }
+
+    @Override
+    public List<PointAditiveRecordDTO> list(Map<String, Object> params) {
+        List<PointAditiveRecordEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PointAditiveRecordDTO.class);
+    }
+
+    private QueryWrapper<PointAditiveRecordEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PointAditiveRecordEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PointAditiveRecordDTO get(String id) {
+        PointAditiveRecordEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PointAditiveRecordDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PointAditiveRecordDTO dto) {
+        PointAditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveRecordEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PointAditiveRecordDTO dto) {
+        PointAditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveRecordEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java

@@ -0,0 +1,83 @@
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.PointAnnexDao;
+import com.epmet.dto.PointAnnexDTO;
+import com.epmet.entity.PointAnnexEntity;
+import com.epmet.service.PointAnnexService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 积分相关附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Service
+public class PointAnnexServiceImpl extends BaseServiceImpl<PointAnnexDao, PointAnnexEntity> implements PointAnnexService {
+
+    @Override
+    public PageData<PointAnnexDTO> page(Map<String, Object> params) {
+        IPage<PointAnnexEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PointAnnexDTO.class);
+    }
+
+    @Override
+    public List<PointAnnexDTO> list(Map<String, Object> params) {
+        List<PointAnnexEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PointAnnexDTO.class);
+    }
+
+    private QueryWrapper<PointAnnexEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PointAnnexEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PointAnnexDTO get(String id) {
+        PointAnnexEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PointAnnexDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PointAnnexDTO dto) {
+        PointAnnexEntity entity = ConvertUtils.sourceToTarget(dto, PointAnnexEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PointAnnexDTO dto) {
+        PointAnnexEntity entity = ConvertUtils.sourceToTarget(dto, PointAnnexEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java

@@ -0,0 +1,153 @@
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.common.CommonConstant;
+import com.epmet.common.enu.ApplyStatusEnum;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.PointAnnexDao;
+import com.epmet.dao.PointApplyDao;
+import com.epmet.dto.PointApplyDTO;
+import com.epmet.dto.form.PointApplyFormDTO;
+import com.epmet.dto.result.HomeInfoResultDTO;
+import com.epmet.entity.PointAnnexEntity;
+import com.epmet.entity.PointApplyEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.service.PointApplyService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * 积分申请
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Service
+public class PointApplyServiceImpl extends BaseServiceImpl<PointApplyDao, PointApplyEntity> implements PointApplyService {
+
+    @Resource
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Resource
+    private PointAnnexDao pointAnnexDao;
+
+    @Override
+    public PageData<PointApplyDTO> page(Map<String, Object> params) {
+        IPage<PointApplyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PointApplyDTO.class);
+    }
+
+    @Override
+    public List<PointApplyDTO> list(Map<String, Object> params) {
+        List<PointApplyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PointApplyDTO.class);
+    }
+
+    private QueryWrapper<PointApplyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PointApplyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PointApplyDTO get(String id) {
+        PointApplyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PointApplyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PointApplyDTO dto) {
+        PointApplyEntity entity = ConvertUtils.sourceToTarget(dto, PointApplyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PointApplyDTO dto) {
+        PointApplyEntity entity = ConvertUtils.sourceToTarget(dto, PointApplyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 申请德育积分/党建积分
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/6/14 14:14
+     */
+    @Override
+    public void submit(PointApplyFormDTO formDTO) {
+        PointApplyEntity entity = ConvertUtils.sourceToTarget(formDTO, PointApplyEntity.class);
+        //从缓存获取网格信息
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getGridId());
+        if (null == gridInfo) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格缓存失败", "获取网格缓存失败");
+        }
+        //如果申请类型为德育积分，需要获取用户所在房屋
+        if (CommonConstant.MORAL_EDUCATION.equals(formDTO.getCategoryCode())) {
+            Result<HomeInfoResultDTO> result =  epmetUserOpenFeignClient.getHomeInfo();
+            if (!result.success() || null == result.getData()) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民所在家庭信息失败", "获取居民所在家庭信息失败");
+            }
+            if (StringUtils.isBlank(result.getData().getHouseId())) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "无法申请", "没有绑定家庭，无法申请德育积分");
+            }
+            entity.setHouseId(result.getData().getHouseId());
+        }
+
+        entity.setAgencyId(gridInfo.getPid());
+        entity.setAgencyPids(gridInfo.getPids());
+        entity.setStatus(ApplyStatusEnum.AUDITING.getCode());
+        baseDao.insert(entity);
+
+        //保存附件
+        if (CollectionUtils.isNotEmpty(formDTO.getAnnexList())) {
+            AtomicInteger i = new AtomicInteger(NumConstant.ONE);
+            formDTO.getAnnexList().forEach(url -> {
+                PointAnnexEntity annex = new PointAnnexEntity();
+                annex.setCustomerId(formDTO.getCustomerId());
+                annex.setBusinessId(entity.getId());
+                annex.setBusinessCode(CommonConstant.POINT_APPLY);
+                annex.setUrl(url);
+                annex.setSort(i.getAndIncrement());
+                pointAnnexDao.insert(annex);
+            });
+        }
+
+    }
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java

@@ -17,15 +17,22 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.common.CommonConstant;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.PointAditiveCalcDao;
 import com.epmet.dao.UserPointTotalDao;
 import com.epmet.dto.form.CommonUserFormDTO;
 import com.epmet.dto.form.ResiPointRankFormDTO;
 import com.epmet.dto.result.*;
+import com.epmet.entity.PointAditiveCalcEntity;
 import com.epmet.entity.UserPointTotalEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.UserPointTotalService;
@@ -33,9 +40,9 @@ import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -50,8 +57,10 @@ import java.util.stream.Collectors;
 @Slf4j
 public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao, UserPointTotalEntity> implements UserPointTotalService {
 
-    @Autowired
-    EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Resource
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Resource
+    private PointAditiveCalcDao pointAditiveCalcDao;
 
     /**
      * @Description 获取指定居民的积分信息
@@ -203,4 +212,66 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
         return result;
     }
 
+    /**
+     * 积分总分
+     *
+     * @param tokenDto
+     * @Param tokenDto
+     * @Return {@link MyTotalPointResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/6/14 15:46
+     */
+    @Override
+    public List<MyTotalPointResultDTO> totalPoint(TokenDto tokenDto) {
+        List<MyTotalPointResultDTO> list = new ArrayList<MyTotalPointResultDTO>();
+        //活跃度积分
+        MyTotalPointResultDTO active = new MyTotalPointResultDTO();
+        active.setCategoryCode(CommonConstant.ACTIVE);
+        ResiPointDetailResultDTO activeTotal = baseDao.selectPointByCustomerUserId(tokenDto.getUserId(), tokenDto.getCustomerId());
+        if (null != activeTotal) {
+            active.setTotal(activeTotal.getAccumulatedPoint());
+            active.setUsable(activeTotal.getUsablePoint());
+            active.setSpend(activeTotal.getAccumulatedPoint() - activeTotal.getUsablePoint());
+        }
+        list.add(active);
+        //德育积分
+        MyTotalPointResultDTO education = new MyTotalPointResultDTO();
+        education.setCategoryCode(CommonConstant.MORAL_EDUCATION);
+        //获取居民绑定的家庭
+        Result<HomeInfoResultDTO> result =  epmetUserOpenFeignClient.getHomeInfo();
+        if (!result.success() || null == result.getData()) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民绑定家庭信息失败", "获取居民绑定家庭信息失败");
+        }
+        if (StringUtils.isNotBlank(result.getData().getHouseId())) {
+            LambdaQueryWrapper<PointAditiveCalcEntity> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId());
+            wrapper.eq(PointAditiveCalcEntity::getSubjectId, result.getData().getHouseId());
+            wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.MORAL_EDUCATION);
+            PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper);
+            if (null != entity) {
+                education.setTotal(entity.getTotal());
+                education.setSpend(entity.getSpend());
+                education.setUsable(entity.getTotal() - entity.getSpend());
+            }
+        }
+        list.add(education);
+
+        //党建积分
+        MyTotalPointResultDTO party = new MyTotalPointResultDTO();
+        party.setCategoryCode(CommonConstant.PARTY_BUILDING);
+        LambdaQueryWrapper<PointAditiveCalcEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId());
+        wrapper.eq(PointAditiveCalcEntity::getSubjectId, tokenDto.getUserId());
+        wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.PARTY_BUILDING);
+        PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper);
+        if (null != entity) {
+            party.setTotal(entity.getTotal());
+            party.setSpend(entity.getSpend());
+            party.setUsable(entity.getTotal() - entity.getSpend());
+        }
+        list.add(party);
+
+        return list;
+    }
+
 }

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml

@@ -0,0 +1,22 @@
+<?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.dao.PointAditiveCalcDao">
+
+    <resultMap type="com.epmet.entity.PointAditiveCalcEntity" id="pointAditiveCalcMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="categoryCode" column="CATEGORY_CODE"/>
+        <result property="subjectId" column="SUBJECT_ID"/>
+        <result property="spend" column="SPEND"/>
+        <result property="total" column="TOTAL"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml

@@ -0,0 +1,25 @@
+<?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.dao.PointAditiveRecordDao">
+
+    <resultMap type="com.epmet.entity.PointAditiveRecordEntity" id="pointAditiveRecordMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="title" column="TITLE"/>
+        <result property="statement" column="STATEMENT"/>
+        <result property="pointValue" column="POINT_VALUE"/>
+        <result property="categoryCode" column="CATEGORY_CODE"/>
+        <result property="subjectId" column="SUBJECT_ID"/>
+        <result property="businessId" column="BUSINESS_ID"/>
+        <result property="businessCode" column="BUSINESS_CODE"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAnnexDao.xml

@@ -0,0 +1,21 @@
+<?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.dao.PointAnnexDao">
+
+    <resultMap type="com.epmet.entity.PointAnnexEntity" id="pointAnnexMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="businessId" column="BUSINESS_ID"/>
+        <result property="businessCode" column="BUSINESS_CODE"/>
+        <result property="url" column="URL"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml

@@ -0,0 +1,41 @@
+<?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.dao.PointApplyDao">
+
+    <resultMap type="com.epmet.entity.PointApplyEntity" id="pointApplyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="categoryId" column="CATEGORY_ID"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
+        <result property="categoryCode" column="CATEGORY_CODE"/>
+        <result property="ruleId" column="RULE_ID"/>
+        <result property="ruleName" column="RULE_NAME"/>
+        <result property="title" column="TITLE"/>
+        <result property="statement" column="STATEMENT"/>
+        <result property="status" column="STATUS"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="agencyPids" column="AGENCY_PIDS"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="icResiUser" column="IC_RESI_USER"/>
+        <result property="houseId" column="HOUSE_ID"/>
+        <result property="houseAllName" column="HOUSE_ALL_NAME"/>
+        <result property="headImgUrl" column="HEAD_IMG_URL"/>
+        <result property="nickname" column="NICKNAME"/>
+        <result property="gender" column="GENDER"/>
+        <result property="name" column="NAME"/>
+        <result property="idCard" column="ID_CARD"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="remark" column="REMARK"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -3,6 +3,8 @@ package com.epmet.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -309,6 +311,14 @@ public class CodeServiceImpl implements CodeService {
 		if (null == authInfo) {
 			throw new RenException("未授权");
 		}
+		//校验小程序是否设置了用户隐私 如果没有设置则执行设置后 再发布
+		WxResult<String> privacySetting = wxMaCodeService.getPrivacySetting(authInfo.getAuthorizerAccessToken());
+		if (!privacySetting.success()){
+			WxResult<String> stringWxResult = wxMaCodeService.setPrivacySetting(authInfo.getAuthorizerAccessToken());
+			if (!stringWxResult.success()){
+				throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),stringWxResult.getErrorMsg(),"用户隐私权限设置失败");
+			}
+		}
 		//获取上传代码信息
 		CodeCustomerDTO uploadCode = codeCustomerService.getUploadCodeByCustomer(formDTO.getCodeId(), codeCustomerDTO.getCustomerId(),
 				codeCustomerDTO.getClientType());

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java

@@ -200,4 +200,16 @@ public interface WxMaCodeConstant {
      * 获取代码草稿列表
      */
     String DELETE_TEMPLATE_URL = "https://api.weixin.qq.com/wxa/deletetemplate";
+
+    /**
+     * 获取用户隐私地址
+     * @see https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/privacy_config/set_privacy_setting.html
+     */
+    String GET_PRIVACY_SETTING_URL = "https://api.weixin.qq.com/cgi-bin/component/getprivacysetting";
+
+    /**
+     * 设置用户隐私地址
+     * @see https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/privacy_config/set_privacy_setting.html
+     */
+    String SET_PRIVACY_SETTING_URL = "https://api.weixin.qq.com/cgi-bin/component/setprivacysetting";
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java

@@ -72,6 +72,22 @@ public interface WxMaCodeService {
 	 */
 	WxResult<String> submitAudit(String accessToken, WxMaCodeSubmitAuditRequest auditRequest);
 
+	/**
+	 * 获取用户隐私接口权限.
+	 *
+	 * @param accessToken  小程序对应的accessToken
+	 * @return 审核编号
+	 */
+	WxResult<String> getPrivacySetting(String accessToken);
+
+	/**
+	 * 设置用户隐私接口权限.
+	 *
+	 * @param accessToken  小程序对应的accessToken
+	 * @return 审核编号
+	 */
+	WxResult<String> setPrivacySetting(String accessToken);
+
 	/**
 	 * 加急审核申请
 	 * @author zhaoqifeng
@@ -197,7 +213,7 @@ public interface WxMaCodeService {
 	/**
 	 * 版本退回
 	 * @author zhaoqifeng
-	 * @date 2020/8/10 15:41 
+	 * @date 2020/8/10 15:41
 	 * @param accessToken
 	 * @return com.epmet.wxapi.result.WxResult
 	 */
@@ -215,7 +231,7 @@ public interface WxMaCodeService {
 	/**
 	 * 将草稿添加到代码模板库
 	 * @author zhaoqifeng
-	 * @date 2020/10/28 10:23 
+	 * @date 2020/10/28 10:23
 	 * @param accessToken
 	 * @param request
 	 * @return com.epmet.wxapi.result.WxResult

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java

@@ -1,5 +1,7 @@
 package com.epmet.wxapi.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.HttpClientManager;
@@ -36,6 +38,7 @@ import java.util.Map;
 public class WxMaCodeServiceImpl implements WxMaCodeService {
 	private static final String ERR_CODE = "errcode";
 	private static final String ERR_MSG = "errmsg";
+	private static final String SETTING_LIST = "setting_list";
 
 	@Autowired
 	private WxMaDomainDTO wxMaDomainDTO;
@@ -150,6 +153,50 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 		return result;
 	}
 
+	@Override
+	public WxResult<String> getPrivacySetting(String accessToken) {
+		WxResult<String> result = new WxResult<>();
+		String url = WxMaCodeConstant.SET_PRIVACY_SETTING_URL + "?" + "access_token=" + accessToken;
+		Result<String> submitResult = HttpClientManager.getInstance().sendPostByJSON(url, "{}");
+		log.info("getPrivacySetting result:{}", JSON.toJSONString(submitResult));
+		if (!submitResult.success()) {
+			result.setErrorCode(submitResult.getCode());
+			result.setErrorMsg(submitResult.getMsg());
+			return result;
+		}
+		JSONObject jsonObject = JSONObject.parseObject(submitResult.getData());
+
+
+		JSONArray jsonArray = jsonObject.getJSONArray(SETTING_LIST);
+		if (jsonArray.size() == 9){
+			result.setErrorCode(9999);
+			result.setErrorMsg("用户隐私权限未设置或设置不完整");
+			return result;
+		}
+		result.setErrorCode(jsonObject.getInteger(ERR_CODE));
+		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE)));
+		return result;
+	}
+
+	@Override
+	public WxResult setPrivacySetting(String accessToken) {
+		//todo 目前设置9个隐私权限
+		String param = "{\"owner_setting\":{\"contact_email\":\"eshitong@elink-cn.com\",\"contact_phone\":\"\",\"contact_qq\":\"\",\"contact_weixin\":\"\",\"ext_file_media_id\":\"\",\"notice_method\":\"通知\",\"store_expire_timestamp\":\"\"},\"setting_list\":[{\"privacy_key\":\"UserInfo\",\"privacy_text\":\"用户个人中心显示用户头像及昵称等\"},{\"privacy_key\":\"Location\",\"privacy_text\":\"发表话题等功能时获取位置信息\"},{\"privacy_key\":\"Record\",\"privacy_text\":\"录音发话题等\"},{\"privacy_key\":\"Album\",\"privacy_text\":\"上传照片发话题等\"},{\"privacy_key\":\"AlbumWriteOnly\",\"privacy_text\":\"下载党建声音图片或项目附近等\"},{\"privacy_key\":\"Camera\",\"privacy_text\":\"通过相机拍照发话题反应问题等\"},{\"privacy_key\":\"PhoneNumber\",\"privacy_text\":\"通过手机号为用户开通账号，更新用户基础信息\"},{\"privacy_key\":\"MessageFile\",\"privacy_text\":\"发表话题等可以选择文件上传\"},{\"privacy_key\":\"ChooseLocation\",\"privacy_text\":\"用户巡查上报\"}],\"privacy_ver\":2}\n";
+		WxResult<String> result = new WxResult<>();
+		String url = WxMaCodeConstant.SET_PRIVACY_SETTING_URL + "?" + "access_token=" + accessToken;
+		Result<String> submitResult = HttpClientManager.getInstance().sendPostByJSON(url, param);
+		log.info("setPrivacySetting param:{}, result:{}", param, JSON.toJSONString(submitResult));
+		if (!submitResult.success()) {
+			result.setErrorCode(submitResult.getCode());
+			result.setErrorMsg(submitResult.getMsg());
+			return result;
+		}
+		JSONObject jsonObject = JSONObject.parseObject(submitResult.getData());
+		result.setErrorCode(jsonObject.getInteger(ERR_CODE));
+		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE)));
+		return result;
+	}
+
 	@Override
 	public WxResult speedUpAudit(String accessToken, WxMaSpeedUpAuditReq request) {
 		WxResult result = new WxResult();

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonHouseFormDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epmet-cloud
+ * @description:
+ * @author: wangtong
+ * @create: 2022-06-10 13:26
+ **/
+@Data
+public class CommonHouseFormDTO implements Serializable {
+
+    private String houseCode;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseInfoFormDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @program: epmet-cloud
+ * @description:
+ * @author: wangtong
+ * @create: 2022-06-09 15:12
+ **/
+@Data
+public class HouseInfoFormDTO implements Serializable {
+
+    @NotNull(message = "房屋编码不可为空")
+    private String houseCode;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java

@@ -89,8 +89,13 @@ public class IcHouseListFormDTO extends PageFormDTO {
      * 结束日期 eg：20220505
      */
     private String updateEndDate;
-    
+
     private String customerId;
 
     private String selectType;
+
+    /**
+     * 楼栋ID
+     */
+    private String unitId;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java

@@ -0,0 +1,106 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epmet-cloud
+ * @description:
+ * @author: wangtong
+ * @create: 2022-06-09 15:22
+ **/
+@Data
+public class HouseInfoResultDTO implements Serializable {
+
+    private String houseId;
+
+    private String houseName;
+
+    private String houseCode;
+
+    private String houseQrcodeUrl;
+
+    private String customerId;
+
+    /**
+     * 所属行政组织
+     */
+    private String agencyId;
+    private String agencyPids;
+    private String agencyName;
+
+    /**
+     * eg：市北区-阜新路街道-南宁社区
+     */
+    private String agencyPathName;
+    /**
+     * 组织的area_code
+     */
+    private String areaCode;
+
+    /**
+     * 所属网格
+     */
+    private String gridName;
+    private String gridId;
+
+    /**
+     * 所属小区
+     */
+    private String neighborHoodId;
+    private String neighborHoodName;
+
+    /**
+     * 所属楼栋
+     */
+    private String buildingId;
+    private String buildingName;
+
+    /**
+     * 所属单元id
+     */
+    private String buildingUnitId;
+    private String unitName;
+
+    /**
+     * 门牌号
+     */
+    private String doorName;
+
+    /**
+     * 房屋类型，这里存储字典value就可以
+     */
+    private String houseType;
+    private String houseTypeName;
+    /**
+     * 存储字典value
+     */
+    private String purpose;
+    private String purposeName;
+    /**
+     * 1出租；0未出租
+     */
+    private Integer rentFlag;
+    private String rentName;
+
+    /**
+     * 房主姓名
+     */
+    private String ownerName;
+
+    /**
+     * 房主电话
+     */
+    private String ownerPhone;
+
+    /**
+     * 房主身份证号
+     */
+    private String ownerIdCard;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -661,4 +661,15 @@ public interface GovOrgOpenFeignClient {
      */
     @GetMapping("/gov/org/ichouse/getbyhousecode/{houseCode}")
     Result<IcHouseDTO> getByHouseCode(@PathVariable("houseCode") String houseCode);
+
+
+    /**
+     * @describe: 工作端-通过房屋编码获取房屋信息
+     * @author wangtong
+     * @date 2022/6/10 13:27
+     * @params [dto]
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("/gov/org/house/getHomeInfoByHouseCode")
+    Result<HouseInfoResultDTO> getHomeInfoByHouseCode(CommonHouseFormDTO dto);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -425,4 +425,10 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<DelAgencyGridIdResultDTO> getDelAgencyGridIdList(String agencyId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getDelAgencyGridIdList", agencyId);
     }
+
+    @Override
+    public Result<HouseInfoResultDTO> getHomeInfoByHouseCode(CommonHouseFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getHomeInfoByHouseCode", dto);
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -554,6 +554,21 @@ public class HouseController implements ResultDataResolver {
     @PostMapping("createHouseQrcodeUrl")
     public String createHouseQrcodeUrl(@RequestBody TestFormDTO formDTO) throws Exception {
         return houseService.createHouseQrcodeUrl(formDTO.getHouseId(),null);
+    }
+
 
+    /**
+     * @describe: 工作端-通过房屋编码获取房屋信息
+     * @author wangtong
+     * @date 2022/6/9 14:48
+     * @params [tokenDto]
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("getHomeInfoByHouseCode")
+    public Result getHomeInfoByHouseCode(@RequestBody HouseInfoFormDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto);
+        return houseService.getHomeInfoByHouseCode(dto);
     }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -154,4 +154,22 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     * @return com.epmet.dto.result.IcHouseQrcodeConfigDTO
     */
     CustomerOrgParameterEntity selectByCustomerId(@Param("customerId") String customerId, @Param("preKey") String preKey);
+
+    /**
+    * @describe: 工作端-通过房屋编码获取房屋信息
+    * @author wangtong
+    * @date 2022/6/9 15:23
+    * @params [houseCode]
+    * @return com.epmet.dto.result.HouseInfoResultDTO
+    */
+    HouseInfoResultDTO selectHomeInfoByHouseCode(@Param("houseCode") String houseCode);
+
+    /**
+    * @describe: 根据筛选获取需要下载的一户一码信息
+    * @author wangtong
+    * @date 2022/6/13 16:34
+    * @params [formDTO]
+    * @return java.util.List<com.epmet.dto.result.IcHouseListResultDTO>
+    */
+    List<IcHouseListResultDTO> searchHouseZipList(IcHouseListFormDTO formDTO);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java

@@ -163,4 +163,14 @@ public interface HouseService {
     * @return com.epmet.commons.tools.utils.Result
     */
     Result createBatchHouseCodeAndUrl(String customerId);
+
+
+    /**
+     * @describe: 通过房屋编码获取房屋信息
+     * @author wangtong
+     * @date 2022/6/9 14:51
+     * @params [tokenDto]
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    Result getHomeInfoByHouseCode(HouseInfoFormDTO dto);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.utils.FileUtils;
 import com.epmet.commons.tools.utils.HouseQRcodeUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerGridConstant;
+import com.epmet.constant.NeighborhoodConstant;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.*;
 import com.epmet.dto.*;
@@ -55,6 +56,7 @@ import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -808,15 +810,22 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
     @Override
     public void downloadZip(HttpServletResponse response, IcHouseListFormDTO formDTO) throws Exception {
-        // 查询pids
-        String pids = null;
-        if (StringUtils.isNotBlank(formDTO.getAgencyId())) {
-            pids = getPids(formDTO.getAgencyId());
+        if(NeighborhoodConstant.GRID.equals(formDTO.getLevel())){
+            //根据网格过滤
+            formDTO.setGridId(formDTO.getId());
+        }else if(StringUtils.isNotBlank(formDTO.getId())){
+            //根据组织过滤
+            formDTO.setAgencyId(formDTO.getId());
         }
-        if (StringUtils.isNotBlank(formDTO.getLevel()) && OrgTypeEnum.AGENCY.getCode().equals(formDTO.getLevel())) {
-            pids = getPids(formDTO.getAgencyId());
-        }
-        formDTO.setPids(pids);
+        // 查询pids
+//        String pids = null;
+//        if (StringUtils.isNotBlank(formDTO.getAgencyId())) {
+//            pids = getPids(formDTO.getAgencyId());
+//        }
+//        if (StringUtils.isNotBlank(formDTO.getLevel()) && OrgTypeEnum.AGENCY.getCode().equals(formDTO.getLevel())) {
+//            pids = getPids(formDTO.getAgencyId());
+//        }
+//        formDTO.setPids(pids);
 
         //response
         response.reset();
@@ -830,7 +839,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         response.setHeader("Content-Disposition", "attachment;filename=" + downloadFilename);
         ZipOutputStream zip = new ZipOutputStream(response.getOutputStream());
 
-        List<IcHouseListResultDTO> houseList = icHouseDao.searchHouseByPage(formDTO);
+        List<IcHouseListResultDTO> houseList = icHouseDao.searchHouseZipList(formDTO);
 
         //获取一户一码前缀地址
         CustomerOrgParameterEntity codePre = icHouseDao.selectByCustomerId(formDTO.getCustomerId(), HouseQrcodeEnum.PREFIX_KEY.getCode());
@@ -1037,4 +1046,28 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         return buffer.toString();
     }
 
+    @Override
+    public Result getHomeInfoByHouseCode(HouseInfoFormDTO dto) {
+        HouseInfoResultDTO house = icHouseDao.selectHomeInfoByHouseCode(dto.getHouseCode());
+
+        HouseInfoCache cache = CustomerIcHouseRedis.getHouseInfo(house.getCustomerId(), house.getHouseId());
+        BeanUtils.copyProperties(cache,house);
+
+        if (null != house && StringUtils.isNotBlank(house.getAgencyId())) {
+            AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(house.getAgencyId());
+            house.setAgencyPathName(StringUtils.isNotBlank(agencyInfoCache.getAllParentName()) ? agencyInfoCache.getAllParentName().concat(StrConstant.HYPHEN).concat(agencyInfoCache.getOrganizationName()) : agencyInfoCache.getOrganizationName());
+            house.setAreaCode(StringUtils.isNotBlank(agencyInfoCache.getAreaCode()) ? agencyInfoCache.getAreaCode() : StrConstant.EPMETY_STR);
+            house.setAgencyName(StringUtils.isNotBlank(agencyInfoCache.getOrganizationName()) ? agencyInfoCache.getOrganizationName() : StrConstant.EPMETY_STR);
+        } else {
+            house.setAgencyPathName(StrConstant.EPMETY_STR);
+            house.setAgencyName(StrConstant.EPMETY_STR);
+        }
+
+        house.setHouseTypeName(HouseTypeEnums.getTypeValue(house.getHouseType()));
+        house.setRentName(HouseRentFlagEnums.getTypeValue(house.getRentFlag()));
+        house.setPurposeName(HousePurposeEnums.getTypeValue(house.getPurpose()));
+        return new Result().ok(house);
+    }
+
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -435,6 +435,83 @@
               and PARAMETER_KEY=#{preKey}
               and DEL_FLAG='0'
     </select>
+    <select id="selectHomeInfoByHouseCode" resultType="com.epmet.dto.result.HouseInfoResultDTO">
+        select
+            concat(c.NEIGHBOR_HOOD_NAME,b.BUILDING_NAME,d.UNIT_NUM,'单元',a.DOOR_NAME) as houseName,
+            a.HOUSE_CODE,
+            a.HOUSE_QRCODE_URL,
+            a.CUSTOMER_ID,
+            a.id as houseId,
+            a.HOUSE_TYPE,
+            a.PURPOSE,
+            a.RENT_FLAG,
+            a.OWNER_NAME,
+            a.OWNER_PHONE,
+            a.OWNER_ID_CARD,
+            a.REMARK,
+            c.AGENCY_PIDS
+        from ic_house a
+        LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
+        LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'
+        LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0'
+        where a.HOUSE_CODE=#{houseCode}
+              and a.del_flag = '0'
+    </select>
+    <select id="searchHouseZipList" resultType="com.epmet.dto.result.IcHouseListResultDTO">
+        select DISTINCT
+        concat(b.BUILDING_NAME,'-',d.UNIT_NUM,'-',a.DOOR_NAME) as houseName,
+        c.NEIGHBOR_HOOD_NAME as neighborHoodName,
+        b.BUILDING_NAME as buildingName,
+        CONCAT(d.UNIT_NUM,'单元') as unitNum,
+        a.DOOR_NAME as doorName,
+        (case when a.RENT_FLAG = '0' then '自住'
+        when a.RENT_FLAG = '1' then '出租'
+        when a.RENT_FLAG = '2' then '闲置'
+        else '' end) as rentFlag,
+        a.OWNER_NAME as ownerName,
+        a.OWNER_PHONE as ownerPhone,
+        a.OWNER_ID_CARD as ownerIdCard,
+        a.HOUSE_CODE,
+
+        a.ID as houseId,
+        c.ID as neighborHoodId,
+        b.ID as buildingId,
+        a.BUILDING_UNIT_ID as unitNumKey,
+        a.HOUSE_TYPE as houseTypeKey,
+        a.PURPOSE as purposeKey,
+        CAST(a.RENT_FLAG AS CHAR) as rentFlagKey,
+        c.AGENCY_ID as agencyId,
+        ag.ORGANIZATION_NAME agencyName,
+        c.GRID_ID as gridId,
+        gr.GRID_NAME,
+        IFNULL(a.sort,0) as sort,
+        a.CUSTOMER_ID
+        from ic_house a
+        LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
+        LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'
+        LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0'
+        LEFT JOIN customer_grid gr on gr.ID = c.GRID_ID and d.DEL_FLAG = '0'
+        LEFT JOIN customer_agency ag on ag.ID = c.AGENCY_ID and d.DEL_FLAG = '0'
+        <where>
+            <if test="gridId != null and gridId.trim() != ''">
+                AND c.GRID_ID = #{gridId}
+            </if>
+            <if test="agencyId != null and agencyId.trim() != ''">
+                AND (c.AGENCY_ID = #{agencyId} or CONCAT(':',c.AGENCY_PIDS, ':') like  CONCAT('%:',#{agencyId},':%'))
+            </if>
+            <if test="buildingId != null and buildingId.trim() != ''">
+                AND b.id = #{buildingId}
+            </if>
+            <if test="neighborHoodId != null and neighborHoodId.trim() != ''">
+                AND c.id = #{neighborHoodId}
+            </if>
+            <if test="unitId != null and unitId.trim() != ''">
+                AND d.id = #{unitId}
+            </if>
+            AND a.DEL_FLAG = '0'
+        </where>
+        ORDER BY CAST(c.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(c.NEIGHBOR_HOOD_NAME using gbk)
+    </select>
 
     <!-- 获取单元下的房屋数 -->
     <select id="getHouseCountByUnitIds" resultType="java.lang.Integer">

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventMonthlyCountResultDTO.java

@@ -1,9 +1,7 @@
 package com.epmet.dto.result;
 
-import jdk.nashorn.internal.ir.debug.PrintVisitor;
 import lombok.Data;
 
-import java.util.Date;
 
 @Data
 public class IcEventMonthlyCountResultDTO {

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java

@@ -12,7 +12,6 @@ import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
@@ -21,23 +20,13 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.dto.IcFollowUpRecordDTO;
-import com.epmet.dto.result.IcMoveInListResultDTO;
-import com.epmet.dto.result.IcVaccineListResultDTO;
-import com.epmet.modules.partymember.entity.IcPartyMemberPointEntity;
-import com.epmet.modules.partymember.excel.IcPartyMemberExcel;
 import com.epmet.modules.partymember.excel.IcPartyMemberPointExcel;
 import com.epmet.modules.partymember.service.IcPartyMemberPointService;
 import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPointDTO;
-import com.epmet.resi.partymember.dto.partymember.PartyMemberPointListCountDTO;
-import com.epmet.resi.partymember.dto.partymember.form.PartyMemberExportFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointEchoFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointListFormDTO;
-import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO;
-import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointExportResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO;
-import jdk.nashorn.internal.parser.Token;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +34,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java

@@ -24,7 +24,6 @@ import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointExportR
 import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import jdk.nashorn.internal.parser.Token;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java

@@ -27,6 +27,8 @@ public class IcResiUserConfirmSubmitDTO implements Serializable {
      */
     private String customerId;
 
+    private String staffId;
+
     /**
      * 组织Id
      */
@@ -207,4 +209,6 @@ public class IcResiUserConfirmSubmitDTO implements Serializable {
      */
     private String operationDescribe;
 
+    private String houseCode;
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MoveOutMemberFormDTO.java

@@ -0,0 +1,136 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MoveOutMemberFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 7059338517023959372L;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+    /**
+     * 居民信息ID
+     */
+    private String icResiUserId;
+
+    /**
+     * 居民所在网格ID
+     */
+    private String gridId;
+
+    /**
+     * 迁出到网格名 迁出类型为in时必填
+     */
+    private String gridName;
+
+    /**
+     * 迁出到小区名 迁出类型为in时必填
+     */
+    private String villageName;
+
+    /**
+     * 迁出到楼栋名 迁出类型为in时必填
+     */
+    private String buildName;
+
+    /**
+     * 迁出到单元名 迁出类型为in时必填
+     */
+    private String unitName;
+
+    /**
+     * 迁出到房屋名 迁出类型为in时必填
+     */
+    private String homeName;
+
+    /**
+     * 外迁详细地址  迁出类型为out时必填
+     */
+    private String xxdz;
+
+    /**
+     * 迁出类型 迁出客户外out 迁出客户内in
+     */
+    private String submitType;
+
+    /**
+     * 迁出原因
+     */
+    private String deleteReason;
+
+    /**
+     * 组织id
+     */
+    private String agencyId;
+
+    /**
+     * 组织的pids
+     */
+    private String pids;
+
+    /**
+     * 房屋ID
+     */
+    private String houseId;
+
+    /**
+     * 名字
+     */
+    private String allName;
+
+    /**
+     * 姓
+     */
+    private String surname;
+
+    /**
+     * 名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 性别
+     */
+    private String gender;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 出生日期
+     */
+    private String birthday;
+
+    /**
+     * 户籍所在地
+     */
+    private String hjszd;
+
+    /**
+     * 现居住地
+     */
+    private String xjzd;
+
+    /**
+     * 民族
+     */
+    private String mz;
+
+    /**
+     * 与户主关系
+     */
+    private String yhzgx;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeInfoResultDTO.java

@@ -16,6 +16,7 @@ public class HomeInfoResultDTO implements Serializable {
 
     private static final long serialVersionUID = -6109420020924607393L;
     private String icResiUserId;
+    private String houseId;
     private String houseName;
     private String houseCode;
     private String qrCodeUrl;

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -806,4 +806,7 @@ public interface EpmetUserOpenFeignClient {
 
     @PostMapping("/epmetuser/icVolunteerPoly/volunteerDataExtraction/{customerId}")
     Result volunteerDataExtraction(@PathVariable("customerId") String customerId);
+
+    @PostMapping("/epmetuser/myHome/homeInfo")
+    Result<HomeInfoResultDTO> getHomeInfo();
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -595,4 +595,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "volunteerDataExtraction", customerId);
     }
 
+    @Override
+    public Result<HomeInfoResultDTO> getHomeInfo() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getHomeInfo");
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java

@@ -11,6 +11,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcResiUserConfirmDTO;
 import com.epmet.dto.form.IcResiUserConfirmGetDTO;
 import com.epmet.dto.form.IcResiUserConfirmSubmitDTO;
+import com.epmet.dto.form.MoveOutMemberFormDTO;
 import com.epmet.dto.form.RegisterAndBindFormDTO;
 import com.epmet.dto.result.HomeInfoResultDTO;
 import com.epmet.dto.result.HomeUserBriefResultDTO;
@@ -80,15 +81,16 @@ public class MyHomeController {
 //        return icResiUserConfirmService.editMember(dto);
 //    }
 //
+
     /**
-    * @describe: 删除家庭成员
-    * @author wangtong
-    * @date 2022/6/1 16:10
-    * @params [dto]
-    * @return com.epmet.commons.tools.utils.Result
-    */
+     * @return com.epmet.commons.tools.utils.Result
+     * @describe: 删除家庭成员
+     * @author wangtong
+     * @date 2022/6/1 16:10
+     * @params [dto]
+     */
     @PostMapping("delMember")
-    public Result delMember(@RequestBody IcResiUserConfirmSubmitDTO dto){
+    public Result delMember(@RequestBody IcResiUserConfirmSubmitDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         dto.setSubmitType(HomeMemberOperationEnum.DELETE.getCode());
@@ -96,44 +98,59 @@ public class MyHomeController {
     }
 
     /**
+     * @return com.epmet.commons.tools.utils.Result
      * @describe: 新增家庭成员
      * @author wangtong
      * @date 2022/6/1 15:50
      * @params [dto]
-     * @return com.epmet.commons.tools.utils.Result
      */
     @PostMapping("addMember")
-    public Result addMember(@RequestBody IcResiUserConfirmSubmitDTO dto){
+    public Result addMember(@RequestBody IcResiUserConfirmSubmitDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         return icResiUserService.addMember(dto);
     }
 
     /**
+     * @describe: 工作端-新增家庭成员
+     * @author wangtong
+     * @date 2022/6/1 15:50
+     * @params [dto]
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("addWorkMember")
+    public Result addWorkMember(@LoginUser TokenDto tokenDto,@RequestBody IcResiUserConfirmSubmitDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        dto.setCustomerId(tokenDto.getCustomerId());
+        dto.setStaffId(tokenDto.getUserId());
+        return icResiUserService.addWorkMember(dto);
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
      * @describe: 修改家庭成员
      * @author wangtong
      * @date 2022/6/1 15:27
      * @params [dto]
-     * @return com.epmet.commons.tools.utils.Result
      */
     @PostMapping("editMember")
-    public Result editMember(@RequestBody IcResiUserConfirmSubmitDTO dto){
+    public Result editMember(@RequestBody IcResiUserConfirmSubmitDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         return icResiUserService.editMember(dto);
     }
 
 
-
     /**
-    * @describe: 查询家庭成员信息
-    * @author wangtong
-    * @date 2022/6/1 16:14
-    * @params [dto]
-    * @return com.epmet.commons.tools.utils.Result
-    */
+     * @return com.epmet.commons.tools.utils.Result
+     * @describe: 查询家庭成员信息
+     * @author wangtong
+     * @date 2022/6/1 16:14
+     * @params [dto]
+     */
     @PostMapping("getMemberDetail")
-    public Result<IcResiUserConfirmDTO> getMemberDetail(@RequestBody IcResiUserConfirmGetDTO dto){
+    public Result<IcResiUserConfirmDTO> getMemberDetail(@RequestBody IcResiUserConfirmGetDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         return icResiUserConfirmService.getMemberDetail(dto);
@@ -161,4 +178,21 @@ public class MyHomeController {
         HomeInfoResultDTO result = myHomeService.getHomeInfo(tokenDto);
         return new Result<HomeInfoResultDTO>().ok(result);
     }
+
+    /**
+     * 【我的家庭】迁出家庭成员
+     *
+     * @param form
+     * @param tokenDto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/10 11:06
+     */
+    @PostMapping("/moveOutMember")
+    public Result moveOutMember(@RequestBody MoveOutMemberFormDTO form, @LoginUser TokenDto tokenDto) {
+        form.setCustomerId(tokenDto.getCustomerId());
+        icResiUserConfirmService.moveOutMember(form);
+        return new Result();
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserConfirmDao.java

@@ -15,11 +15,37 @@ import org.apache.ibatis.annotations.Param;
 public interface IcResiUserConfirmDao extends BaseDao<IcResiUserConfirmEntity> {
 
     /**
-    * @describe: 根据icResiUserId查询
-    * @author wangtong
-    * @date 2022/6/1 16:01
-    * @params [icResiUserId]
-    * @return com.epmet.entity.IcResiUserConfirmEntity
-    */
+     * @return com.epmet.entity.IcResiUserConfirmEntity
+     * @describe: 根据icResiUserId查询
+     * @author wangtong
+     * @date 2022/6/1 16:01
+     * @params [icResiUserId]
+     */
     IcResiUserConfirmEntity selectByIcResiUserId(@Param("icResiUserId") String icResiUserId);
+
+    /**
+     * 【我的家庭】迁出家庭成员 根据身份证号查询是否已提交
+     *
+     * @param idCard
+     * @param customerId
+     * @param submitType
+     * @return int
+     * @author LZN
+     * @date 2022/6/10 11:04
+     */
+    int selectByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId,
+                       @Param("submitType") String submitType);
+
+    /**
+     * 【我的家庭】迁出家庭成员 先删后添
+     *
+     * @param idCard
+     * @param customerId
+     * @param submitType
+     * @return void
+     * @author LZN
+     * @date 2022/6/10 11:04
+     */
+    void deleteByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId,
+                        @Param("submitType") String submitType);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -23,6 +23,7 @@ import com.epmet.dto.IcResiUserConfirmDTO;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.IcVolunteerPolyDTO;
 import com.epmet.dto.form.EpidemicPreventionFormDTO;
+import com.epmet.dto.form.MoveOutMemberFormDTO;
 import com.epmet.dto.form.RentTenantDataFormDTO;
 import com.epmet.dto.form.ResiUserQueryValueDTO;
 import com.epmet.dto.result.*;
@@ -72,7 +73,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                 @Param("staffOrgPath") String staffOrgPath,
                                                 @Param("resultTableName") String resultTableName,
                                                 @Param("keyword") String keyword,
-                                                @Param("groupByTables")Set<String> groupByTables);
+                                                @Param("groupByTables") Set<String> groupByTables);
 
     /**
      * 查询主表
@@ -138,10 +139,10 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      */
     List<SearchByNameResultDTO> searchByName(@Param("name") String name,
                                              @Param("columnName") String columnName,
-                                             @Param("level")String level,
-                                             @Param("id")String id,
+                                             @Param("level") String level,
+                                             @Param("id") String id,
                                              @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);
 
@@ -169,11 +170,12 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     /**
      * desc:根据身份证号获取居民信息
+     *
      * @param idCard
      * @param customerId
      * @return
      */
-    IcResiUserDTO getResiUserByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId);
+    IcResiUserDTO getResiUserByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId);
 
     /**
      * @param agencyId
@@ -280,7 +282,8 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      */
     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);
-    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查询房屋下是否有存在居民的
@@ -311,6 +314,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     /**
      * desc:根据维度获取居民信息表的数据[正常状态的居民]
+     *
      * @param formDTO
      * @return
      */
@@ -325,10 +329,11 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      */
     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
      * @Return {@link List< IcVolunteerPolyDTO>}
      * @Author zhaoqifeng
@@ -337,11 +342,32 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     List<IcVolunteerPolyDTO> getVolunteerList(@Param("customerId") String customerId, @Param("userId") String userId);
 
     /**
-    * @describe: 查询家庭成员信息
+     * @return com.epmet.dto.IcResiUserConfirmDTO
+     * @describe: 查询家庭成员信息
+     * @author wangtong
+     * @date 2022/6/1 16:16
+     * @params [icResiUserId]
+     */
+    IcResiUserConfirmDTO selectMemberDetail(@Param("icResiUserId") String icResiUserId);
+
+    /**
+     * 【我的家庭】迁出家庭成员 查询缺失字段
+     *
+     * @param icResiUserId
+     * @param customerId
+     * @return com.epmet.dto.form.MoveOutMemberFormDTO
+     * @author LZN
+     * @date 2022/6/10 11:03
+     */
+    MoveOutMemberFormDTO moveOutMember(@Param("icResiUserId") String icResiUserId,
+                                       @Param("customerId") String customerId);
+
+    /**
+    * @describe: 通过身份证号查询实体类
     * @author wangtong
-    * @date 2022/6/1 16:16
-    * @params [icResiUserId]
-    * @return com.epmet.dto.IcResiUserConfirmDTO
+    * @date 2022/6/13 17:32
+    * @params [idCard, customerId]
+    * @return com.epmet.entity.IcResiUserEntity
     */
-    IcResiUserConfirmDTO selectMemberDetail(@Param("icResiUserId") String icResiUserId);
+    IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard,@Param("customerId")  String customerId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcResiUserConfirmDTO;
 import com.epmet.dto.form.IcResiUserConfirmGetDTO;
 import com.epmet.dto.form.IcResiUserConfirmSubmitDTO;
+import com.epmet.dto.form.MoveOutMemberFormDTO;
 import com.epmet.entity.IcResiUserConfirmEntity;
 
 import java.util.List;
@@ -80,39 +81,39 @@ public interface IcResiUserConfirmService extends BaseService<IcResiUserConfirmE
     void delete(String[] ids);
 
     /**
-    * @describe: 新增家庭成员
-    * @author wangtong
-    * @date 2022/6/1 15:30
-    * @params [dto]
-    * @return com.epmet.commons.tools.utils.Result
-    */
+     * @return com.epmet.commons.tools.utils.Result
+     * @describe: 新增家庭成员
+     * @author wangtong
+     * @date 2022/6/1 15:30
+     * @params [dto]
+     */
     Result editMember(IcResiUserConfirmSubmitDTO dto);
 
     /**
-    * @describe: 新增家庭成员
-    * @author wangtong
-    * @date 2022/6/1 15:50
-    * @params [dto]
-    * @return com.epmet.commons.tools.utils.Result
-    */
+     * @return com.epmet.commons.tools.utils.Result
+     * @describe: 新增家庭成员
+     * @author wangtong
+     * @date 2022/6/1 15:50
+     * @params [dto]
+     */
     Result addMember(IcResiUserConfirmSubmitDTO dto);
 
     /**
-    * @describe: 删除家庭成员
-    * @author wangtong
-    * @date 2022/6/1 16:11
-    * @params [dto]
-    * @return com.epmet.commons.tools.utils.Result
-    */
+     * @return com.epmet.commons.tools.utils.Result
+     * @describe: 删除家庭成员
+     * @author wangtong
+     * @date 2022/6/1 16:11
+     * @params [dto]
+     */
     Result delMember(IcResiUserConfirmSubmitDTO dto);
 
     /**
-    * @describe: 查询家庭成员信息
-    * @author wangtong
-    * @date 2022/6/1 16:15
-    * @params [dto]
-    * @return com.epmet.commons.tools.utils.Result
-    */
+     * @return com.epmet.commons.tools.utils.Result
+     * @describe: 查询家庭成员信息
+     * @author wangtong
+     * @date 2022/6/1 16:15
+     * @params [dto]
+     */
     Result<IcResiUserConfirmDTO> getMemberDetail(IcResiUserConfirmGetDTO dto);
 
     /**
@@ -124,4 +125,14 @@ public interface IcResiUserConfirmService extends BaseService<IcResiUserConfirmE
      * @Date 2022/6/1 17:27
      */
     void confirm(IcResiUserConfirmDTO dto);
+
+    /**
+     * 【我的家庭】迁出家庭成员
+     *
+     * @param form
+     * @return void
+     * @author LZN
+     * @date 2022/6/10 11:06
+     */
+    void moveOutMember(MoveOutMemberFormDTO form);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -405,4 +405,13 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @params [dto]
      */
     Result editMember(IcResiUserConfirmSubmitDTO dto);
+
+    /**
+    * @describe: 工作端-新增家庭成员
+    * @author wangtong
+    * @date 2022/6/10 13:32
+    * @params [dto]
+    * @return com.epmet.commons.tools.utils.Result
+    */
+    Result addWorkMember(IcResiUserConfirmSubmitDTO dto);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java

@@ -13,6 +13,7 @@ import com.epmet.dao.IcResiUserDao;
 import com.epmet.dto.IcResiUserConfirmDTO;
 import com.epmet.dto.form.IcResiUserConfirmGetDTO;
 import com.epmet.dto.form.IcResiUserConfirmSubmitDTO;
+import com.epmet.dto.form.MoveOutMemberFormDTO;
 import com.epmet.entity.IcResiUserConfirmEntity;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.redis.IcResiUserConfirmRedis;
@@ -41,6 +42,9 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
     @Autowired
     private IcResiUserDao icResiUserDao;
 
+    @Autowired
+    private IcResiUserConfirmDao icResiUserConfirmDao;
+
     @Override
     public PageData<IcResiUserConfirmDTO> page(Map<String, Object> params) {
         IPage<IcResiUserConfirmEntity> page = baseDao.selectPage(
@@ -175,4 +179,24 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
         }
     }
 
+    /**
+     * 【我的家庭】迁出家庭成员
+     *
+     * @param form
+     * @return void
+     * @author LZN
+     * @date 2022/6/10 11:03
+     */
+    @Override
+    public void moveOutMember(MoveOutMemberFormDTO form) {
+        form = icResiUserDao.moveOutMember(form.getIcResiUserId(), form.getCustomerId());
+        form.setSurname(form.getAllName().substring(0, 1));
+        form.setName(form.getAllName().substring(1));
+        if (icResiUserConfirmDao.selectByIdCard(form.getIdCard(), form.getCustomerId(), form.getSubmitType()) > 0) {
+            icResiUserConfirmDao.deleteByIdCard(form.getIdCard(), form.getCustomerId(), form.getSubmitType());
+        }
+        IcResiUserConfirmEntity entity = ConvertUtils.sourceToTarget(form, IcResiUserConfirmEntity.class);
+        icResiUserConfirmDao.insert(entity);
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -72,6 +72,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Path;
+import java.time.DateTimeException;
 import java.time.LocalDate;
 import java.time.Period;
 import java.util.*;
@@ -647,7 +648,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         }
 
         // 出生日期 & 年龄
-        LocalDate birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day));
+        LocalDate birthday = null;
+        try {
+            birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day));
+        } catch (DateTimeException e) {
+            throw new EpmetException("身份证号中日期信息错误");
+        }
         int age = Period.between(birthday, LocalDate.now()).getYears();
 
         // 性别 & 生日 & 老年人
@@ -816,7 +822,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     private LinkedHashMap<String, String> removeNeedlessColumns(LinkedHashMap<String, String> originColumnAndValues) {
         List<String> needlessColumns = Arrays.asList("GRID_ID", "VILLAGE_ID", "BUILD_ID", "UNIT_ID", "HOME_ID",
                 "IS_BDHJ", "NAME", "MOBILE", "GENDER", "ID_CARD",
-                "BIRTHDAY", "CONTACTS", "CONTACTS_MOBILE");
+                "BIRTHDAY", "CONTACTS", "CONTACTS_MOBILE", "REMARKS");
 
         LinkedHashMap<String, String> newMap = new LinkedHashMap();
 
@@ -910,7 +916,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     Map<String, String> itemOptions = columnWrapper.getOptions();
                     String colValue = itemOptions.get(cellContent);
                     columnWrapper.setColValue(colValue);
-                } else {
+                } else if (StringUtils.isNotBlank(cellContent)) {
                     String fullUri = columnWrapper.getOptionSourceValue();
                     String[] uriParts = splitOptionSourceUrl(fullUri);
                     String pureUri = uriParts[0];

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -2358,6 +2358,96 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return new Result().ok("修改成功");
     }
 
+    @Override
+    public Result addWorkMember(IcResiUserConfirmSubmitDTO dto) {
+        if(StringUtils.isBlank(dto.getHouseCode())){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "房屋编码不可为空", "房屋编码不可为空");
+        }
+        CommonHouseFormDTO formDto = new CommonHouseFormDTO();
+        formDto.setHouseCode(dto.getHouseCode());
+        Result<HouseInfoResultDTO> houseResult = govOrgOpenFeignClient.getHomeInfoByHouseCode(formDto);
+        if (!houseResult.success() || null == houseResult || null == houseResult.getData()) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询房屋信息失败", "查询房屋信息失败");
+        }
+        HouseInfoResultDTO houseInfo = houseResult.getData();
+
+        //这个房屋下已经设置了户主后，再次选择户主时提示提示“房屋下已存在户主” PS.户主指与户主关系是本人的用户
+        if (RelationshipEnum.SELF.getCode().equals(dto.getYhzgx())) {
+            LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(IcResiUserEntity::getHomeId, houseInfo.getHouseId());
+            wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode());
+            List<IcResiUserEntity> entityList = baseDao.selectList(wrapper);
+            if (CollectionUtils.isNotEmpty(entityList)) {
+                String errorMsg = "房屋下已存在户主";
+                throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg);
+            }
+        }
+
+        dto.setCustomerId(houseInfo.getCustomerId());
+        dto.setAgencyId(houseInfo.getAgencyId());
+        dto.setPids(houseInfo.getAgencyPids());
+        dto.setGridId(houseInfo.getGridId());
+        dto.setVillageId(houseInfo.getNeighborHoodId());
+        dto.setBuildId(houseInfo.getBuildingId());
+        dto.setUnitId(houseInfo.getBuildingUnitId());
+        dto.setHomeId(houseInfo.getHouseId());
+
+        IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(dto.getIdCard(), houseInfo.getCustomerId());
+        if (null != userDTO && null != userDTO.getIdCard()) {
+            //覆盖原有的家庭成员信息,并且添加成员变更记录
+            return updateOldMemberInfo(houseInfo.getCustomerId(),dto);
+        }
+
+        IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
+        insert(entity);
+
+        return new Result().ok("新增成功");
+    }
+
+    private Result updateOldMemberInfo(String customerId, IcResiUserConfirmSubmitDTO dto) {
+        IcResiUserEntity userEntity = baseDao.selectResiUserEntityByIdCard(dto.getIdCard(), customerId);
+        //在添加调动记录的时候调整
+        userEntity.setCustomerId(dto.getCustomerId());
+        userEntity.setAgencyId(dto.getAgencyId());
+        userEntity.setPids(dto.getPids());
+        userEntity.setGridId(dto.getGridId());
+        userEntity.setVillageId(dto.getVillageId());
+        userEntity.setBuildId(dto.getBuildId());
+        userEntity.setUnitId(dto.getUnitId());
+        userEntity.setHomeId(dto.getHomeId());
+
+        userEntity.setName(dto.getName());
+        userEntity.setIdCard(dto.getIdCard());
+        userEntity.setMobile(dto.getMobile());
+        userEntity.setBirthday(dto.getBirthday());
+        userEntity.setGender(dto.getGender());
+        userEntity.setMz(dto.getMz());
+        userEntity.setYhzgx(dto.getYhzgx());
+        userEntity.setHjszd(dto.getHjszd());
+        userEntity.setXjzd(dto.getXjzd());
+        userEntity.setUpdatedTime(new java.util.Date());
+        //添加人员调动记录
+        IcResiUserTransferFormDTO formDTO = new IcResiUserTransferFormDTO();
+        formDTO.setCustomerId(customerId);
+        formDTO.setStaffId(dto.getStaffId());
+        formDTO.setIcUserId(userEntity.getId());
+        formDTO.setType("in");//客户内
+        formDTO.setNewAgencyId(dto.getAgencyId());
+        formDTO.setNewGridId(dto.getGridId());
+        formDTO.setNewNeighborHoodId(dto.getVillageId());
+        formDTO.setNewBuildingId(dto.getBuildId());
+        formDTO.setNewBuildingUnitId(dto.getUnitId());
+        formDTO.setNewHouseId(dto.getHomeId());
+        formDTO.setTransferTime(new java.util.Date());
+        formDTO.setRemark("更换房屋");
+        formDTO.setReason("更换房屋");
+        formDTO.setOrigin(IcResiUserConstant.CHANGE);
+        icUserTransferRecordService.add(formDTO);
+        //更新家庭成员信息
+        baseDao.updateById(userEntity);
+        return new Result().ok("新增成功");
+    }
+
     /**
      * 根据身份证获取居民角色（目前只有是否是志愿者）
      *

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java

@@ -183,6 +183,7 @@ public class MyHomeServiceImpl implements MyHomeService {
         if (null == houseInfo) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
         }
+        resultDto.setHouseId(houseInfo.getHomeId());
         resultDto.setHouseName(houseInfo.getAllName());
         resultDto.setHouseCode(houseInfo.getHouseCode());
         resultDto.setQrCodeUrl(houseInfo.getHouseQrcodeUrl());

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml

@@ -34,11 +34,31 @@
         <result property="deleteReason" column="DELETE_REASON"/>
         <result property="operationDescribe" column="OPERATION_DESCRIBE"/>
     </resultMap>
+    <delete id="deleteByIdCard">
+        delete from ic_resi_user_confirm
+        where
+            id_card = #{idCard}
+        AND customer_id = #{customerId}
+        AND CONFIRM_RESULT = '0'
+        AND SUBMIT_TYPE = #{submitType}
+    </delete>
     <select id="selectByIcResiUserId" resultType="com.epmet.entity.IcResiUserConfirmEntity">
         select * from ic_resi_user_confirm
         where IC_RESI_USER_ID=#{icResiUserId}
               and del_flag='0'
     </select>
+    <select id="selectByIdCard" resultType="java.lang.Integer">
+        SELECT
+            count(*)
+        FROM
+            ic_resi_user_confirm
+        WHERE
+            ID_CARD = #{idCard}
+            AND CUSTOMER_ID = #{customerId}
+            AND del_flag = '0'
+            AND CONFIRM_RESULT = '0'
+            AND SUBMIT_TYPE = #{submitType}
+    </select>
 
 
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -1094,5 +1094,32 @@
     where DEL_FLAG='0'
 		  and id=#{icResiUserId}
     </select>
-
+    <select id="moveOutMember" resultType="com.epmet.dto.form.MoveOutMemberFormDTO">
+        SELECT
+            AGENCY_ID,
+            PIDS,
+            HOME_ID,
+            NAME as allName,
+            MOBILE,
+            GENDER,
+            ID_CARD,
+            BIRTHDAY,
+            HJSZD,
+            XJZD,
+            mz,
+            YHZGX
+        FROM
+            ic_resi_user
+        WHERE
+            id = #{icResiUserId}
+            AND customer_id = #{customerId}
+            AND DEL_FLAG = '0'
+    </select>
+    <select id="selectResiUserEntityByIdCard" resultType="com.epmet.entity.IcResiUserEntity">
+        select * from ic_resi_user
+        WHERE
+            ID_CARD = #{idCard}
+            AND customer_id = #{customerId}
+            AND DEL_FLAG = '0'
+    </select>
 </mapper>