工作端-新增家庭用户

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/result/HouseInfoResultDTO.java

@@ -27,6 +27,7 @@ public class HouseInfoResultDTO implements Serializable {
      * 所属行政组织
      */
     private String agencyId;
+    private String agencyPids;
     private String agencyName;
 
     /**

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

@@ -650,4 +650,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

@@ -420,4 +420,10 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<IcHouseDTO> getByHouseCode(String houseCode) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getByHouseCode", houseCode);
     }
+
+    @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/resources/mapper/IcHouseDao.xml

@@ -434,7 +434,8 @@
             a.OWNER_NAME,
             a.OWNER_PHONE,
             a.OWNER_ID_CARD,
-            a.REMARK
+            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'

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

@@ -207,4 +207,6 @@ public class IcResiUserConfirmSubmitDTO implements Serializable {
      */
     private String operationDescribe;
 
+    private String houseCode;
+
 }

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

@@ -111,6 +111,20 @@ public class MyHomeController {
         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(@RequestBody IcResiUserConfirmSubmitDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        return icResiUserService.addWorkMember(dto);
+    }
+
     /**
      * @return com.epmet.commons.tools.utils.Result
      * @describe: 修改家庭成员

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

@@ -393,4 +393,13 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
     * @return com.epmet.commons.tools.utils.Result
     */
     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/IcResiUserServiceImpl.java

@@ -2330,6 +2330,52 @@ 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();
+
+        IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(dto.getIdCard(), houseInfo.getCustomerId());
+        if (null != userDTO && null != userDTO.getIdCard()) {
+            String errorMsg = "新增居民信息失败，身份证号已存在!";
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+        }
+        //这个房屋下已经设置了户主后，再次选择户主时提示提示“房屋下已存在户主” 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());
+
+        IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
+        insert(entity);
+
+        return new Result().ok("新增成功");
+    }
+
     /**
      * desc:根据字段值获取 options
      * @param customerId