|
@@ -3,7 +3,9 @@ package com.ylx.web.controller.massage;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.ylx.common.annotation.Log;
|
|
|
import com.ylx.common.core.controller.BaseController;
|
|
|
+import com.ylx.common.enums.BusinessType;
|
|
|
import com.ylx.massage.domain.TConsumptionLog;
|
|
|
import com.ylx.massage.service.TConsumptionLogService;
|
|
|
import io.swagger.annotations.Api;
|
|
@@ -37,12 +39,14 @@ public class TConsumptionLogController extends BaseController {
|
|
|
* @param tConsumptionLog 查询实体
|
|
|
* @return 所有数据
|
|
|
*/
|
|
|
- @GetMapping
|
|
|
+ @GetMapping("selectAll")
|
|
|
@ApiOperation("分页查询数据")
|
|
|
- public R selectAll(Page<TConsumptionLog> page, TConsumptionLog tConsumptionLog) {
|
|
|
+ @Log(title = "分页查询数据", businessType = BusinessType.OTHER)
|
|
|
+ public R<Page<TConsumptionLog>> selectAll(Page<TConsumptionLog> page, TConsumptionLog tConsumptionLog) {
|
|
|
LambdaQueryWrapper<TConsumptionLog> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.eq(TConsumptionLog::getOpenId, tConsumptionLog.getOpenId())
|
|
|
- .eq(tConsumptionLog.getBillType() != null,TConsumptionLog::getBillType, tConsumptionLog.getBillType());
|
|
|
+ .eq(tConsumptionLog.getBillType() != null,TConsumptionLog::getBillType, tConsumptionLog.getBillType())
|
|
|
+ .orderByDesc(TConsumptionLog::getCreateTime);
|
|
|
return R.ok(this.tConsumptionLogService.page(page, queryWrapper));
|
|
|
}
|
|
|
|