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 3a7368f..93977dd 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 @@ -480,4 +480,16 @@ public class EpdcScreenController { List data = epdcScreenService.getEpidemicUserInfoList(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 da3be98..dfa140a 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 @@ -407,4 +407,13 @@ public interface EpdcScreenDao extends BaseDao getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto); + + /** + * @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 f5dbd55..2ae8250 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; @@ -342,4 +340,13 @@ public interface EpdcScreenService { * @since 2022/4/13 10:10 */ List getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO 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 9c30148..fad72d5 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; /** @@ -321,6 +316,12 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl result = baseDao.getUserStateCount(formDto); + return new Result().ok(result); + } + @Override public List getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto) { 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 7de5864..5cedea2 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 @@ -899,4 +899,14 @@ +