From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/IhealthcodeService.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/IhealthcodeService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/IhealthcodeService.java
index b393185..08ced7b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/IhealthcodeService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/IhealthcodeService.java
@@ -18,9 +18,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.jfpt.healthcode.entity.healthcode;
-import org.springblade.jfpt.lx.entity.Lx;
-import org.springblade.jfpt.lx.vo.LxVO;
+import org.springblade.common.entity.HealthcodeExcel;
+import org.springblade.jfpt.healthcode.entity.Healthcode;
+import org.springblade.jfpt.healthcode.vo.HealthcodeVO;
+import org.springblade.jfpt.parcel.vo.ConditionVo;
import java.util.List;
import java.util.Map;
@@ -31,7 +32,7 @@
* @author BladeX
* @since 2020-07-19
*/
-public interface IhealthcodeService extends IService<healthcode> {
+public interface IhealthcodeService extends IService<Healthcode> {
int insert(String type, String sex, String province, String city,String district, String dtime);
List<Map<String, Object>> selectCountr(String time);
List<Map<String, Object>> selectCountz(String beginTime,String endTime);
@@ -41,4 +42,46 @@
* @return
*/
Map<String, Object> selectHealthcodeData();
+
+ /**
+ * 自定义健康码分页/健康码统计图表点击事件
+ * @param healthcodeVO 健康码对象
+ * @param page 分页对象(页码)
+ * @return
+ */
+ IPage<Healthcode> selectHealthcodeListPage(IPage<Healthcode> page, HealthcodeVO healthcodeVO);
+
+ /**
+ * 查询当前时间段红色健康码总个数
+ * @param conditionVo
+ * @return
+ */
+ Integer selHealthcodeTimeCount(ConditionVo conditionVo);
+
+ /**
+ * 查询当前时间段区间时间红色健康码个数
+ * @param conditionVo
+ * @return
+ */
+ List<Integer> selHealthcodeTimeDis(ConditionVo conditionVo);
+
+ /**
+ * 统计时间段内红色健康码人数数量数据
+ * @param conditionVo
+ * @return
+ */
+ Map<String, Object> selectHealthcodeTimeData(ConditionVo conditionVo);
+
+ /**
+ * 导出健康码数据表格
+ * @param healthcodeVO 查询条件
+ */
+ List<HealthcodeExcel> exportHealthcode(HealthcodeVO healthcodeVO);
+
+ /**
+ * 获取健康码图标数据
+ * @param healthcodeVO 查询条件
+ * @return
+ */
+ List<HealthcodeExcel> getHealthcodePie(HealthcodeVO healthcodeVO);
}
--
Gitblit v1.9.3