增加党员中心户审核功能；

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -430,6 +430,11 @@ public class ApiAppUserController {
         return appUserService.saveCentralHousehold(dto);
     }
 
+    @GetMapping("/centralhousehold/getByUserId")
+    public Result getByUserId(@LoginUser TokenDto tokenDto) {
+        return appUserService.getByUserId(tokenDto.getUserId());
+    }
+
     /**
      * 在职党员报道
      *

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -500,10 +500,12 @@ public interface UserFeignClient {
     @PostMapping("/app-user/intoparty/save")
     Result saveIntoparty(IntoPartyFormDTO dto);
 
-
     @PostMapping("/app-user/centralhousehold/save")
     Result saveCentralHouseholdApplyFor(CentralHouseholdApplyFor applyFor);
 
+    @GetMapping("/app-user/centralhousehold/{userId}")
+    Result<CentralHouseholdApplyFor> getByUserId(@PathVariable String userId);
+
     /**
      * 在职党员报到
      *

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -268,6 +268,11 @@ public class UserFeignClientFallback implements UserFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveCentralHousehold", applyFor);
     }
 
+    @Override
+    public Result<CentralHouseholdApplyFor> getByUserId(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getByUserId", userId);
+    }
+
     @Override
     public Result saveReportparty(ReportPartyDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveReportparty", dto);

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -403,4 +403,11 @@ public interface AppUserService {
      * @return
      */
     Result saveCentralHousehold(CentralHouseholdApplyFor dto);
+
+    /**
+     * 根据UserId获取党员中心户申请
+     * @param userId
+     * @return
+     */
+    Result<CentralHouseholdApplyFor> getByUserId(String userId);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -1635,8 +1635,8 @@ public class AppUserServiceImpl implements AppUserService {
 
         EpdcPartyMemberRegistDTO partyMemberRegistDTO = new EpdcPartyMemberRegistDTO();
         CityCenterFromDTO formDTO = new CityCenterFromDTO();
-        if(dto.getDeptId()!=null){
-            formDTO.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length-2]));
+        if (dto.getDeptId() != null) {
+            formDTO.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 2]));
             SysDeptDTO liveDept = adminFeignClient.getDeptInfo(formDTO).getData();
             partyMemberRegistDTO.setLiveAddress(liveDept.getAddress());
             partyMemberRegistDTO.setLiveCommunity(liveDept.getName());
@@ -1648,7 +1648,7 @@ public class AppUserServiceImpl implements AppUserService {
             partyMemberRegistDTO.setLiveLatitude(liveDept.getLatitude());
         }
         if (null != dto.getCouplingCommunity()) {
-            formDTO.setDeptId(Long.parseLong(dto.getCouplingCommunity()[dto.getCouplingCommunity().length-2]));
+            formDTO.setDeptId(Long.parseLong(dto.getCouplingCommunity()[dto.getCouplingCommunity().length - 2]));
             SysDeptDTO couplingDept = adminFeignClient.getDeptInfo(formDTO).getData();
             partyMemberRegistDTO.setCouplingAddress(couplingDept.getAddress());
             partyMemberRegistDTO.setCouplingCommunity(couplingDept.getName());
@@ -1674,6 +1674,11 @@ public class AppUserServiceImpl implements AppUserService {
         return userFeignClient.saveCentralHouseholdApplyFor(dto);
     }
 
+    @Override
+    public Result<CentralHouseholdApplyFor> getByUserId(String userId) {
+        return userFeignClient.getByUserId(userId);
+    }
+
     @Override
     public Result saveRedspearhead(RedSpearheadDTO dto) {
         return userFeignClient.saveRedspearhead(dto);

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/CentralHouseHoldDTO.java

@@ -44,6 +44,16 @@ public class CentralHouseHoldDTO implements Serializable {
      */
 	private String userId;
 
+    /**
+     * 申请人姓名
+     */
+	private String realName;
+
+    /**
+     * 申请人电话
+     */
+	private String mobile;
+
     /**
      * 0、待审核 1、已审核
      */

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/form/CentralHouseholdApplyFor.java

@@ -15,6 +15,16 @@ public class CentralHouseholdApplyFor {
      */
     private String userId;
 
+    /**
+     * 申请人姓名
+     */
+    private String realName;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
     /**
      * 人员类别
      */

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/CentralHouseHoldController.java

@@ -61,6 +61,11 @@ public class CentralHouseHoldController {
         return new Result<CentralHouseHoldDTO>().ok(data);
     }
 
+    @GetMapping("getByUserId/{userId}")
+    public Result<CentralHouseHoldDTO> getByUserId(@PathVariable("userId") String userId){
+        CentralHouseHoldDTO data = centralHouseHoldService.getByUserId(userId);
+        return new Result<CentralHouseHoldDTO>().ok(data);
+    }
     @PostMapping("save")
     public Result save(@RequestBody CentralHouseHoldDTO dto){
         //效验数据