Merge remote-tracking branch 'origin/master'

# Conflicts:
#	epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java
#	epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java
#	epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java
#	epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java
#	epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java

@@ -480,4 +480,16 @@ public class EpdcScreenController {
         List<ApiEpidemicUserInfoResultDTO> data = epdcScreenService.getEpidemicUserInfoList(formDto);
         return new Result<List<ApiEpidemicUserInfoResultDTO>>().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);
+    }
 }

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<EpdcScreenGridGovernanceItemResul
      * @since 2022/4/13 10:10
      */
     List<ApiEpidemicUserInfoResultDTO> getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto);
+
+    /**
+    * @describe: 获取某个社区下面的 以网格分组的已检测和未检测的核酸人数
+    * @author wangtong
+    * @date 2022/4/13 14:44
+    * @params [formDto]
+    * @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenUserStateResultDTO>
+    */
+    List<EpdcScreenUserStateResultDTO> getUserStateCount(EpdcScreenUserStateFormDTO formDto);
 }

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<ApiEpidemicUserInfoResultDTO> 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);
 }

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<EpdcScreenDao, EpdcSc
         }
     }
 
+    @Override
+    public Result getUserStateCount(EpdcScreenUserStateFormDTO formDto) {
+        List<EpdcScreenUserStateResultDTO> result = baseDao.getUserStateCount(formDto);
+        return new Result().ok(result);
+    }
+
     @Override
     public List<ApiEpidemicUserInfoResultDTO> getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto) {
 

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

@@ -899,4 +899,14 @@
 
 
     </select>
+    <select id="getUserStateCount"
+            resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenUserStateResultDTO">
+        SELECT DEPT_NAME,
+			 count(CHECK_STATE='0' or null) as finishedCount,
+			 count(CHECK_STATE='1' or null) as unfinishedCount
+        FROM esua_epdc_custom.`epidemic_user_info`
+        where DEL_FLAG='0'
+                    and FIND_IN_SET(#{communityId},PARENT_DEPT_IDS)
+        group by DEPT_ID
+    </select>
 </mapper>