From 71fee45aacf8505c202fe41b6ddfb27ec2b55bce Mon Sep 17 00:00:00 2001 From: zhangfh Date: Thu, 12 Aug 2021 17:03:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4=20analysis=20=E7=96=AB=E6=83=85?= =?UTF-8?q?=E9=98=B2=E6=8E=A7-=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E4=BA=BA=E5=8F=A3=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcScreenController.java | 18 +++++++++-- .../modules/screen/dao/EpdcScreenDao.java | 15 +++++++-- .../screen/service/EpdcScreenService.java | 13 ++++++-- .../service/impl/EpdcScreenServiceImpl.java | 8 ++++- .../resources/mapper/screen/EpdcScreenDao.xml | 31 ++++++++++++------- 5 files changed, 65 insertions(+), 20 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 9d20969..8a6de62 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 @@ -233,7 +233,7 @@ public class EpdcScreenController { * 疫情防控-接种企业统计 * @params [] * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author jyyzz + * @author zhangfenghe * @since 2021/8/12 11:26 */ @GetMapping("epidemic/companyVaccinationStatistics") @@ -245,12 +245,24 @@ public class EpdcScreenController { * 疫情防控-疫苗接种年龄分布 * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author jyyzz + * @author zhangfenghe * @since 2021/8/12 12:35 */ @GetMapping("vaccination/ageVaccinationStatistics") - public Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto){ + public Result vaccinationAgeVaccinationStatistics(@RequestBody EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto){ ValidatorUtils.validateEntity(formDto); return epdcScreenService.vaccinationAgeVaccinationStatistics(formDto); } + + /** + *疫情防控-疫苗接种人口类型统计 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/12 15:29 + */ + public Result vaccinationPersonVaccinationStatistics(@RequestBody EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.vaccinationPersonVaccinationStatistics(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 e8f8199..60dfc38 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 @@ -156,7 +156,7 @@ public interface EpdcScreenDao extends BaseDao - * @author jyyzz + * @author zhangfenghe * @since 2021/8/12 10:41 */ List epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDTO); @@ -165,7 +165,7 @@ public interface EpdcScreenDao extends BaseDao - * @author jyyzz + * @author zhangfenghe * @since 2021/8/12 11:31 */ List epidemicCompanyVaccinationStatisticsList(); @@ -174,9 +174,18 @@ public interface EpdcScreenDao extends BaseDao> - * @author jyyzz + * @author zhangfenghe * @since 2021/8/12 10:31 */ Result> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto); @@ -165,7 +165,7 @@ public interface EpdcScreenService { * 疫情防控-接种企业统计 * @params [] * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author jyyzz + * @author zhangfenghe * @since 2021/8/12 11:27 */ Result> epidemicCompanyVaccinationStatisticsList(); @@ -178,4 +178,13 @@ public interface EpdcScreenService { * @since 2021/8/12 12:36 */ Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto); + + /** + *疫情防控-疫苗接种人口类型统计 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/12 15:30 + */ + Result vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO 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 3a1a55e..996d8db 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,7 +134,7 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl> epidemicCompanyVaccinationStatisticsList() { - List data = baseDao.epidemicCompanyVaccinationStatisticsList() + List data = baseDao.epidemicCompanyVaccinationStatisticsList(); return new Result>().ok(data); } @@ -144,5 +144,11 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl().ok(data); } + @Override + public Result vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto) { + EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO data = baseDao.vaccinationPersonVaccinationStatistics(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 7810b71..031ba82 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 @@ -316,16 +316,16 @@ WHERE DEL_FLAG = '0' ORDER BY - VACCINATION_COMPLETED_NUM DESC + VACCINATION_COMPLETED_NUM DESC, - ONE_SHOT_NUM DESC + ONE_SHOT_NUM DESC, - TWO_SHOTS_NUM DESC + TWO_SHOTS_NUM DESC, - NOT_VACCINATED_NUM DESC + NOT_VACCINATED_NUM DESC, DEPT_NAME LIMIT #{pageIndex}, #{pageSize} @@ -342,16 +342,25 @@ + +