wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据概览增加时间

This commit is contained in:
Lenovo 2024-08-14 18:31:33 +08:00
parent cd42848fba
commit ddb584e47f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-system/src/main/resources/mapper/business/BusStoreDayHistoryInfoMapper.xml
View File

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

4
ruoyi-ui/src/views/statistics/overview/index.vue
View File

@ -206,7 +206,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
open1: false, open1: false,
timeRange1: ['',''], timeRange1: [new Date(new Date()-(24*60*60*1000)),new Date(new Date()-(24*60*60*1000))],
queryParams1: { queryParams1: {
storeId: undefined, storeId: undefined,
storeName: undefined, storeName: undefined,
@ -316,7 +316,7 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { 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.queryParams.account=undefined;
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();