榆山项目代码提交 analysis 疫情防控-疫苗接种人口类型统计

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<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>>
-     * @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<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO>
-     * @author jyyzz
+     * @author zhangfenghe
      * @since 2021/8/12 12:35
      */
     @GetMapping("vaccination/ageVaccinationStatistics")
-    public Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO> vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto){
+    public Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO> vaccinationAgeVaccinationStatistics(@RequestBody EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto){
         ValidatorUtils.validateEntity(formDto);
         return epdcScreenService.vaccinationAgeVaccinationStatistics(formDto);
     }
+
+    /**
+     *疫情防控-疫苗接种人口类型统计
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/12 15:29
+     */
+    public Result<EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO> vaccinationPersonVaccinationStatistics(@RequestBody EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto){
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.vaccinationPersonVaccinationStatistics(formDto);
+    }
 }

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<EpdcScreenGridGovernanceItemResul
      * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据）
      * @params [formDTO]
      * @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>
-     * @author jyyzz
+     * @author zhangfenghe
      * @since 2021/8/12 10:41
      */
     List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDTO);
@@ -165,7 +165,7 @@ public interface EpdcScreenDao extends BaseDao<EpdcScreenGridGovernanceItemResul
      * 疫情防控-接种企业统计
      * @params []
      * @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>
-     * @author jyyzz
+     * @author zhangfenghe
      * @since 2021/8/12 11:31
      */
     List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO> epidemicCompanyVaccinationStatisticsList();
@@ -174,9 +174,18 @@ public interface EpdcScreenDao extends BaseDao<EpdcScreenGridGovernanceItemResul
      *疫情防控-疫苗接种年龄分布
      * @params [formDto]
      * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO
-     * @author jyyzz
+     * @author zhangfenghe
      * @since 2021/8/12 12:41
      */
     EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto);
 
+    /**
+     * 疫情防控-疫苗接种人口类型统计
+     * @params [formDto]
+     * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO
+     * @author zhangfenghe
+     * @since 2021/8/12 15:33
+     */
+    EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto);
+
 }

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

@@ -156,7 +156,7 @@ public interface EpdcScreenService {
      * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据）
      * @params [formDto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>>
-     * @author jyyzz
+     * @author zhangfenghe
      * @since 2021/8/12 10:31
      */
     Result<List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto);
@@ -165,7 +165,7 @@ public interface EpdcScreenService {
      * 疫情防控-接种企业统计
      * @params []
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>>
-     * @author jyyzz
+     * @author zhangfenghe
      * @since 2021/8/12 11:27
      */
     Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList();
@@ -178,4 +178,13 @@ public interface EpdcScreenService {
      * @since 2021/8/12 12:36
      */
     Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO> vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto);
+
+    /**
+     *疫情防控-疫苗接种人口类型统计
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/12 15:30
+     */
+    Result<EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO> vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto);
 }

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<EpdcScreenDao, EpdcSc
 
     @Override
     public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList() {
-        List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO> data = baseDao.epidemicCompanyVaccinationStatisticsList()
+        List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO> data = baseDao.epidemicCompanyVaccinationStatisticsList();
         return new Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>>().ok(data);
     }
 
@@ -144,5 +144,11 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl<EpdcScreenDao, EpdcSc
         return new Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO>().ok(data);
     }
 
+    @Override
+    public Result<EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO> vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto) {
+        EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO data = baseDao.vaccinationPersonVaccinationStatistics(formDto);
+        return new Result<EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO>().ok(data);
+    }
+
 
 }

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

@@ -316,16 +316,16 @@
         WHERE DEL_FLAG = '0'
         ORDER BY
         <if test="orderType == 0">
-            VACCINATION_COMPLETED_NUM DESC
+            VACCINATION_COMPLETED_NUM DESC,
         </if>
         <if test="orderType == 1">
-            ONE_SHOT_NUM DESC
+            ONE_SHOT_NUM DESC,
         </if>
         <if test="orderType == 2">
-            TWO_SHOTS_NUM DESC
+            TWO_SHOTS_NUM DESC,
         </if>
         <if test="orderType == 3">
-            NOT_VACCINATED_NUM DESC
+            NOT_VACCINATED_NUM DESC,
         </if>
         DEPT_NAME
         LIMIT #{pageIndex}, #{pageSize}
@@ -342,16 +342,25 @@
 
     <select id="vaccinationAgeVaccinationStatistics"
             resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO">
-
       SELECT
-
+        SUM(AGE_EIGHTEEN_THIRTY) AS ageEighteenThirty,
+        SUM(AGE_THIRTY_ONE_FORTY) AS ageThirtyOneForty,
+        SUM(AGE_FORTY_ONE_FIFTY) AS ageFortyOneFifty,
+        SUM(AGE_FIFTY_ONE_SIXTY) AS ageFiftyOneSixty,
+        SUM(AGE_OVER_SIXTY) AS ageOverSixty
       FROM epdc_screen_vaccination_age_statistics
-        SUM (AGE_EIGHTEEN_THIRTY) ,
-        SUM (AGE_THIRTY_ONE_FORTY) ,
-        SUM (AGE_FORTY_ONE_FIFTY) ,
-        SUM (AGE_FIFTY_ONE_SIXTY) ,
-        SUM (AGE_OVER_SIXTY)
       WHERE DEL_FLAG = '0'
       AND STATISTIC_TYPE = #{statisticType}
     </select>
+
+    <select id="vaccinationPersonVaccinationStatistics"
+            resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO">
+        SELECT
+          SUM(PERMANENT_RESIDENCE_NUM) AS permanentResidenceNum,
+          SUM(FLOATING_POPULATION_NUM) AS floatingPopulationNum,
+          SUM(FOREIGN_POPULATION_NUM) AS foreignPopulationNum
+        FROM epdc_screen_vaccination_person_statistics
+        WHERE DEL_FLAG = '0'
+        AND STATISTIC_TYPE = #{statisticType}
+    </select>
 </mapper>