From 820af2a10e1458e2a1b6b20fa3767868a45618b5 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 25 Aug 2021 22:39:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20=20=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=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 --- .../epdc/modules/screen/controller/EpdcScreenController.java | 5 +++-- .../elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java | 2 +- .../esua/epdc/modules/screen/service/EpdcScreenService.java | 2 +- .../modules/screen/service/impl/EpdcScreenServiceImpl.java | 4 ++-- .../src/main/resources/mapper/screen/EpdcScreenDao.xml | 3 +++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index e9f87ce..aee51ab 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/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> epidemicCompanyVaccinationStatisticsList(){ - return epdcScreenService.epidemicCompanyVaccinationStatisticsList(); + public Result> epidemicCompanyVaccinationStatisticsList(@RequestBody EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.epidemicCompanyVaccinationStatisticsList(formDto); } /** diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index 528aed2..df4d344 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/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 epidemicCompanyVaccinationStatisticsList(); + List epidemicCompanyVaccinationStatisticsList(EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto); /** *疫情防控-疫苗接种年龄分布 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java index ca6f580..e145904 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java +++ b/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> epidemicCompanyVaccinationStatisticsList(); + Result> epidemicCompanyVaccinationStatisticsList(EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto); /** * 疫情防控-疫苗接种年龄分布 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index 214cb72..4fb2345 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -134,8 +134,8 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl> epidemicCompanyVaccinationStatisticsList() { - List data = baseDao.epidemicCompanyVaccinationStatisticsList(); + public Result> epidemicCompanyVaccinationStatisticsList(EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto) { + List data = baseDao.epidemicCompanyVaccinationStatisticsList(formDto); return new Result>().ok(data); } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 72df194..d685f98 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -355,6 +355,9 @@ SUM(VACCINATION_NUM) AS vaccinationNum FROM esua_epdc_analysis.epdc_screen_vaccination_company_statistics WHERE DEL_FLAG = '0' + + AND TYPE_KEY = #{typeKey} + GROUP BY COMPANY ORDER BY vaccinationNum DESC From fe5fbaf22f16663156bf0a198436f599ebb0dc37 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 25 Aug 2021 22:44:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?PC=E7=AB=AF-=E5=B7=A5=E4=BD=9C=E5=8F=B0-?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/screen/service/impl/EpdcScreenServiceImpl.java | 4 ++++ epdc-cloud-client-yushan | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index 4fb2345..2ede513 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/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; @@ -135,6 +136,9 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl> epidemicCompanyVaccinationStatisticsList(EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto formDto) { + if (StringUtils.isEmpty(formDto.getTypeKey())) { + formDto.setTypeKey("street_party"); + } List data = baseDao.epidemicCompanyVaccinationStatisticsList(formDto); return new Result>().ok(data); } diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 8b23ab3..e3843f5 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 8b23ab3ee8861db7b498c9ac07b44b19d9f78d16 +Subproject commit e3843f5c0c1e2958be68573f0876b0a402a6cf81