From a65199f93deec1ead92940f32588e40c81f2de39 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 13 Apr 2022 14:49:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E4=B8=8B=E9=9D=A2=E7=9A=84=20=E4=BB=A5?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=88=86=E7=BB=84=E7=9A=84=E5=B7=B2=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=92=8C=E6=9C=AA=E6=A3=80=E6=B5=8B=E7=9A=84=E6=A0=B8?= =?UTF-8?q?=E9=85=B8=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/controller/EpdcScreenController.java | 12 ++++++++++++ .../esua/epdc/modules/screen/dao/EpdcScreenDao.java | 9 +++++++++ .../modules/screen/service/EpdcScreenService.java | 11 +++++++++-- .../screen/service/impl/EpdcScreenServiceImpl.java | 11 ++++++----- .../main/resources/mapper/screen/EpdcScreenDao.xml | 10 ++++++++++ 5 files changed, 46 insertions(+), 7 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 b98e66d..e1efc91 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 @@ -467,4 +467,16 @@ public class EpdcScreenController { List data = epdcScreenService.epidemicVaccinationStatisticsNew(formDto); return new Result>().ok(data); } + + /** + * @describe: 获取指定社区下面的 以网格分组的已检测和未检测的核酸人数 + * @author wangtong + * @date 2022/4/13 14:37 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("epidemic/vaccinationStatistics/getUserStateCount") + public Result getUserStateCount(@RequestBody EpdcScreenUserStateFormDTO formDto){ + return epdcScreenService.getUserStateCount(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 78ba05d..152c143 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 @@ -398,4 +398,13 @@ public interface EpdcScreenDao extends BaseDao communityVaccinationData(); + + /** + * @describe: 获取某个社区下面的 以网格分组的已检测和未检测的核酸人数 + * @author wangtong + * @date 2022/4/13 14:44 + * @params [formDto] + * @return java.util.List + */ + List getUserStateCount(EpdcScreenUserStateFormDTO 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 cb0f6c6..8f1ea03 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 @@ -1,11 +1,9 @@ package com.elink.esua.epdc.modules.screen.service; -import com.baomidou.mybatisplus.extension.api.R; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.analysis.pc.screen.EpdcScreenVaccinationDeptStatisticsDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; -import org.springframework.web.bind.annotation.GetMapping; import java.util.List; @@ -333,4 +331,13 @@ public interface EpdcScreenService { Result yqfkYmjzqkJobNew(); List epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto); + + /** + * @describe: 获取某个社区下面的 以网格分组的已检测和未检测的核酸人数 + * @author wangtong + * @date 2022/4/13 14:37 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getUserStateCount(EpdcScreenUserStateFormDTO 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 648ebd4..e9583da 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 @@ -4,19 +4,14 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.dto.analysis.pc.item.result.ItemResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.EpdcScreenVaccinationDeptStatisticsDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -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.ArrayList; import java.util.List; /** @@ -320,4 +315,10 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl result = baseDao.getUserStateCount(formDto); + return new Result().ok(result); + } } 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 85b2fcd..8d5932f 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 @@ -880,4 +880,14 @@ ORDER BY ( ONE_SHOT_COMPLETED_NUM + TWO_SHOT_COMPLETED_NUM + THREE_SHOT_COMPLETED_NUM + STEADY_SHOT_COMPLETED_NUM ) DESC + From 723d9127111a619ab034f789831915a6e692c2f8 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 13 Apr 2022 14:50:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E4=B8=8B=E9=9D=A2=E7=9A=84=20=E4=BB=A5?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=88=86=E7=BB=84=E7=9A=84=E5=B7=B2=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=92=8C=E6=9C=AA=E6=A3=80=E6=B5=8B=E7=9A=84=E6=A0=B8?= =?UTF-8?q?=E9=85=B8=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/screen/EpdcScreenDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8d5932f..4215e07 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 @@ -885,7 +885,7 @@ SELECT DEPT_NAME, count(CHECK_STATE='0' or null) as finishedCount, count(CHECK_STATE='1' or null) as unfinishedCount - FROM `epidemic_user_info` + FROM esua_epdc_custom.`epidemic_user_info` where DEL_FLAG='0' and FIND_IN_SET(#{communityId},PARENT_DEPT_IDS) group by DEPT_ID