diff --git a/src/main/java/com/sczx/car/controller/CarModelController.java b/src/main/java/com/sczx/car/controller/CarModelController.java index bd9ab26..e24fc24 100644 --- a/src/main/java/com/sczx/car/controller/CarModelController.java +++ b/src/main/java/com/sczx/car/controller/CarModelController.java @@ -1,16 +1,15 @@ package com.sczx.car.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.sczx.car.common.Result; import com.sczx.car.dto.CarModelSimpleDTO; +import com.sczx.car.dto.req.StoreCarModelReq; import com.sczx.car.service.CarModelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -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 org.springframework.web.bind.annotation.*; /** *

@@ -28,6 +27,13 @@ public class CarModelController { @Autowired private CarModelService carModelService; + @ApiOperation(value = "分页查询门店车型列表") + @PostMapping("/pageStoreCarModel") + Result> pageStoreCarModel(@RequestParam(name = "pageNo", required = false, defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize, + @RequestBody StoreCarModelReq storeCarModelReq){ + return Result.ok(carModelService.pageCarModelSimpleDTO(storeCarModelReq, pageNo, pageSize)); + } @ApiOperation(value = "根据车型id查询车型") @GetMapping("/getCarModelByModelId") diff --git a/src/main/java/com/sczx/car/dto/CarModelSimpleDTO.java b/src/main/java/com/sczx/car/dto/CarModelSimpleDTO.java index 01e8c38..2542cc6 100644 --- a/src/main/java/com/sczx/car/dto/CarModelSimpleDTO.java +++ b/src/main/java/com/sczx/car/dto/CarModelSimpleDTO.java @@ -24,7 +24,7 @@ public class CarModelSimpleDTO { private String brandName; @ApiModelProperty("租赁类型(时租/日租/按天数/以租代售),用逗号分隔") - private String batteryTypes; + private String rentalTypes; @ApiModelProperty("是否支持免押(0不支持 1支持)") private String depositFree; diff --git a/src/main/resources/mapper/CarModelMapper.xml b/src/main/resources/mapper/CarModelMapper.xml index abfa05d..850bf69 100644 --- a/src/main/resources/mapper/CarModelMapper.xml +++ b/src/main/resources/mapper/CarModelMapper.xml @@ -12,7 +12,7 @@ s.store_number AS store_number, cm.model_name AS model_name, cm.brand_name AS brand_name, - GROUP_CONCAT(DISTINCT r.rental_type SEPARATOR ',') AS battery_types, + GROUP_CONCAT(DISTINCT r.rental_type SEPARATOR ',') AS rental_types, MAX(r.deposit_free) AS deposit_free, MAX(r.auto_deduct) AS auto_deduct FROM