abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

加入统计分页操作（未完）

Browse Source
This commit is contained in:
czx 2021-01-11 14:37:45 +08:00
parent c726fb7b60
commit 86c654904a
5 changed files with 24 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtOrderDaoController.java
View File

@ -133,11 +133,13 @@ public class FtOrderDaoController extends BaseController {
startPage();
Date selectDay = params.getDate("selectDay");
Integer statisticsType = params.getInteger("statisticsType");
Integer pageNum = params.getInteger("pageNum");
Integer pageSize = params.getInteger("pageSize");
if (statisticsType == 1) {
return iFtOrderDaoService.statisGetOrderOfDate(selectDay);
} else {
return iFtOrderDaoService.statisGetOrderOfDateByPerson(selectDay);
return iFtOrderDaoService.statisGetOrderOfDateByPerson(selectDay, pageNum, pageSize);
}
}
@ -153,7 +155,8 @@ public class FtOrderDaoController extends BaseController {
if (statisticsType == 1) {
return iFtOrderDaoService.statisGetOrderOfWeek(selectWeek);
} else {
return iFtOrderDaoService.statisGetOrderOfWeekByPerson(selectWeek);
// return iFtOrderDaoService.statisGetOrderOfWeekByPerson(selectWeek);
return null;
}
}
@ -169,7 +172,8 @@ public class FtOrderDaoController extends BaseController {
if (statisticsType == 1) {
return iFtOrderDaoService.statisGetOrderOfMonth(selectMonth);
}else {
return iFtOrderDaoService.statisGetOrderOfMonthByPerson(selectMonth);
// return iFtOrderDaoService.statisGetOrderOfMonthByPerson(selectMonth);
return null;
}
}
}

4
ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtOrderDaoMapper.java
View File

@ -43,8 +43,8 @@ public interface FtOrderDaoMapper extends BaseMapper<FtOrderDao> {
"\ta.order_type,\n" +
"\tc.depart_name,\n" +
"\tb.`name`,\n" +
"\tb.tel")
List<FtOrderDao> statisGetOrderOfDateByPerson(@Param("start") String start, @Param("end") String end);
"\tb.tel limit #{offset} , #{pageSize}")
List<FtOrderDao> statisGetOrderOfDateByPerson(@Param("start") String start, @Param("end") String end, @Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
List<FtOrderDao> listDetailedByDate(@Param("orderType") Integer orderType, @Param("start") String start, @Param("end") String end);

6
ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtOrderDaoService.java
View File

@ -33,15 +33,15 @@ public interface IFtOrderDaoService extends IService<FtOrderDao> {
AjaxResult statisGetOrderOfDate(Date date);
AjaxResult statisGetOrderOfDateByPerson(Date date);
AjaxResult statisGetOrderOfDateByPerson(Date date, Integer pageNum, Integer pageSize);
AjaxResult statisGetOrderOfWeek(Date date);
AjaxResult statisGetOrderOfWeekByPerson(Date date);
AjaxResult statisGetOrderOfWeekByPerson(Date date, Integer pageNum, Integer pageSize);
AjaxResult statisGetOrderOfMonth(Date date);
AjaxResult statisGetOrderOfMonthByPerson(Date date);
AjaxResult statisGetOrderOfMonthByPerson(Date date, Integer pageNum, Integer pageSize);
List<FtOrderDao> listDetailedByDate(Integer orderType, String start, String end);

13
ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtOrderDaoServiceImpl.java
View File

@ -131,8 +131,9 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
}
@Override
public AjaxResult statisGetOrderOfDateByPerson(Date date) {
return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfDay(date).toString(), DateUtil.endOfDay(date).toString()));
public AjaxResult statisGetOrderOfDateByPerson(Date date, Integer pageNum, Integer pageSize) {
Integer offset = (pageNum - 1) * pageSize;
return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfDay(date).toString(), DateUtil.endOfDay(date).toString(), offset, pageSize));
}
@Override
@ -141,8 +142,8 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
}
@Override
public AjaxResult statisGetOrderOfWeekByPerson(Date date) {
return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfWeek(date).toString(), DateUtil.endOfWeek(date).toString()));
public AjaxResult statisGetOrderOfWeekByPerson(Date date , Integer pageNum, Integer pageSize) {
return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfWeek(date).toString(), DateUtil.endOfWeek(date).toString(), pageNum, pageSize));
}
@Override
@ -151,8 +152,8 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
}
@Override
public AjaxResult statisGetOrderOfMonthByPerson(Date date) {
return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfMonth(date).toString(), DateUtil.endOfMonth(date).toString()));
public AjaxResult statisGetOrderOfMonthByPerson(Date date, Integer pageNum, Integer pageSize) {
return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfMonth(date).toString(), DateUtil.endOfMonth(date).toString(), pageNum, pageSize));
}
@Override

137
ruoyi-ui/src/views/fantang/orderStatistics/index.vue
View File

@ -61,137 +61,6 @@
</el-form-item>
</el-form>
<!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">-->
<!-- <el-form-item label="订单类型" prop="orderType">-->
<!-- <el-select v-model="queryParams.orderType" placeholder="请选择订单类型" clearable-->
<!-- size="small">-->
<!-- <el-option-->
<!-- v-for="item in orderTypeOptions"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="总价" prop="totalPrice">-->
<!-- <el-input-->
<!-- v-model="queryParams.totalPrice"-->
<!-- placeholder="请输入总价"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="折扣" prop="discount">-->
<!-- <el-input-->
<!-- v-model="queryParams.discount"-->
<!-- placeholder="请输入折扣"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实收" prop="receipts">-->
<!-- <el-input-->
<!-- v-model="queryParams.receipts"-->
<!-- placeholder="请输入实收"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="创建时间" prop="createAt">-->
<!-- <el-date-picker clearable size="small" style="width: 200px"-->
<!-- v-model="queryParams.createAt"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择创建时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="订单来源" prop="orderSrc">-->
<!-- <el-input-->
<!-- v-model="queryParams.orderSrc"-->
<!-- placeholder="请输入订单来源"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="订单现售" prop="currentPrice">-->
<!-- <el-input-->
<!-- v-model="queryParams.currentPrice"-->
<!-- placeholder="请输入订单现售"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="支付方式" prop="payType">-->
<!-- <el-select v-model="queryParams.payType" placeholder="请选择支付方式" clearable size="small">-->
<!-- <el-option label="请选择字典生成" value=""/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="核销时间" prop="writeOffAt">-->
<!-- <el-date-picker clearable size="small" style="width: 200px"-->
<!-- v-model="queryParams.writeOffAt"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择核销时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item>-->
<!-- <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-row :gutter="10" class="mb8">-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['fantang:order:add']"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['fantang:order:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['fantang:order:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['fantang:order:export']"-->
<!-- >导出-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
<!-- </el-row>-->
<el-table v-loading="loading" :data="orderCountList" border>
<el-table-column label="报餐部门" align="center" prop="departName"/>
<el-table-column label="报餐类型" align="center" prop="orderType" :formatter="formatOrderType"/>
@ -275,6 +144,8 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
selectDay: null,
statisticsType: null,
},
// 表单参数
form: {},
@ -342,7 +213,9 @@ export default {
}
if (this.formDay.selectDay != null && this.formDay.statisticsType != null) {
console.log(this.formDay)
getStatisGetOrderOfDay(this.formDay).then(response => {
this.queryParams.selectDay = this.formDay.selectDay;
this.queryParams.statisticsType = this.formDay.statisticsType;
getStatisGetOrderOfDay(this.queryParams).then(response => {
console.log(response)
this.orderCountList = response.data;
})