From 609d91e1e62b1e8932b34b15b09baf02e7f09a93 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 10:36:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java
index 8a660fb..fabe13d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -10,9 +12,7 @@
import com.ruoyi.other.api.domain.TechnicianSubscribe;
import com.ruoyi.other.service.TechnicianSubscribeService;
import com.ruoyi.other.vo.TechnicianSubscribeVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -93,12 +93,15 @@
@GetMapping("/home/list")
- @ApiOperation(value = "列表", notes = "列表", tags = {"小程序-个人中心-我的预约"})
- public TableDataInfo<TechnicianSubscribeVO> homelist(@ApiParam(value = "状态 0=待服务，1=已服务，2=已取消 4 已到期") @RequestParam Integer status) {
- startPage();
- List<TechnicianSubscribeVO> list = technicianSubscribeService
- .getTechnicianSubscribeByUser(SecurityUtils.getUserId(), status);
- return getDataTable(list);
+ @ApiOperation(value = "列表", notes = "获取用户预约列表", tags = {"小程序-个人中心-我的预约"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "status", value = "状态 0=待服务，1=已服务，2=已取消, 4=已到期", required = true, dataType = "Integer", paramType = "query"),
+ @ApiImplicitParam(name = "current", value = "当前页码，从1开始", required = true, dataType = "Integer", paramType = "query"),
+ @ApiImplicitParam(name = "size", value = "每页显示数量，默认10", dataType = "Integer", paramType = "query")
+ })
+ public R<IPage<TechnicianSubscribeVO>> homelist(@RequestParam(value = "status", required = false) @ApiParam(value = "状态 0=待服务，1=已服务，2=已取消 4 已到期") Integer status,
+ @ApiParam(hidden = true) Page<TechnicianSubscribe> page) {
+ return R.ok(technicianSubscribeService.getTechnicianSubscribeByUser(page, SecurityUtils.getUserId(), status));
}
--
Gitblit v1.7.1