补充街道名称

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;
+
     /**
      * 市中心区划编码
      */

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<SysDeptDTO>().ok(sysDeptService.getDept(formDTO));
     }
 
+    /**
+     *
+     * @description:  党员报到相关
+     * @author qushutong
+     * @date 2023/9/15 15:10
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.SysDeptDTO>
+     * @Version1.0
+     **/
+    @PostMapping("getDeptInfo")
+    public Result<SysDeptDTO> getDeptInfo(@RequestBody CityCenterFromDTO formDTO) {
+        return new Result<SysDeptDTO>().ok(sysDeptService.getDeptInfo(formDTO));
+    }
+
     @GetMapping("option/list")
     @ApiOperation("下拉列表")
     public Result<List<DeptDTO>> listOption(@RequestParam Map<String, Object> params) {

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<SysDeptEntity> {
     */
     SysDeptAreaCodeResultDTO selectByAreaCode(@Param("areaCode") String areaCode);
 
+    SysDeptDTO selectDeptInfo(CityCenterFromDTO formDTO);
 }

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<SysDeptEntity> {
     DeptInfoCodeDTO guessDeptId(Long deptId);
 
     Result importExcel(MultipartFile file);
+
+    SysDeptDTO getDeptInfo(CityCenterFromDTO formDTO);
 }

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<SysDeptDao, SysDeptEntit
         return new Result();
     }
 
+
+
     /**
      * @return java.lang.String
      * @describe: 访问外部接口获取部门（社区）地区编码
@@ -1719,4 +1721,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             gisGridService.saveRelation(dto);
         }
     }
+
+    @Override
+    public SysDeptDTO getDeptInfo(CityCenterFromDTO formDTO) {
+
+
+        return baseDao.selectDeptInfo(formDTO);
+    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -496,4 +496,22 @@
               and del_flag='0'
     </select>
 
+
+    <select id="selectDeptInfo" resultType="com.elink.esua.epdc.dto.SysDeptDTO">
+                SELECT
+            d.NAME,
+            d.address,
+            d.mobile,
+            d.telephone,
+            d.secretary_name,
+            d2.`NAME` streetName
+        FROM
+            sys_dept d
+            LEFT JOIN sys_dept d2 ON d.pid = d2.id
+        WHERE
+            d.id = #{deptId}
+            AND d.del_flag =0
+            GROUP BY d.ID
+
+    </select>
 </mapper>

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 {
 
 
 
+
 }

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<List<VoluntaryStyleDTO>> getVoluntarystyleListByDeptId(VoluntaryStyleDTO dto);
 
-    @PostMapping(value = "sys/dept/getDept", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "sys/dept/getDeptInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<SysDeptDTO> getDept(@RequestBody CityCenterFromDTO formDTO);
+    Result<SysDeptDTO> getDeptInfo(@RequestBody CityCenterFromDTO formDTO);
 }

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<SysDeptDTO> getDept(CityCenterFromDTO formDTO) {
+    public Result<SysDeptDTO> getDeptInfo(CityCenterFromDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDept", formDTO);
     }
 }

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());
+            formDTO.setDeptId(Long.parseLong(dto.getCouplingCommunity()[dto.getAllDeptIds().length-2]));
-            SysDeptDTO liveDept = adminFeignClient.getDept(formDTO).getData();
+            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())));
+            formDTO.setDeptId(Long.parseLong(dto.getCouplingCommunity()[dto.getCouplingCommunity().length-2]));
-            SysDeptDTO couplingDept = adminFeignClient.getDept(formDTO).getData();
+            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);