From 1734f2d56162a1fdb556632dc36fcef0ca57851c Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 16 十二月 2024 11:38:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java | 41 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 3 deletions(-) diff --git a/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java b/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java index 99bb104..e362032 100644 --- a/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java +++ b/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java @@ -1,9 +1,22 @@ package com.jilongda.manage.controller; -import org.springframework.web.bind.annotation.RequestMapping; +import com.jilongda.common.basic.ApiResult; +import com.jilongda.common.basic.PageInfo; +import com.jilongda.manage.model.TAppUser; +import com.jilongda.manage.model.TLineUp; +import com.jilongda.manage.model.TOptometryDetail; +import com.jilongda.manage.query.TLineUpQuery; +import com.jilongda.manage.query.TOptometryQuery; +import com.jilongda.manage.service.TAppUserService; +import com.jilongda.manage.service.TLineUpService; +import com.jilongda.manage.vo.TOptometryVO; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; +import java.util.List; /** * <p> @@ -16,6 +29,28 @@ @RestController @RequestMapping("/t-line-up") public class TLineUpController { - + @Autowired + private TLineUpService lineUpService; + @Autowired + private TAppUserService appUserService; + @ApiOperation(value = "获取排号分页列表",tags = "排号管理") + @PostMapping(value = "/pageList") + public ApiResult<PageInfo<TLineUp>> pageList(@RequestBody TLineUpQuery query) { + PageInfo<TLineUp> res = lineUpService.pageList(query); + return ApiResult.success(res); + } + @ApiOperation(value = "查询当前排队人数",tags = "排号a管理") + @PostMapping(value = "/getCount") + public ApiResult getCount() { + return ApiResult.success(lineUpService.lambdaQuery().eq(TLineUp::getStatus,1).list().size()); + } + @ApiOperation(value = "取消排队",tags = "排号管理") + @GetMapping(value = "/cancel") + public ApiResult cancel(Integer id) { + TLineUp byId = lineUpService.getById(id); + byId.setStatus(5); + lineUpService.updateById(byId); + return ApiResult.success(); + } } -- Gitblit v1.7.1