Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!182 进粉统计加上时间范围筛选

Browse Source 
Merge pull request !182 from 德仔/xzj
This commit is contained in:
德仔
2021-03-29 19:44:47 +08:00
committed by Gitee
parent 57c5470a23 e93bce4731
commit 3119fa90e2
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java
View File

@ -63,4 +63,12 @@ public class SysWxFanStatistics extends BaseEntity
//排序参数，null或者0：按照id倒序 1：按照组别ID、id顺序正序
private Integer sortFlag;
//进粉开始时间
@JsonFormat(pattern = "yyyy-MM-dd")
private Date fanStartTime;
//进粉结束时间
@JsonFormat(pattern = "yyyy-MM-dd")
private Date fanEndTime;
}

8
stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml
View File

@ -42,7 +42,9 @@
<select id="selectSysWxFanStatisticsList" parameterType="SysWxFanStatistics" resultMap="SysWxFanStatisticsResult">
<include refid="selectSysWxFanStatisticsVoExtended"/> where swfs.del_flag = 0
<if test="fanTime != null ">and swfs.fan_time = #{fanTime}</if>
<if test="fanStartTime != null and fanEndTime != null">
and swfs.fan_time >= #{fanStartTime} and #{fanEndTime} >= swfs.fan_time
</if>
<if test="userId != null">and su.user_id = #{userId}</if>
<if test="accountId != null">and swd.account_id = #{accountId}</if>
<if test="sortFlag == null or sortFlag == 0">
@ -60,7 +62,9 @@
left join sys_wx_distribution swd on swd.wechat_account = swfs.wx_id and swd.del_flag = 0
left join sys_user su on su.user_id = swd.user_id and su.del_flag = 0
where swfs.del_flag = 0
<if test="fanTime != null ">and swfs.fan_time = #{fanTime}</if>
<if test="fanStartTime != null and fanEndTime != null">
and swfs.fan_time >= #{fanStartTime} and #{fanEndTime} >= swfs.fan_time
</if>
<if test="userId != null">and su.user_id = #{userId}</if>
<if test="accountId != null">and swd.account_id = #{accountId}</if>
</select>