diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java index c108308e2..91c8036c7 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java @@ -111,6 +111,16 @@ public class SysDeptDTO extends TreeNode implements Serializable { */ private String areaCode; + public String getStreetName() { + return streetName; + } + + public void setStreetName(String streetName) { + this.streetName = streetName; + } + + private String streetName; + /** * 市中心区划编码 */ diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index e803c6bfc..2c02caf98 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -518,6 +518,20 @@ public class SysDeptController { return new Result().ok(sysDeptService.getDept(formDTO)); } + /** + * + * @description: 党员报到相关 + * @author qushutong + * @date 2023/9/15 15:10 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Version1.0 + **/ + @PostMapping("getDeptInfo") + public Result getDeptInfo(@RequestBody CityCenterFromDTO formDTO) { + return new Result().ok(sysDeptService.getDeptInfo(formDTO)); + } + @GetMapping("option/list") @ApiOperation("下拉列表") public Result> listOption(@RequestParam Map params) { diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java index 4d62590d3..2fc8155aa 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java @@ -281,4 +281,5 @@ public interface SysDeptDao extends BaseDao { */ SysDeptAreaCodeResultDTO selectByAreaCode(@Param("areaCode") String areaCode); + SysDeptDTO selectDeptInfo(CityCenterFromDTO formDTO); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index 8140aa481..4761da920 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -431,4 +431,6 @@ public interface SysDeptService extends BaseService { DeptInfoCodeDTO guessDeptId(Long deptId); Result importExcel(MultipartFile file); + + SysDeptDTO getDeptInfo(CityCenterFromDTO formDTO); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 015f0674b..a301a86fa 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -1618,6 +1618,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl + + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyMemberRegistDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyMemberRegistDTO.java index c1fafeaf7..8b66d9058 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyMemberRegistDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyMemberRegistDTO.java @@ -60,6 +60,11 @@ public class EpdcPartyMemberRegistDTO implements Serializable { private String liveSecretaryName; + private String liveStreetName; + + private String couplingStreetName; + + /** * 现居住社区 */ @@ -91,4 +96,5 @@ public class EpdcPartyMemberRegistDTO implements Serializable { + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index e9cc637f2..21554fd9c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -214,6 +214,6 @@ public interface AdminFeignClient { @PostMapping("sys/voluntarystyle/getListByDeptId") Result> getVoluntarystyleListByDeptId(VoluntaryStyleDTO dto); - @PostMapping(value = "sys/dept/getDept", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getDept(@RequestBody CityCenterFromDTO formDTO); + @PostMapping(value = "sys/dept/getDeptInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getDeptInfo(@RequestBody CityCenterFromDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index e6492bbf2..2b24f9556 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -129,7 +129,7 @@ public class AdminFeignClientFallback implements AdminFeignClient { } @Override - public Result getDept(CityCenterFromDTO formDTO) { + public Result getDeptInfo(CityCenterFromDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDept", formDTO); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 0c111b20c..8b754c43c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1635,22 +1635,24 @@ public class AppUserServiceImpl implements AppUserService { EpdcPartyMemberRegistDTO partyMemberRegistDTO = new EpdcPartyMemberRegistDTO(); CityCenterFromDTO formDTO = new CityCenterFromDTO(); if(dto.getDeptId()!=null){ - formDTO.setDeptId(dto.getDeptId()); - SysDeptDTO liveDept = adminFeignClient.getDept(formDTO).getData(); + formDTO.setDeptId(Long.parseLong(dto.getCouplingCommunity()[dto.getAllDeptIds().length-2])); + SysDeptDTO liveDept = adminFeignClient.getDeptInfo(formDTO).getData(); partyMemberRegistDTO.setLiveAddress(liveDept.getAddress()); partyMemberRegistDTO.setLiveCommunity(liveDept.getName()); partyMemberRegistDTO.setLiveMobile(liveDept.getMobile()); partyMemberRegistDTO.setLiveSecretaryName(liveDept.getSecretaryName()); partyMemberRegistDTO.setLiveTelephone(liveDept.getTelephone()); + partyMemberRegistDTO.setLiveStreetName(liveDept.getStreetName()); } if (null != dto.getCouplingCommunity()) { - formDTO.setDeptId(Long.parseLong(String.join(",", dto.getCouplingCommunity()))); - SysDeptDTO couplingDept = adminFeignClient.getDept(formDTO).getData(); + formDTO.setDeptId(Long.parseLong(dto.getCouplingCommunity()[dto.getCouplingCommunity().length-2])); + SysDeptDTO couplingDept = adminFeignClient.getDeptInfo(formDTO).getData(); partyMemberRegistDTO.setCouplingAddress(couplingDept.getAddress()); partyMemberRegistDTO.setCouplingCommunity(couplingDept.getName()); partyMemberRegistDTO.setCouplingMobile(couplingDept.getMobile()); partyMemberRegistDTO.setCouplingSecretaryName(couplingDept.getSecretaryName()); partyMemberRegistDTO.setCouplingelephone(couplingDept.getTelephone()); + partyMemberRegistDTO.setCouplingStreetName(couplingDept.getStreetName()); } userFeignClient.saveReportparty(dto);