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 | 65 ++++++++++++++++++++++++++++++++
1 files changed, 64 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 a949432..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,11 +1,15 @@
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;
import com.baomidou.mybatisplus.extension.service.IService;
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)表服务接口
@@ -32,6 +36,13 @@
R export(ComActAcidRecordDTO comActAcidRecordDTO);
/**
+ * 导出
+ * @param comActAcidRecordDTO
+ * @return
+ */
+ R exportNew(ComActAcidRecordDTO comActAcidRecordDTO);
+
+ /**
* 新增信息
* @param comActAcidRecordVO
* @return
@@ -48,11 +59,63 @@
* 5项统计
* @return
*/
- R fiveCountPlus(String date);
+ R fiveCountPlus(String date,String localCity,String loginAccount);
+
+ /**
+ * 图标统计
+ * @return
+ */
+ R charts(String date,String localCity);
/**
* 统计
* @return
*/
R statics(String date);
+
+ /**
+ *
+ * @param comActAcidRecordVO
+ * @return
+ */
+ R updateLocalCity(ComActAcidRecordVO comActAcidRecordVO);
+
+ /**
+ *
+ * @param comActAcidRecordVO
+ * @return
+ */
+ R updateApplets(ComActAcidRecordVO comActAcidRecordVO);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ R delete(Long id);
+
+ /**
+ * 小程序查看详情
+ * @param id
+ * @return
+ */
+ R detailByApp(Long id,String localCity);
+
+ /**
+ * 后台查看详情
+ * @param id
+ * @return
+ */
+ R detailByCommunity(Long id);
+
+ R test();
+
+ /**
+ * 批量核对防疫信息数据
+ * @param batchCheckAcidRecordDTO
+ * @return
+ */
+ R batchCheck(BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);
+
+ R checkCommit(Long userId);
}
--
Gitblit v1.7.1