From f14966e7c0338b4c749fee51c73470ca0230f163 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 07 Apr 2021 17:39:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/ParcelService.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/ParcelService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/ParcelService.java
index 585c19d..931ca2b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/ParcelService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/ParcelService.java
@@ -25,16 +25,16 @@
 
 	/**
 	 * 查询包裹总数,违禁品总数
-	 * @param status 状态码 0:本天    1:本周   2:本月
+	 * @param conditionVo status 状态码 0:本天    1:本周   2:本月
 	 * @return
 	 */
-	List<Integer> selectParcelCount(Integer status);
+	List<Integer> selectParcelCount(ConditionVo conditionVo);
 
 	/**
 	 * 查询7天内违禁品每天的数量
 	 * @return
 	 */
-    Map<String, Object> selectParcelData();
+    Map<String, Object> selectParcelData(ConditionVo conditionVo);
 
 
 	/**
@@ -57,4 +57,18 @@
 	 * @return
 	 */
     Object getParcelkindDetailPage(ConditionVo conditionVo);
+
+	/**
+	 * 查询当前时间段违禁品总个数
+	 * @param conditionVo
+	 * @return
+	 */
+	Integer selParcelTimeCount(ConditionVo conditionVo);
+
+	/**
+	 *查询当前时间段区间时间违禁品个数
+	 * @param conditionVo
+	 * @return
+	 */
+    List<Integer> selParcelTimeDis(ConditionVo conditionVo);
 }

--
Gitblit v1.9.3