代码提交 首页-组织信息接口传参-typeKey组织类型

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java

@@ -180,8 +180,9 @@ public class ApiScreenController {
      * @since 2021/8/11 14:32
      */
     @GetMapping("frontPage/deptInfoList")
-    public Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList() {
+    public Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto) {
-        return epdcScreenService.frontPageDeptInfoList();
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.frontPageDeptInfoList(formDto);
     }
 
     /**

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java

@@ -156,7 +156,7 @@ public interface AnalysisFeignClient {
      * @since 2021/8/11 17:18
      */
     @GetMapping(value = "analysis/screen/frontPage/deptInfoList",consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList();
+    Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto);
 
     /**
      * 首页-人口类型统计接口

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java

@@ -81,8 +81,8 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "partyMemberAge");
     }
     @Override
-    public Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList() {
+    public Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"frontPageDeptInfoList");
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"frontPageDeptInfoList",formDto);
     }
 
     @Override

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java

@@ -131,7 +131,7 @@ public interface EpdcScreenService {
      * @athor zhangfenghe
      * @since 2021/8/11 14:32
      */
-    Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList();
+    Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto);
 
     /**
      * 首页-人口类型统计接口

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java

@@ -82,8 +82,8 @@ public class EpdcScreenServiceImpl implements EpdcScreenService {
         return analysisFeignClient.partyMemberAge();
     }
     @Override
-    public Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList() {
+    public Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto) {
-        return analysisFeignClient.frontPageDeptInfoList();
+        return analysisFeignClient.frontPageDeptInfoList(formDto);
     }
 
     @Override

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 688b6ec20ea6e5868994c27d8d67cae5238654ed
+Subproject commit c660ca360356218f48dbdb987f4fba70f7642435

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit b2a4ab3cff9f848c77e7ec6b428321639270f734
+Subproject commit 235f56d5ea756317efe54c5e0d4be0ac45e09155