From b044d9fbf64ebf7e7beae0b7c49e5f39c6ac620c Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期一, 09 十二月 2024 15:30:59 +0800 Subject: [PATCH] 12.9 --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java index cb7a0ba..d90cd97 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java @@ -1,37 +1,27 @@ package com.ruoyi.other.controller; -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; import com.ruoyi.common.security.service.TokenService; -import com.ruoyi.other.api.domain.GoodsEvaluate; -import com.ruoyi.other.api.domain.Technician; -import com.ruoyi.other.api.domain.TechnicianSubscribe; import com.ruoyi.other.api.feignClient.OrderClient; import com.ruoyi.other.service.GoodsEvaluateService; import com.ruoyi.other.service.TechnicianService; import com.ruoyi.other.service.TechnicianSubscribeService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.math.BigDecimal; -import java.time.LocalDateTime; import java.util.List; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.other.service.TechnicianService; + import com.ruoyi.other.vo.TechnicianDetailVO; import com.ruoyi.other.vo.TechnicianVO; -import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; /** * <p> @@ -43,7 +33,8 @@ */ @RestController @RequestMapping("/technician") -public class TechnicianController { +@Api(tags = "技师") +public class TechnicianController extends BaseController { @Resource private TechnicianService technicianService; @Resource @@ -116,8 +107,9 @@ */ @GetMapping("/technicianListByShopId") @ApiOperation(value = "技师列表", tags = {"技师列表-小程序"}) - public R<List<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) { - return R.ok(technicianService.getTechnicianListByShopId(shopId)); + public R<TableDataInfo<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) { + startPage(); + return R.ok(getDataTable(technicianService.getTechnicianListByShopId(shopId))); } /** -- Gitblit v1.7.1