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" and DATE_FORMAT(create_time,'%Y-%m-%d') between #{expStartTime} and #{expEndTime} + + and DATE_FORMAT(create_time,'%Y-%m-%d') = DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY),'%Y-%m-%d') + @@ -94,6 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(Integral_update_time,'%Y-%m-%d') between #{expStartTime} and #{expEndTime} + + and DATE_FORMAT(Integral_update_time,'%Y-%m-%d') = DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY),'%Y-%m-%d') + and account=#{account} and update_type = '消耗账分' and agent_remark is not null 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();