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

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

Browse Source
This commit is contained in:
xiezhijun 2021-03-29 18:40:28 +08:00
parent 69dfc9ebe9
commit e93bce4731
3 changed files with 34 additions and 10 deletions
Show Stats 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>

24
stdiet-ui/src/views/custom/fanStatistics/index.vue
View File

@ -8,13 +8,16 @@
label-width="68px"
>
<el-form-item label="进粉日期" prop="fanTime">
<el-date-picker
clearable
style="width: 200px"
v-model="queryParams.fanTime"
type="date"
v-model="fanTimeScope"
type="daterange"
range-separator="至"
start-placeholder="进粉开始日期"
end-placeholder="进粉结束日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期"
:picker-options="fanTimePickerOptions"
>
</el-date-picker>
</el-form-item>
@ -188,6 +191,7 @@
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
:picker-options="fanTimePickerOptions"
>
</el-date-picker>
</el-form-item>
@ -318,7 +322,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
fanTime: nowDate,
userId: null,
accountId: null,
},
@ -343,6 +346,12 @@ export default {
{ required: true, trigger: "blur", message: "请输入进粉数量" },
],
},
fanTimeScope: [nowDate, nowDate],
fanTimePickerOptions: {
disabledDate(time) {
return time.getTime() > dayjs()
},
}
};
},
created() {
@ -361,6 +370,8 @@ export default {
/** 查询进粉统计列表 */
getList() {
this.loading = true;
this.queryParams.fanStartTime = this.fanTimeScope && this.fanTimeScope.length > 0 ? this.fanTimeScope[0] : null;
this.queryParams.fanEndTime = this.fanTimeScope && this.fanTimeScope.length > 0 ? this.fanTimeScope[1] : null;
listFanStatistics(this.queryParams).then((response) => {
this.fanStatisticsList = response.rows;
this.totalFanNum = 0;
@ -394,6 +405,7 @@ export default {
};
this.wxList = [];
this.showWxFlag = false;
this.fanTimeScope = [nowDate,nowDate];
this.resetForm("form");
},
editFormReset() {