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 | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 b2731a9..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,6 +3,7 @@
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.*;
@@ -47,6 +48,13 @@
List<ComActAcidRecordExcelReturn> exportNew(@Param("commonPage")ComActAcidRecordDTO comActAcidRecordDTO);
/**
+ * 导出
+ * @param ids
+ * @return
+ */
+ List<ComActAcidRecordExcelReturn> selectByIds(String ids);
+
+ /**
* 5项统计
* @param localCity
* @return
@@ -59,7 +67,7 @@
* @param localCity
* @return
*/
- FiveCount fiveCountPlus(@Param("date") String date,@Param("localCity") String localCity);
+ FiveCount fiveCountPlus(@Param("date") String date,@Param("localCity") String localCity,@Param("type") Integer type);
/**
* 统计查询
@@ -90,7 +98,7 @@
* @param id
* @return
*/
- ComActAcidRecordVO selectLastNext(@RequestParam("id") Long id,@RequestParam("localCity")String localCity);
+ ComActAcidRecordVO selectLastNext(@Param("id") Long id,@Param("localCity")String localCity);
/**
* 查询区级填报人数
@@ -116,4 +124,10 @@
*/
List<ComActAcidChartsVO> selectCheck(@Param("date") String date,@Param("localCity") String localCity);
+ /**
+ * 批量核对防疫信息数据
+ * @param batchCheckAcidRecordDTO
+ * @return
+ */
+ void batchCheck(@Param("batchCheckAcidRecordDTO") BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);
}
--
Gitblit v1.7.1