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 getAllCarPage(OtaManageApplyEO otaManageApplyEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + + List 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 { List queryList(); /** - * OTA管理列表和全车型列表-分页列表查询 + * OTA管理列表 * @param otaManageApplyEO * @return */ List getOtaPage(OtaManageApplyEO otaManageApplyEO); + /** + * 全车型列表-分页列表查询 + * @param otaManageApplyEO + * @return + */ + List 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 getAllCarPage(OtaManageApplyEO otaManageApplyEO) { + List 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 otaManageApplyEOList) { Collator comparator = Collator.getInstance(Locale.CHINESE);