代码提交 疫苗接种情况统计表增加type_key字段代码更新

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

@@ -215,8 +215,9 @@ public class ApiScreenController {
      * @since 2021/8/11 23:16
      */
     @GetMapping("epidemic/vaccinationStatistics")
-    public Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics() {
+    public Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) {
-        return epdcScreenService.epidemicVaccinationStatistics();
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.epidemicVaccinationStatistics(formDto);
     }
 
     /**

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

@@ -21,7 +21,7 @@ import java.util.List;
  * @Author：liuchuang
  * @Date：2020/9/9 15:41
  */
-@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class,url = "http://localhost:9077")
 public interface AnalysisFeignClient {
 
     /**
@@ -184,7 +184,7 @@ public interface AnalysisFeignClient {
      * @since 2021/8/11 23:26
      */
     @GetMapping(value = "analysis/screen/epidemic/vaccinationStatistics",consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics();
+    Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto);
 
     /**
      * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据）

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

@@ -96,8 +96,8 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
     }
 
     @Override
-    public Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics() {
+    public Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicVaccinationStatistics");
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicVaccinationStatistics",formDto);
     }
 
     @Override

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

@@ -155,7 +155,7 @@ public interface EpdcScreenService {
      * @author zhangfenghe
      * @since 2021/8/11 23:22
      */
-    Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics();
+    Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDTO);
 
     /**
      * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据）

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

@@ -97,8 +97,8 @@ public class EpdcScreenServiceImpl implements EpdcScreenService {
     }
 
     @Override
-    public Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics() {
+    public Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) {
-        return analysisFeignClient.epidemicVaccinationStatistics();
+        return analysisFeignClient.epidemicVaccinationStatistics(formDto);
     }
 
     @Override