From f9eeba6e5eef419fb999417f2a2983429cf0782e Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Sun, 27 Jul 2025 21:08:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E8=BD=A6?=
 =?UTF-8?q?=E5=9E=8B=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=BD=A6?=
 =?UTF-8?q?=E5=9E=8B=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sczx/car/controller/CarModelController.java    | 14 ++++++++++----
 .../java/com/sczx/car/dto/CarModelSimpleDTO.java   |  2 +-
 src/main/resources/mapper/CarModelMapper.xml       |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

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.*;
 
 /**
  * <p>
@@ -28,6 +27,13 @@ public class CarModelController {
     @Autowired
     private CarModelService carModelService;
 
+    @ApiOperation(value = "分页查询门店车型列表")
+    @PostMapping("/pageStoreCarModel")
+    Result<IPage<CarModelSimpleDTO>> 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