From f4400304dd9be37ce21c6cb85c3503b3035d5942 Mon Sep 17 00:00:00 2001
From: zhangfh <jyyzzfh@126.com>
Date: Wed, 25 Aug 2021 22:28:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?=
 =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BC=81=E4=B8=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/controller/ApiScreenController.java  | 5 +++--
 .../java/com/elink/esua/epdc/feign/AnalysisFeignClient.java  | 2 +-
 .../epdc/feign/fallback/AnalysisFeignClientFallback.java     | 4 ++--
 .../java/com/elink/esua/epdc/service/EpdcScreenService.java  | 2 +-
 .../elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java  | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java
index b247989..183cb7b 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java
@@ -241,8 +241,9 @@ public class ApiScreenController {
      * @since 2021/8/12 11:15
      */
     @GetMapping("epidemic/companyVaccinationStatistics")
-    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList(){
-        return epdcScreenService.epidemicCompanyVaccinationStatisticsList();
+    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList(EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto){
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.epidemicCompanyVaccinationStatisticsList(formDto);
     }
 
     /**
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
index b9fd208..02afdab 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
@@ -204,7 +204,7 @@ public interface AnalysisFeignClient {
      * @since 2021/8/12 11:19
      */
     @GetMapping(value = "analysis/screen/epidemic/companyVaccinationStatistics",consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList();
+    Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList(EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto);
 
     /**
      * 疫情防控-疫苗接种年龄分布
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
index 5d36a26..f83ef22 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
@@ -106,8 +106,8 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
     }
 
     @Override
-    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicCompanyVaccinationStatisticsList");
+    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList(EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicCompanyVaccinationStatisticsList",formDto);
     }
 
     @Override
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java
index 645d6af..44862b9 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java
@@ -173,7 +173,7 @@ public interface EpdcScreenService {
      * @author zhangfenghe
      * @since 2021/8/12 11:17
      */
-    Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList();
+    Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList(EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto);
 
     /**
      * 疫情防控-疫苗接种年龄分布
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java
index 01a132b..76915ca 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java
@@ -107,8 +107,8 @@ public class EpdcScreenServiceImpl implements EpdcScreenService {
     }
 
     @Override
-    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList() {
-        return analysisFeignClient.epidemicCompanyVaccinationStatisticsList();
+    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList(EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto) {
+        return analysisFeignClient.epidemicCompanyVaccinationStatisticsList(formDto);
     }
 
     @Override