From 3cbad2d8ed79ca0fbb0a3d41e5e799bd4a9a7d0c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 24 Aug 2023 11:08:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=BD=A6=E5=9E=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OtaManageApplyEOController.java | 12 ++++++++++++
 .../ota/service/IOtaManageApplyEOService.java  |  9 ++++++++-
 .../impl/OtaManageApplyEOServiceImpl.java      | 18 ++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java
index def65e5c2..82a8e27e3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java
@@ -57,6 +57,18 @@ public class OtaManageApplyEOController extends JeroController<OtaManageApplyEO,
 		Page pages = PageUtil.getPages(pageNo, pageSize, list);
 		return Result.OK(pages);
 	}
+
+	@AutoLog(value = "全车型列表-分页列表查询")
+	@ApiOperation(value="全车型列表-分页列表查询", notes="全车型列表-分页列表查询")
+	@GetMapping(value = "/getAllCarPage")
+	public Result<?> getAllCarPage(OtaManageApplyEO otaManageApplyEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+
+		List<OtaManageApplyEO> list = otaManageApplyEOService.getAllCarPage(otaManageApplyEO);
+		Page pages = PageUtil.getPages(pageNo, pageSize, list);
+		return Result.OK(pages);
+	}
 	/**
 	 * 分车型列表-分页列表查询
 	 *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
index d615f5dda..ba3ff0d77 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
@@ -66,12 +66,19 @@ public interface IOtaManageApplyEOService extends IService<OtaManageApplyEO> {
     List<OtaManageApplyEO> queryList();
 
 	/**
-	 * OTA管理列表和全车型列表-分页列表查询
+	 * OTA管理列表
 	 * @param otaManageApplyEO
 	 * @return
 	 */
 	List<OtaManageApplyEO> getOtaPage(OtaManageApplyEO otaManageApplyEO);
 
+	/**
+	 * 全车型列表-分页列表查询
+	 * @param otaManageApplyEO
+	 * @return
+	 */
+	List<OtaManageApplyEO> getAllCarPage(OtaManageApplyEO otaManageApplyEO);
+
 	/**
 	 * 分车型列表-分页列表查询
 	 * @param otaManageApplyEO
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index 25d9ec68b..667c49706 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -260,6 +260,24 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
         }
         return result;
     }
+    /**
+     * OTA管理列表和全车型列表-分页列表查询
+     *
+     * @param otaManageApplyEO
+     * @return
+     */
+    @Override
+    public List<OtaManageApplyEO> getAllCarPage(OtaManageApplyEO otaManageApplyEO) {
+        List<OtaManageApplyEO> otaManageApplyEOList = this.getBaseMapper().getOtaList(otaManageApplyEO);
+        if (!otaManageApplyEOList.isEmpty()) {
+            for (OtaManageApplyEO manageApplyEO : otaManageApplyEOList) {
+                manageApplyEO.setVdr(manageApplyEO.getId());
+            }
+            //表头排序
+            heartSort(otaManageApplyEO, otaManageApplyEOList);
+        }
+        return otaManageApplyEOList;
+    }
 
     private void heartSort(OtaManageApplyEO otaManageApplyEO, List<OtaManageApplyEO> otaManageApplyEOList) {
         Collator comparator = Collator.getInstance(Locale.CHINESE);