Merge remote-tracking branch 'origin/feature/phaseOne'

# Conflicts:
#	epdc-cloud-client-yushan

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java

@@ -236,8 +236,9 @@ public class EpdcScreenController {
      * @since 2021/8/12 11:26
      */
     @GetMapping("epidemic/companyVaccinationStatistics")
-    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList(){
+    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList(@RequestBody EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto){
-        return epdcScreenService.epidemicCompanyVaccinationStatisticsList();
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.epidemicCompanyVaccinationStatisticsList(formDto);
     }
 
     /**

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java

@@ -168,7 +168,7 @@ public interface EpdcScreenDao extends BaseDao<EpdcScreenGridGovernanceItemResul
      * @author zhangfenghe
      * @since 2021/8/12 11:31
      */
-    List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO> epidemicCompanyVaccinationStatisticsList();
+    List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO> epidemicCompanyVaccinationStatisticsList(EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto);
 
     /**
      *疫情防控-疫苗接种年龄分布

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java

@@ -168,7 +168,7 @@ public interface EpdcScreenService {
      * @author zhangfenghe
      * @since 2021/8/12 11:27
      */
-    Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList();
+    Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList(EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto);
 
     /**
      * 疫情防控-疫苗接种年龄分布

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java

@@ -10,6 +10,7 @@ import com.elink.esua.epdc.dto.analysis.pc.screen.form.*;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
 import com.elink.esua.epdc.modules.screen.dao.EpdcScreenDao;
 import com.elink.esua.epdc.modules.screen.service.EpdcScreenService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -134,8 +135,11 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl<EpdcScreenDao, EpdcSc
     }
 
     @Override
-    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList() {
+    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList(EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto) {
-        List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO> data = baseDao.epidemicCompanyVaccinationStatisticsList();
+        if (StringUtils.isEmpty(formDto.getTypeKey())) {
+            formDto.setTypeKey("street_party");
+        }
+        List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO> data = baseDao.epidemicCompanyVaccinationStatisticsList(formDto);
         return new Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>>().ok(data);
     }
 

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml

@@ -344,6 +344,9 @@
         SUM(VACCINATION_NUM) AS vaccinationNum
       FROM  esua_epdc_analysis.epdc_screen_vaccination_company_statistics
       WHERE DEL_FLAG  = '0'
+      <if test="typeKey != null and typeKey !=''">
+          AND TYPE_KEY = #{typeKey}
+      </if>
       GROUP BY
       COMPANY
       ORDER BY vaccinationNum DESC

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 3c19e894f4347b968110dc6f781a29a477d7d77f
+Subproject commit e3843f5c0c1e2958be68573f0876b0a402a6cf81