Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java

@@ -31,7 +31,7 @@ public class IcPartyMemberDTO implements Serializable {
      * 党组织的所有上级ID,没有上级时为0
      */
 	private String orgPids;
-
+    private String orgName;
     /**
      * 行政组织 机关ID
      */
@@ -91,7 +91,7 @@ public class IcPartyMemberDTO implements Serializable {
      * 职务
      */
 	private String partyZw;
-
+    private String postName;
     /**
      * 是否退休
      */
@@ -111,7 +111,12 @@ public class IcPartyMemberDTO implements Serializable {
      * 文化程度【字典表】
      */
 	private String culture;
-
+    private String cultureName;
+    /**
+     * 志愿者类型,逗号隔开
+     */
+    private String volunteerCategory;
+    private String volunteerCategoryName;
     /**
      * 备注
      */

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

@@ -0,0 +1,81 @@
+package com.epmet.modules.partymember.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+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.resi.partymember.dto.partymember.IcPartyMemberDTO;
+import com.epmet.modules.partymember.excel.IcPartyMemberExcel;
+import com.epmet.modules.partymember.service.IcPartyMemberService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 数字平台党员信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-17
+ */
+@RestController
+@RequestMapping("icPartyMember")
+public class IcPartyMemberController {
+
+    @Autowired
+    private IcPartyMemberService icPartyMemberService;
+
+    @RequestMapping("page")
+    public Result<PageData<IcPartyMemberDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcPartyMemberDTO> page = icPartyMemberService.page(params);
+        return new Result<PageData<IcPartyMemberDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<IcPartyMemberDTO> get(@PathVariable("id") String id){
+        IcPartyMemberDTO data = icPartyMemberService.get(id);
+        return new Result<IcPartyMemberDTO>().ok(data);
+    }
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result<String> save(@RequestBody IcPartyMemberDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        String id = icPartyMemberService.save(dto);
+        return new Result<String>().ok(id);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody IcPartyMemberDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icPartyMemberService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icPartyMemberService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcPartyMemberDTO> list = icPartyMemberService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcPartyMemberExcel.class);
+    }
+
+
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java

@@ -108,6 +108,11 @@ public class IcPartyMemberEntity extends BaseEpmetEntity {
      */
 	private String culture;
 
+	/**
+	 * 志愿者类型,逗号隔开
+	 */
+	private String volunteerCategory;
+
     /**
      * 备注
      */

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

@@ -2,7 +2,7 @@ package com.epmet.modules.partymember.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IcPartyMemberDTO;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 import com.epmet.modules.partymember.entity.IcPartyMemberEntity;
 
 import java.util.List;
@@ -54,7 +54,7 @@ public interface IcPartyMemberService extends BaseService<IcPartyMemberEntity> {
      * @author generator
      * @date 2022-05-17
      */
-    void save(IcPartyMemberDTO dto);
+    String save(IcPartyMemberDTO dto);
 
     /**
      * 默认更新

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

@@ -1,19 +1,27 @@
 package com.epmet.modules.partymember.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.dto.IcPartyMemberDTO;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity;
+import com.epmet.modules.partyOrg.service.IcPartyOrgService;
 import com.epmet.modules.partymember.dao.IcPartyMemberDao;
 import com.epmet.modules.partymember.entity.IcPartyMemberEntity;
 import com.epmet.modules.partymember.service.IcPartyMemberService;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 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;
@@ -27,6 +35,11 @@ import java.util.Map;
 @Service
 public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao, IcPartyMemberEntity> implements IcPartyMemberService {
 
+    @Resource
+    private IcPartyOrgService icPartyOrgService;
+    @Resource
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
     @Override
     public PageData<IcPartyMemberDTO> page(Map<String, Object> params) {
         IPage<IcPartyMemberEntity> page = baseDao.selectPage(
@@ -55,19 +68,78 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
     @Override
     public IcPartyMemberDTO get(String id) {
         IcPartyMemberEntity entity = baseDao.selectById(id);
+        //党组织名
+        //职务
+        //文化程度
+        //志愿者类别
         return ConvertUtils.sourceToTarget(entity, IcPartyMemberDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(IcPartyMemberDTO dto) {
+    public String save(IcPartyMemberDTO dto) {
+        //获取党组织信息
+        IcPartyOrgEntity org = icPartyOrgService.selectById(dto.getSszb());
+        dto.setCustomerId(org.getCustomerId());
+        dto.setAgencyId(org.getAgencyId());
+        dto.setAgencyPids(org.getAgencyPids());
+        dto.setOrgPids(org.getOrgPids());
+
+        //判断党员是否已存在
+        LambdaQueryWrapper<IcPartyMemberEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcPartyMemberEntity::getCustomerId, org.getCustomerId());
+        wrapper.eq(IcPartyMemberEntity::getIdCard, dto.getIdCard());
+        IcPartyMemberEntity partyMember = baseDao.selectOne(wrapper);
+        if (null != partyMember) {
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "党员已存在", "党员已存在");
+        }
+
+        //同步ic_resi_user表对应的数据,并获取志愿者类型
+        Result<IcPartyMemberDTO> result =  epmetUserOpenFeignClient.icPartyMemberSync(dto);
+        if (!result.success()) {
+            throw new EpmetException(result.getCode(), result.getMsg(), result.getMsg());
+        }
+        if (null != result.getData()) {
+            dto.setIcResiUser(result.getData().getIcResiUser());
+            dto.setVolunteerCategory(result.getData().getVolunteerCategory());
+        }
         IcPartyMemberEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberEntity.class);
+
         insert(entity);
+
+        return entity.getId();
+
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(IcPartyMemberDTO dto) {
+        //获取党组织信息
+        IcPartyOrgEntity org = icPartyOrgService.selectById(dto.getSszb());
+        dto.setAgencyId(org.getAgencyId());
+        dto.setAgencyPids(org.getAgencyPids());
+        dto.setOrgPids(org.getOrgPids());
+
+        //判断党员是否已存在
+        LambdaQueryWrapper<IcPartyMemberEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcPartyMemberEntity::getCustomerId, org.getCustomerId());
+        wrapper.eq(IcPartyMemberEntity::getIdCard, dto.getIdCard());
+        IcPartyMemberEntity partyMember = baseDao.selectOne(wrapper);
+        if (null != partyMember && !partyMember.getId().equals(dto.getId())) {
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "党员已存在", "党员已存在");
+        }
+
+        //同步ic_resi_user表对应的数据,并获取志愿者类型
+        Result<IcPartyMemberDTO> result =  epmetUserOpenFeignClient.icPartyMemberSync(dto);
+        if (!result.success()) {
+            throw new EpmetException(result.getCode(), result.getMsg(), result.getMsg());
+        }
+
+        if (null != result.getData()) {
+            dto.setIcResiUser(result.getData().getIcResiUser());
+            dto.setVolunteerCategory(result.getData().getVolunteerCategory());
+        }
+
         IcPartyMemberEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberEntity.class);
         updateById(entity);
     }

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

@@ -0,0 +1,115 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/5/17 18:13
+ */
+@Data
+public class IcPartyMemberSyncDTO implements Serializable {
+    private static final long serialVersionUID = 663543282690909994L;
+
+    /**
+     * 客户Id customer.id
+     */
+    private String customerId;
+
+    /**
+     * 党组织的所有上级ID,没有上级时为0
+     */
+    private String orgPids;
+
+    /**
+     * 行政组织 机关ID
+     */
+    private String agencyId;
+
+    /**
+     * 行政组织 机关ID
+     */
+    private String agencyPids;
+
+    /**
+     * 对应的ic_resi_user主表Id
+     */
+    private String icResiUser;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 入党时间
+     */
+    private String rdsj;
+
+    /**
+     * 所属支部
+     */
+    private String sszb;
+
+    /**
+     * 是否流动党员
+     */
+    private String isLd;
+
+    /**
+     * 流动党员活动证号
+     */
+    private String ldzh;
+
+    /**
+     * 职务
+     */
+    private String partyZw;
+
+    /**
+     * 是否退休
+     */
+    private String isTx;
+
+    /**
+     * 是否党员中心户
+     */
+    private String isDyzxh;
+
+    /**
+     * 是否免学习0否,1是
+     */
+    private String isMxx;
+
+    /**
+     * 文化程度【字典表】
+     */
+    private String culture;
+
+    /**
+     * 志愿者类型,逗号隔开
+     */
+    private String volunteerCategory;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -9,6 +9,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.EpmetUserOpenFeignClientFallbackFactory;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -748,4 +749,7 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/icresiuser/getResiUserGroupHomeId")
     Result<List<HouseIcResiUserResultDTO>> getHouseMemberList(@RequestBody RentTenantDataFormDTO formDTO);
+
+    @PostMapping("/epmetuser/icresiuser/icPartyMemberSync")
+    Result<com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO> icPartyMemberSync(@RequestBody IcPartyMemberDTO formDTO);
 }

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

@@ -9,6 +9,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -548,4 +549,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getHouseMemberList", formDTO);
     }
 
+    @Override
+    public Result<IcPartyMemberDTO> icPartyMemberSync(IcPartyMemberDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "icPartyMemberSync", formDTO);
+    }
+
 }

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

@@ -59,6 +59,7 @@ import com.epmet.excel.support.ExportResiUserItemDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 import com.epmet.service.IcResiUserExportService;
 import com.epmet.service.IcResiUserImportService;
 import com.epmet.service.IcResiUserService;
@@ -1037,4 +1038,17 @@ public class IcResiUserController implements ResultDataResolver {
     Result<List<HouseIcResiUserResultDTO>> getResiUserGroupHomeId(@RequestBody RentTenantDataFormDTO formDTO) {
         return new Result().ok(icResiUserService.getResiUserGroupHomeId(formDTO));
     }
+
+    /**
+     * 党员信息同步
+     *
+     * @Param formDTO
+     * @Return {@link Result<IcPartyMemberDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/5/17 19:14
+     */
+    @PostMapping("icPartyMemberSync")
+    public Result<IcPartyMemberDTO> icPartyMemberSync(@RequestBody IcPartyMemberDTO formDTO) {
+        return new Result<IcPartyMemberDTO>().ok(icResiUserService.icPartyMemberSync(formDTO));
+    }
 }

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

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcPartyMemberEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 党员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-17
+ */
+@Mapper
+public interface IcPartyMemberDao extends BaseDao<IcPartyMemberEntity> {
+	
+}

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

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcVolunteerEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 志愿者
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-17
+ */
+@Mapper
+public interface IcVolunteerDao extends BaseDao<IcVolunteerEntity> {
+	
+}

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

@@ -26,6 +26,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.excel.support.ExportResiUserItemDTO;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -334,4 +335,15 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @return
      */
     List<HouseIcResiUserResultDTO> getResiUserGroupHomeId(RentTenantDataFormDTO formDTO);
+
+
+    /**
+     * 党员信息同步
+     *
+     * @Param formDTO
+     * @Return {@link IcPartyMemberDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/5/17 19:12
+     */
+    IcPartyMemberDTO icPartyMemberSync(IcPartyMemberDTO formDTO);
 }

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

@@ -48,15 +48,15 @@ import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.constant.IcPlatformConstant;
 import com.epmet.constant.IcResiUserConstant;
 import com.epmet.constant.UserConstant;
+import com.epmet.dao.IcPartyMemberDao;
 import com.epmet.dao.IcResiUserDao;
+import com.epmet.dao.IcVolunteerDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.dto.result.demand.IcResiDemandDictDTO;
-import com.epmet.entity.IcResiUserEntity;
+import com.epmet.entity.*;
-import com.epmet.entity.IcUserChangeDetailedEntity;
-import com.epmet.entity.IcUserChangeRecordEntity;
 import com.epmet.excel.support.ExportResiUserItemDTO;
 import com.epmet.feign.*;
 import com.epmet.service.*;
@@ -133,6 +133,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     //private IcVaccineService icVaccineService;
     @Resource
     private IcTripReportRecordService icTripReportRecordService;
+    @Resource
+    private IcPartyMemberDao icPartyMemberDao;
+    @Resource
+    private IcVolunteerDao icVolunteerDao;
 
     private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
@@ -1910,6 +1914,101 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return listPage.getResult();
     }
 
+    /**
+     * 党员信息同步
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link IcPartyMemberDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/5/17 19:12
+     */
+    @Override
+    public com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO icPartyMemberSync(com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO formDTO) {
+        com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO dto = new com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO();
+        if (StringUtils.isNotEmpty(formDTO.getIcResiUser())) {
+            //获取居民信息
+            IcResiUserEntity user = baseDao.selectById(formDTO.getIcResiUser());
+            //居民信息不存在时返回
+            if(null == user) {
+                return dto;
+            }
+            if (!user.getIdCard().equals(dto.getIdCard())) {
+                LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(IcResiUserEntity::getCustomerId, formDTO.getCustomerId());
+                wrapper.eq(IcResiUserEntity::getIdCard, formDTO.getIdCard());
+                user = baseDao.selectOne(wrapper);
+                if(null == user) {
+                    return dto;
+                }
+            }
+            dto.setIcResiUser(user.getId());
+            //更新居民信息并将是否是党员字段设为1
+            user.setName(formDTO.getName());
+            user.setMobile(formDTO.getMobile());
+            user.setIsParty(NumConstant.ONE_STR);
+            user.setUpdatedBy(null);
+            user.setUpdatedTime(null);
+            baseDao.updateById(user);
+
+            //判断是否有党员信息，没有则新增一条，有的话就更新
+            LambdaQueryWrapper<IcPartyMemberEntity> partyWrapper = new LambdaQueryWrapper<>();
+            partyWrapper.eq(IcPartyMemberEntity::getIcResiUser, formDTO.getIcResiUser());
+            IcPartyMemberEntity partyMember = icPartyMemberDao.selectOne(partyWrapper);
+            if (null == partyMember) {
+                partyMember = ConvertUtils.sourceToTarget(formDTO, IcPartyMemberEntity.class);
+                icPartyMemberDao.insert(partyMember);
+            } else {
+                IcPartyMemberEntity partyMemberEntity = ConvertUtils.sourceToTarget(formDTO, IcPartyMemberEntity.class);
+                partyMemberEntity.setId(partyMember.getId());
+                icPartyMemberDao.updateById(partyMemberEntity);
+            }
+
+        } else {
+            //获取居民信息
+            LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(IcResiUserEntity::getCustomerId, formDTO.getCustomerId());
+            wrapper.eq(IcResiUserEntity::getIdCard, formDTO.getIdCard());
+            IcResiUserEntity user = baseDao.selectOne(wrapper);
+            //居民信息不存在时返回
+            if(null == user) {
+                return dto;
+            }
+            dto.setIcResiUser(user.getId());
+
+            //更新居民信息并将是否是党员字段设为1
+            user.setName(formDTO.getName());
+            user.setMobile(formDTO.getMobile());
+            user.setIsParty(NumConstant.ONE_STR);
+            user.setUpdatedBy(null);
+            user.setUpdatedTime(null);
+            baseDao.updateById(user);
+        }
+
+
+        //判断是否有党员信息，没有则新增一条，有的话就更新
+        LambdaQueryWrapper<IcPartyMemberEntity> partyWrapper = new LambdaQueryWrapper<>();
+        partyWrapper.eq(IcPartyMemberEntity::getIcResiUser, dto.getIcResiUser());
+        IcPartyMemberEntity partyMember = icPartyMemberDao.selectOne(partyWrapper);
+        if (null == partyMember) {
+            partyMember = ConvertUtils.sourceToTarget(formDTO, IcPartyMemberEntity.class);
+            icPartyMemberDao.insert(partyMember);
+        } else {
+            IcPartyMemberEntity partyMemberEntity = ConvertUtils.sourceToTarget(formDTO, IcPartyMemberEntity.class);
+            partyMemberEntity.setId(partyMember.getId());
+            icPartyMemberDao.updateById(partyMemberEntity);
+        }
+        //获取志愿者类别
+        LambdaQueryWrapper<IcVolunteerEntity> volunteerWrapper = new LambdaQueryWrapper<>();
+        volunteerWrapper.eq(IcVolunteerEntity::getIcResiUser, dto.getIcResiUser());
+        IcVolunteerEntity volunteer = icVolunteerDao.selectOne(volunteerWrapper);
+        if (null != volunteer) {
+            dto.setVolunteerCategory(volunteer.getVolunteerCategory());
+        }
+
+        return dto;
+    }
+
     /**
      * desc:根据字段值获取 options
      * @param customerId

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

@@ -0,0 +1,32 @@
+<?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.IcPartyMemberDao">
+
+    <resultMap type="com.epmet.entity.IcPartyMemberEntity" id="icPartyMemberMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="icResiUser" column="IC_RESI_USER"/>
+        <result property="rdsj" column="RDSJ"/>
+        <result property="zzsj" column="ZZSJ"/>
+        <result property="sszb" column="SSZB"/>
+        <result property="isLd" column="IS_LD"/>
+        <result property="ldzh" column="LDZH"/>
+        <result property="partyZw" column="PARTY_ZW"/>
+        <result property="isTx" column="IS_TX"/>
+        <result property="isDyzxh" column="IS_DYZXH"/>
+        <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"/>
+        <result property="field1" column="FIELD1"/>
+        <result property="field2" column="FIELD2"/>
+        <result property="field3" column="FIELD3"/>
+        <result property="field4" column="FIELD4"/>
+        <result property="field5" column="FIELD5"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -965,7 +965,7 @@
             and VILLAGE_ID = #{neighborHoodId}
         </if>
          <if test="buildingId != null and buildingId.trim() != ''">
-            and BUILD_ID = #{neighborHoodId}
+            and BUILD_ID = #{buildingId}
         </if>
          <if test="houseId != null and houseId.trim() != ''">
             and HOME_ID = #{houseId}

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

@@ -0,0 +1,26 @@
+<?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.IcVolunteerDao">
+
+    <resultMap type="com.epmet.entity.IcVolunteerEntity" id="icVolunteerMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="icResiUser" column="IC_RESI_USER"/>
+        <result property="volunteerCategory" column="VOLUNTEER_CATEGORY"/>
+        <result property="volunteerRemark" column="VOLUNTEER_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"/>
+        <result property="field1" column="FIELD1"/>
+        <result property="field2" column="FIELD2"/>
+        <result property="field3" column="FIELD3"/>
+        <result property="field4" column="FIELD4"/>
+        <result property="field5" column="FIELD5"/>
+    </resultMap>
+
+
+</mapper>