From 743e8cf5c858f77c7a5fbebbf90ad7dfabc26fb9 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 29 十一月 2022 15:01:33 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidRecordDao.java |   91 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidRecordDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidRecordDao.java
index d56534d..cb587ae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidRecordDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidRecordDao.java
@@ -3,14 +3,15 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.community.acid.BatchCheckAcidRecordDTO;
 import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
 import com.panzhihua.common.model.dtos.property.CommonPage;
-import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordExcelVO;
-import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
+import com.panzhihua.common.model.vos.community.acid.*;
 import com.panzhihua.common.model.vos.community.reserve.FiveCount;
 import org.apache.ibatis.annotations.Mapper;
 import com.panzhihua.service_community.entity.ComActAcidRecord;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -37,7 +38,21 @@
      * @param comActAcidRecordDTO
      * @return
      */
-    List<ComActAcidRecordExcelVO> export(@Param("commonPage")ComActAcidRecordDTO comActAcidRecordDTO);
+    List<ComActAcidRecordExcelReturn> export(@Param("commonPage")ComActAcidRecordDTO comActAcidRecordDTO);
+
+    /**
+     * 导出
+     * @param comActAcidRecordDTO
+     * @return
+     */
+    List<ComActAcidRecordExcelReturn> exportNew(@Param("commonPage")ComActAcidRecordDTO comActAcidRecordDTO);
+
+    /**
+     * 导出
+     * @param ids
+     * @return
+     */
+    List<ComActAcidRecordExcelReturn> selectByIds(String ids);
 
     /**
      * 5项统计
@@ -45,4 +60,74 @@
      * @return
      */
     FiveCount fiveCount(String localCity);
+
+    /**
+     * 7项统计
+     * @param date
+     * @param localCity
+     * @return
+     */
+    FiveCount fiveCountPlus(@Param("date") String date,@Param("localCity") String localCity,@Param("type") Integer type);
+
+    /**
+     * 统计查询
+     * @param localCity
+     * @param date
+     * @return
+     */
+    ComAcidStaticVO areaStatics(@Param("localCity") String localCity, @Param("date") String date);
+
+    /**
+     * 出发地统计
+     * @param departureCity
+     * @param date
+     * @return
+     */
+    Integer countryStatics(@Param("departureCity") String departureCity, @Param("date") String date,@Param("localCity")String localCity);
+
+    /**
+     * 7项统计
+     * @param date
+     * @param localCity
+     * @return
+     */
+    FiveCount pushStatics(@Param("date") String date,@Param("localCity") String localCity);
+
+    /**
+     * 查询上下一条id
+     * @param id
+     * @return
+     */
+    ComActAcidRecordVO selectLastNext(@Param("id") Long id,@Param("localCity")String localCity);
+
+    /**
+     * 查询区级填报人数
+     * @param date
+     * @param localCity
+     * @return
+     */
+    ComActAcidChartsVO selectAcidCount(@Param("date") String date,@Param("localCity") String localCity);
+
+    /**
+     * 查询区级风险人员，未填住址人员人数
+     * @param date
+     * @param localCity
+     * @return
+     */
+    ComActAcidChartsVO selectDangerCount(@Param("date") String date,@Param("localCity") String localCity);
+
+    /**
+     * 查询区级风险人员处理情况
+     * @param date
+     * @param localCity
+     * @return
+     */
+    List<ComActAcidChartsVO> selectCheck(@Param("date") String date,@Param("localCity") String localCity);
+
+    /**
+     * 批量核对防疫信息数据
+     * @param batchCheckAcidRecordDTO
+     * @return
+     */
+    void batchCheck(@Param("batchCheckAcidRecordDTO") BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);
 }

--
Gitblit v1.7.1