From e94a80ae3d9733eb2d6a5d9bcbd50a624f058caa Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期三, 19 十月 2022 17:39:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidRecordService.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidRecordService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidRecordService.java
index c76aafe..d7c8c0f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidRecordService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidRecordService.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service;
+import com.panzhihua.common.model.dtos.community.acid.BatchCheckAcidRecordDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
@@ -7,6 +8,8 @@
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.service_community.entity.ComActAcidRecord;
import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
/**
* (ComActAcidRecord)表服务接口
@@ -56,7 +59,7 @@
* 5项统计
* @return
*/
- R fiveCountPlus(String date,String localCity);
+ R fiveCountPlus(String date,String localCity,String loginAccount);
/**
* 图标统计
@@ -104,4 +107,15 @@
* @return
*/
R detailByCommunity(Long id);
+
+ R test();
+
+ /**
+ * 批量核对防疫信息数据
+ * @param batchCheckAcidRecordDTO
+ * @return
+ */
+ R batchCheck(BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);
+
+ R checkCommit(Long userId);
}
--
Gitblit v1.7.1