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

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	ruoyi-ui/src/views/statistics/shop/index.vue
This commit is contained in:
wangshuai 2024-07-16 16:15:02 +08:00
parent 742b6d353b 4740749636
commit fd0237f27c
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml
View File

@ -27,10 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateType != null and updateType != ''"> and update_type = #{updateType}</if> <if test="updateType != null and updateType != ''"> and update_type = #{updateType}</if>
<if test="integralUpdateTime != null "> and Integral_update_time = #{integralUpdateTime}</if> <if test="integralUpdateTime != null "> and Integral_update_time = #{integralUpdateTime}</if>
<if test="agentRemark != null and agentRemark != ''"> and agent_remark = #{agentRemark}</if> <if test="agentRemark != null and agentRemark != ''"> and agent_remark = #{agentRemark}</if>
<if test="agentAccount != null">
and account in and account in
<foreach collection="agentAccount" open="(" close=")" item="account" separator="," index="i"> <foreach collection="agentAccount" open="(" close=")" item="account" separator="," index="i">
#{account} #{account}
</foreach> </foreach>
</if>
<if test="account != null and account != ''"> and account = #{account}</if> <if test="account != null and account != ''"> and account = #{account}</if>
</where> </where>
</select> </select>

1
ruoyi-ui/src/views/statistics/shop/index.vue
View File

@ -370,6 +370,7 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
:picker-options="pickerOptions"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
align="right"> align="right">