From ddb584e47f98e0e1b561dd85ca237ed9c98b05a9 Mon Sep 17 00:00:00 2001
From: Lenovo <zhuacang@163.com>
Date: Wed, 14 Aug 2024 18:31:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A6=82=E8=A7=88=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/business/BusStoreDayHistoryInfoMapper.xml        | 6 ++++++
 ruoyi-ui/src/views/statistics/overview/index.vue            | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreDayHistoryInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreDayHistoryInfoMapper.xml
index 8fe3a1c..069c62a 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusStoreDayHistoryInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreDayHistoryInfoMapper.xml
@@ -85,6 +85,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="expStartTime != null  and expStartTime != '' and expEndTime != null  and expEndTime != ''">
                 and DATE_FORMAT(create_time,'%Y-%m-%d') between #{expStartTime} and #{expEndTime}
             </if>
+            <if test="expStartTime == null or expStartTime == '' or expEndTime == null or expEndTime == ''">
+                and DATE_FORMAT(create_time,'%Y-%m-%d') = DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY),'%Y-%m-%d')
+            </if>
         </where>
     </select>
 
@@ -94,6 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="expStartTime != null  and expStartTime != '' and expEndTime != null  and expEndTime != ''">
                 and DATE_FORMAT(Integral_update_time,'%Y-%m-%d') between #{expStartTime} and #{expEndTime}
             </if>
+            <if test="expStartTime == null or expStartTime == '' or expEndTime == null or expEndTime == ''">
+                and DATE_FORMAT(Integral_update_time,'%Y-%m-%d') = DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY),'%Y-%m-%d')
+            </if>
             <if test="account != null">and account=#{account}</if>
             and update_type = '消耗账分' and agent_remark is not null
         </where>
diff --git a/ruoyi-ui/src/views/statistics/overview/index.vue b/ruoyi-ui/src/views/statistics/overview/index.vue
index 8c1eb6c..289022c 100644
--- a/ruoyi-ui/src/views/statistics/overview/index.vue
+++ b/ruoyi-ui/src/views/statistics/overview/index.vue
@@ -206,7 +206,7 @@ export default {
       // 是否显示弹出层
       open: false,
       open1: false,
-      timeRange1:  ['',''],
+      timeRange1:  [new Date(new Date()-(24*60*60*1000)),new Date(new Date()-(24*60*60*1000))],
       queryParams1: {
         storeId: undefined,
         storeName: undefined,
@@ -316,7 +316,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.timeRange1 = ['',''];
+      this.timeRange1 = [new Date(new Date()-(24*60*60*1000)),new Date(new Date()-(24*60*60*1000))];
       this.queryParams.account=undefined;
       this.resetForm("queryForm");
       this.handleQuery();