From d1f9fb4ee012c8fc20d30038312fcf4efd48c63a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=97=AD?= <2405973191@qq.com> Date: Mon, 26 Aug 2024 00:41:33 +0800 Subject: [PATCH] =?UTF-8?q?jx-=E6=9B=B4=E6=8D=A2=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DriveSchoolCourseAppletController.java | 14 +- ...riveSchoolCourseOrderAppletController.java | 14 +- .../DriveSchoolInfoAppletController.java | 10 +- .../admin/DriveCarBindController.java | 33 +-- .../admin/DriveContractTestController.java | 28 +- .../admin/DriveSchoolBookingController.java | 30 +-- .../admin/DriveSchoolCarController.java | 18 +- .../admin/DriveSchoolCarRepairController.java | 18 +- .../admin/DriveSchoolCheckController.java | 32 +-- .../admin/DriveSchoolCoachController.java | 62 ++--- .../admin/DriveSchoolContractController.java | 32 +-- .../admin/DriveSchoolCourseController.java | 32 +-- .../DriveSchoolCourseOrderController.java | 30 +-- .../DriveSchoolCredentialsController.java | 30 +-- .../DriveSchoolDailyManagementController.java | 30 +-- .../admin/DriveSchoolDeductController.java | 30 +-- .../admin/DriveSchoolDialController.java | 39 ++- .../admin/DriveSchoolDynamicController.java | 31 ++- .../admin/DriveSchoolExamPassController.java | 49 ++-- .../admin/DriveSchoolFacilityController.java | 30 +-- .../admin/DriveSchoolFileController.java | 30 +-- .../admin/DriveSchoolInfoController.java | 28 +- .../admin/DriveSchoolInsuranceController.java | 30 +-- .../admin/DriveSchoolNewsController.java | 31 ++- .../admin/DriveSchoolNoticeController.java | 28 +- .../admin/DriveSchoolPhoneController.java | 30 +-- .../DriveSchoolReimbursementController.java | 30 +-- ...riveSchoolReservationCourseController.java | 43 ++-- .../admin/DriveSchoolSeparateController.java | 30 +-- .../DriveSchoolTeachingJournalController.java | 3 - .../admin/DriveSchoolTextController.java | 30 +-- .../admin/DriveSchoolUpkeepController.java | 31 +-- .../controller/admin/SopeNessController.java | 32 ++- .../jx/core/controller/BaseController.java | 12 +- .../yudao/module/jx/core/page/BaseEntity.java | 114 --------- .../module/jx/core/page/TableDataInfo.java | 85 ------ .../yudao/module/jx/core/page/TenantBaDO.java | 64 +++++ .../yudao/module/jx/domain/DriveCarBind.java | 4 +- .../module/jx/domain/DriveContractTest.java | 4 +- .../module/jx/domain/DriveSchoolCar.java | 4 +- .../jx/domain/DriveSchoolCarRepair.java | 4 +- .../module/jx/domain/DriveSchoolCheck.java | 4 +- .../module/jx/domain/DriveSchoolCoach.java | 4 +- .../module/jx/domain/DriveSchoolContract.java | 4 +- .../module/jx/domain/DriveSchoolCourse.java | 4 +- .../jx/domain/DriveSchoolCourseOrder.java | 4 +- .../jx/domain/DriveSchoolCredentials.java | 4 +- .../jx/domain/DriveSchoolDailyManagement.java | 4 +- .../module/jx/domain/DriveSchoolDeduct.java | 4 +- .../module/jx/domain/DriveSchoolDial.java | 4 +- .../module/jx/domain/DriveSchoolDynamic.java | 4 +- .../module/jx/domain/DriveSchoolExamPass.java | 4 +- .../module/jx/domain/DriveSchoolFacility.java | 4 +- .../module/jx/domain/DriveSchoolFile.java | 4 +- .../module/jx/domain/DriveSchoolInfo.java | 4 +- .../jx/domain/DriveSchoolInsurance.java | 4 +- .../module/jx/domain/DriveSchoolNews.java | 4 +- .../module/jx/domain/DriveSchoolNotice.java | 4 +- .../module/jx/domain/DriveSchoolPhone.java | 4 +- .../jx/domain/DriveSchoolReimbursement.java | 4 +- .../domain/DriveSchoolReservationCourse.java | 4 +- .../module/jx/domain/DriveSchoolSeparate.java | 4 +- .../module/jx/domain/DriveSchoolSwiper.java | 4 +- .../jx/domain/DriveSchoolTeachingJournal.java | 5 +- .../module/jx/domain/DriveSchoolText.java | 4 +- .../module/jx/domain/DriveSchoolUpkeep.java | 4 +- .../yudao/module/jx/domain/SopeNess.java | 4 +- .../module/jx/mapper/DriveCarBindMapper.java | 5 +- .../jx/mapper/DriveContractTestMapper.java | 5 +- .../jx/mapper/DriveSchoolCarMapper.java | 6 +- .../jx/mapper/DriveSchoolCarRepairMapper.java | 6 +- .../jx/mapper/DriveSchoolCheckMapper.java | 5 +- .../jx/mapper/DriveSchoolCoachMapper.java | 6 +- .../jx/mapper/DriveSchoolContractMapper.java | 5 +- .../jx/mapper/DriveSchoolCourseMapper.java | 8 +- .../mapper/DriveSchoolCourseOrderMapper.java | 5 +- .../mapper/DriveSchoolCredentialsMapper.java | 5 +- .../DriveSchoolDailyManagementMapper.java | 5 +- .../jx/mapper/DriveSchoolDeductMapper.java | 5 +- .../jx/mapper/DriveSchoolDialMapper.java | 6 +- .../jx/mapper/DriveSchoolDynamicMapper.java | 7 +- .../jx/mapper/DriveSchoolExamPassMapper.java | 9 +- .../jx/mapper/DriveSchoolFacilityMapper.java | 5 +- .../jx/mapper/DriveSchoolFileMapper.java | 6 +- .../jx/mapper/DriveSchoolInfoMapper.java | 5 +- .../jx/mapper/DriveSchoolInsuranceMapper.java | 5 +- .../jx/mapper/DriveSchoolNewsMapper.java | 6 +- .../jx/mapper/DriveSchoolNoticeMapper.java | 6 +- .../jx/mapper/DriveSchoolPhoneMapper.java | 6 +- .../DriveSchoolReimbursementMapper.java | 5 +- .../DriveSchoolReservationCourseMapper.java | 4 +- .../jx/mapper/DriveSchoolSeparateMapper.java | 5 +- .../jx/mapper/DriveSchoolTextMapper.java | 5 +- .../jx/mapper/DriveSchoolUpkeepMapper.java | 5 +- .../module/jx/mapper/SopeNessMapper.java | 5 +- .../payment/api/DriveSchoolPayController.java | 242 ++++++++++++++++++ .../jx/payment/entity/DriveSchoolBooking.java | 4 +- .../jx/payment/entity/DriveSchoolPay.java | 7 +- .../module/jx/payment/entity/commentVo.java | 4 +- .../mapper/DriveSchoolBookingMapper.java | 5 +- .../payment/mapper/DriveSchoolPayMapper.java | 14 +- .../service/DriveSchoolPayService.java | 12 +- .../impl/DriveSchoolPayServiceImpl.java | 39 +-- .../jx/service/DriveSchoolBookingService.java | 4 +- .../jx/service/IDriveCarBindService.java | 4 +- .../jx/service/IDriveContractTestService.java | 4 +- .../service/IDriveSchoolCarRepairService.java | 5 +- .../jx/service/IDriveSchoolCarService.java | 5 +- .../jx/service/IDriveSchoolCheckService.java | 5 +- .../jx/service/IDriveSchoolCoachService.java | 7 +- .../service/IDriveSchoolContractService.java | 4 +- .../IDriveSchoolCourseOrderService.java | 4 +- .../jx/service/IDriveSchoolCourseService.java | 8 +- .../IDriveSchoolCredentialsService.java | 4 +- .../IDriveSchoolDailyManagementService.java | 4 +- .../jx/service/IDriveSchoolDeductService.java | 4 +- .../jx/service/IDriveSchoolDialService.java | 6 +- .../service/IDriveSchoolDynamicService.java | 5 +- .../service/IDriveSchoolExamPassService.java | 8 +- .../service/IDriveSchoolFacilityService.java | 4 +- .../jx/service/IDriveSchoolFileService.java | 4 +- .../jx/service/IDriveSchoolInfoService.java | 7 +- .../service/IDriveSchoolInsuranceService.java | 4 +- .../jx/service/IDriveSchoolNewsService.java | 5 +- .../jx/service/IDriveSchoolNoticeService.java | 5 +- .../jx/service/IDriveSchoolPhoneService.java | 4 +- .../IDriveSchoolReimbursementService.java | 4 +- .../IDriveSchoolReservationCourseService.java | 7 +- .../service/IDriveSchoolSeparateService.java | 4 +- .../jx/service/IDriveSchoolTextService.java | 4 +- .../jx/service/IDriveSchoolUpkeepService.java | 4 +- .../module/jx/service/ISopeNessService.java | 4 +- .../service/impl/DriveCarBindServiceImpl.java | 8 +- .../impl/DriveContractTestServiceImpl.java | 8 +- .../impl/DriveSchoolBookingServiceImpl.java | 6 +- .../impl/DriveSchoolCarRepairServiceImpl.java | 26 +- .../impl/DriveSchoolCarServiceImpl.java | 18 +- .../impl/DriveSchoolCheckServiceImpl.java | 17 +- .../impl/DriveSchoolCoachServiceImpl.java | 32 ++- .../impl/DriveSchoolContractServiceImpl.java | 12 +- .../DriveSchoolCourseOrderServiceImpl.java | 8 +- .../impl/DriveSchoolCourseServiceImpl.java | 29 ++- .../DriveSchoolCredentialsServiceImpl.java | 10 +- ...DriveSchoolDailyManagementServiceImpl.java | 10 +- .../impl/DriveSchoolDeductServiceImpl.java | 11 +- .../impl/DriveSchoolDialServiceImpl.java | 12 +- .../impl/DriveSchoolDynamicServiceImpl.java | 25 +- .../impl/DriveSchoolExamPassServiceImpl.java | 23 +- .../impl/DriveSchoolFacilityServiceImpl.java | 40 +-- .../impl/DriveSchoolFileServiceImpl.java | 11 +- .../impl/DriveSchoolInfoServiceImpl.java | 48 ++-- .../impl/DriveSchoolInsuranceServiceImpl.java | 11 +- .../impl/DriveSchoolNewsServiceImpl.java | 25 +- .../impl/DriveSchoolNoticeServiceImpl.java | 11 +- .../impl/DriveSchoolPhoneServiceImpl.java | 8 +- .../DriveSchoolReimbursementServiceImpl.java | 8 +- ...iveSchoolReservationCourseServiceImpl.java | 18 +- .../impl/DriveSchoolSeparateServiceImpl.java | 8 +- .../impl/DriveSchoolSwiperServiceImpl.java | 2 +- .../impl/DriveSchoolTextServiceImpl.java | 6 +- .../impl/DriveSchoolUpkeepServiceImpl.java | 8 +- .../jx/service/impl/SopeNessServiceImpl.java | 14 +- .../mapper/jx/DriveCarBindMapper.xml | 26 +- .../mapper/jx/DriveContractTestMapper.xml | 20 +- .../mapper/jx/DriveSchoolBookingMapper.xml | 8 +- .../mapper/jx/DriveSchoolCarMapper.xml | 65 +++-- .../mapper/jx/DriveSchoolCarRepairMapper.xml | 47 ++-- .../mapper/jx/DriveSchoolCheckMapper.xml | 34 +-- .../mapper/jx/DriveSchoolCoachMapper.xml | 59 +++-- .../mapper/jx/DriveSchoolContractMapper.xml | 24 +- .../mapper/jx/DriveSchoolCourseMapper.xml | 74 +++--- .../jx/DriveSchoolCourseOrderMapper.xml | 42 +-- .../jx/DriveSchoolCredentialsMapper.xml | 42 +-- .../jx/DriveSchoolDailyManagementMapper.xml | 34 +-- .../mapper/jx/DriveSchoolDeductMapper.xml | 32 ++- .../mapper/jx/DriveSchoolDialMapper.xml | 41 ++- .../mapper/jx/DriveSchoolDynamicMapper.xml | 35 ++- .../mapper/jx/DriveSchoolExamPassMapper.xml | 58 ++--- .../mapper/jx/DriveSchoolFacilityMapper.xml | 32 +-- .../mapper/jx/DriveSchoolFileMapper.xml | 32 ++- .../mapper/jx/DriveSchoolInfoMapper.xml | 40 +-- .../mapper/jx/DriveSchoolInsuranceMapper.xml | 34 +-- .../mapper/jx/DriveSchoolNewsMapper.xml | 35 ++- .../mapper/jx/DriveSchoolNoticeMapper.xml | 32 ++- .../mapper/jx/DriveSchoolPayMapper.xml | 148 +++++------ .../mapper/jx/DriveSchoolPhoneMapper.xml | 24 +- .../jx/DriveSchoolReimbursementMapper.xml | 26 +- .../jx/DriveSchoolReservationCourseMapper.xml | 32 +-- .../mapper/jx/DriveSchoolSeparateMapper.xml | 22 +- .../mapper/jx/DriveSchoolSwiperMapper.xml | 16 +- .../jx/DriveSchoolTeachingJournalMapper.xml | 12 +- .../mapper/jx/DriveSchoolTextMapper.xml | 18 +- .../mapper/jx/DriveSchoolUpkeepMapper.xml | 30 +-- .../resources/mapper/jx/SopeNessMapper.xml | 38 +-- 194 files changed, 2092 insertions(+), 1581 deletions(-) delete mode 100644 dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/BaseEntity.java delete mode 100644 dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/TableDataInfo.java create mode 100644 dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/TenantBaDO.java create mode 100644 dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/api/DriveSchoolPayController.java diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCourseAppletController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCourseAppletController.java index 635b6e50..55e0e8d8 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCourseAppletController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCourseAppletController.java @@ -2,11 +2,12 @@ package cn.iocoder.yudao.module.appBase.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourse; import cn.iocoder.yudao.module.jx.service.DrivePayService; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCourseService; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.tencentcloudapi.common.exception.TencentCloudSDKException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -36,7 +37,7 @@ public class DriveSchoolCourseAppletController extends BaseController @GetMapping("/limtList") public CommonResult limtList(DriveSchoolCourse driveSchoolCourse) { - List list = driveSchoolCourseService.selectDriveSchoolCourseAppletList(driveSchoolCourse); + List list = driveSchoolCourseService.selectDriveSchoolCourseAppletListAll(driveSchoolCourse); if (CollectionUtils.isNotEmpty(list)){ if (list.size()>3){ list.subList(0,3); @@ -54,11 +55,12 @@ public class DriveSchoolCourseAppletController extends BaseController * 查询驾校课程分类列表（全部） */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolCourse driveSchoolCourse) + public CommonResult> list(DriveSchoolCourse driveSchoolCourse) { - startPage(); - List list = driveSchoolCourseService.selectDriveSchoolCourseAppletList(driveSchoolCourse); - return getDataTable(list); + Page page = new Page<>(driveSchoolCourse.getPageNum(), driveSchoolCourse.getPageSize()); + IPage driveSchoolCourseIPage = driveSchoolCourseService.selectDriveSchoolCourseAppList(driveSchoolCourse, page); + return CommonResult.success(driveSchoolCourseIPage); + //return getDataTable(list); } /** diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCourseOrderAppletController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCourseOrderAppletController.java index 0d1e7f54..ce738eae 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCourseOrderAppletController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCourseOrderAppletController.java @@ -2,14 +2,13 @@ package cn.iocoder.yudao.module.appBase.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourseOrder; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCourseOrderService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * 驾照报名订单Controller * @@ -27,11 +26,12 @@ public class DriveSchoolCourseOrderAppletController extends BaseController * 查询驾照报名订单列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolCourseOrder driveSchoolCourseOrder) + public CommonResult> list(DriveSchoolCourseOrder driveSchoolCourseOrder) { - startPage(); - List list = driveSchoolCourseOrderService.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder); - return getDataTable(list); + Page page = new Page<>(driveSchoolCourseOrder.getPageNum(), driveSchoolCourseOrder.getPageSize()); + IPage driveSchoolCourseOrderIPage = driveSchoolCourseOrderService.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder, page); + return CommonResult.success(driveSchoolCourseOrderIPage); + //return getDataTable(list); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolInfoAppletController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolInfoAppletController.java index f11e36f3..ce66a85c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolInfoAppletController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolInfoAppletController.java @@ -2,9 +2,10 @@ package cn.iocoder.yudao.module.appBase.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolInfo; import cn.iocoder.yudao.module.jx.service.IDriveSchoolInfoService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -28,10 +29,11 @@ public class DriveSchoolInfoAppletController extends BaseController * 查询驾校信息列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolInfo driveSchoolInfo) + public CommonResult> list(DriveSchoolInfo driveSchoolInfo) { - startPage(); - return driveSchoolInfoService.selectDriveSchoolInfoAppletList(driveSchoolInfo); + Page page = new Page<>(driveSchoolInfo.getPageNum(), driveSchoolInfo.getPageSize()); + IPage driveSchoolInfoIPage = driveSchoolInfoService.selectDriveSchoolInfoAppletList(driveSchoolInfo, page); + return success(driveSchoolInfoIPage); } /** diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveCarBindController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveCarBindController.java index 2941d0ed..d8c29164 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveCarBindController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveCarBindController.java @@ -2,19 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveCarBind; import cn.iocoder.yudao.module.jx.service.IDriveCarBindService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; -import com.wechat.pay.java.service.payrollcard.model.BusinessType; -import lombok.extern.java.Log; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 车辆绑定（教练）Controller * @@ -32,23 +26,24 @@ public class DriveCarBindController extends BaseController * 查询车辆绑定（教练）列表 */ @GetMapping("/list") - public TableDataInfo list(DriveCarBind driveCarBind) + public CommonResult> list(DriveCarBind driveCarBind) { - startPage(); - List list = driveCarBindService.selectDriveCarBindList(driveCarBind); - return getDataTable(list); + Page page = new Page<>(driveCarBind.getPageNum(), driveCarBind.getPageSize()); + IPage driveCarBindIPage = driveCarBindService.selectDriveCarBindList(driveCarBind, page); + return CommonResult.success(driveCarBindIPage); + //return getDataTable(list); } /** * 导出车辆绑定（教练）列表 */ - @PostMapping("/export") - public void export(HttpServletResponse response, DriveCarBind driveCarBind) - { - List list = driveCarBindService.selectDriveCarBindList(driveCarBind); - ExcelUtil util = new ExcelUtil(DriveCarBind.class); - util.exportExcel(response, list, "车辆绑定（教练）数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveCarBind driveCarBind) +// { +// List list = driveCarBindService.selectDriveCarBindList(driveCarBind); +// ExcelUtil util = new ExcelUtil(DriveCarBind.class); +// util.exportExcel(response, list, "车辆绑定（教练）数据"); +// } /** * 获取车辆绑定（教练）详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveContractTestController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveContractTestController.java index f654794c..007543be 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveContractTestController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveContractTestController.java @@ -2,12 +2,11 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveContractTest; import cn.iocoder.yudao.module.jx.service.IDriveContractTestService; import cn.iocoder.yudao.module.jx.utils.ExcelUtil; -import com.wechat.pay.java.service.payrollcard.model.BusinessType; -import lombok.extern.java.Log; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,23 +30,24 @@ public class DriveContractTestController extends BaseController * 查询合同模板列表 */ @GetMapping("/list") - public TableDataInfo list(DriveContractTest driveContractTest) + public CommonResult> list(DriveContractTest driveContractTest) { - startPage(); - List list = driveContractTestService.selectDriveContractTestList(driveContractTest); - return getDataTable(list); + Page page = new Page<>(driveContractTest.getPageNum(), driveContractTest.getPageSize()); + IPage driveContractTestIPage = driveContractTestService.selectDriveContractTestList(driveContractTest, page); + return CommonResult.success(driveContractTestIPage); + //return getDataTable(list); } /** * 导出合同模板列表 */ - @PostMapping("/export") - public void export(HttpServletResponse response, DriveContractTest driveContractTest) - { - List list = driveContractTestService.selectDriveContractTestList(driveContractTest); - ExcelUtil util = new ExcelUtil(DriveContractTest.class); - util.exportExcel(response, list, "合同模板数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveContractTest driveContractTest) +// { +// List list = driveContractTestService.selectDriveContractTestList(driveContractTest); +// ExcelUtil util = new ExcelUtil(DriveContractTest.class); +// util.exportExcel(response, list, "合同模板数据"); +// } /** * 获取合同模板详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolBookingController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolBookingController.java index acb5988a..ec507172 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolBookingController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolBookingController.java @@ -2,14 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; +import cn.iocoder.yudao.module.jx.domain.DriveSchoolTeachingJournal; import cn.iocoder.yudao.module.jx.payment.entity.DriveSchoolBooking; import cn.iocoder.yudao.module.jx.service.DriveSchoolBookingService; import cn.iocoder.yudao.module.jx.utils.ExcelUtil; -import com.wechat.pay.java.service.payrollcard.model.BusinessType; -import lombok.extern.java.Log; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -32,11 +31,12 @@ public class DriveSchoolBookingController extends BaseController * 查询预约列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolBooking driveSchoolBooking) + public CommonResult> list(DriveSchoolBooking driveSchoolBooking) { - startPage(); - List list = driveSchoolBookingService.selectDriveSchoolBookingList(driveSchoolBooking); - return getDataTable(list); + Page page = new Page<>(driveSchoolBooking.getPageNum(), driveSchoolBooking.getPageSize()); + IPage driveSchoolBookingIPage = driveSchoolBookingService.selectDriveSchoolBookingList(driveSchoolBooking, page); + return success(driveSchoolBookingIPage); + //return getDataTable(list); } /** * 查询预约列表 @@ -51,13 +51,13 @@ public class DriveSchoolBookingController extends BaseController /** * 导出预约列表 */ - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolBooking driveSchoolBooking) - { - List list = driveSchoolBookingService.selectDriveSchoolBookingList(driveSchoolBooking); - ExcelUtil util = new ExcelUtil(DriveSchoolBooking.class); - util.exportExcel(response, list, "预约数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolBooking driveSchoolBooking) +// { +// List list = driveSchoolBookingService.selectDriveSchoolBookingList(driveSchoolBooking); +// ExcelUtil util = new ExcelUtil(DriveSchoolBooking.class); +// util.exportExcel(response, list, "预约数据"); +// } /** * 获取预约详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCarController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCarController.java index e5821863..493a2c5b 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCarController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCarController.java @@ -3,14 +3,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCar; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCarService; import cn.iocoder.yudao.module.jx.utils.ExcelUtil; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import com.wechat.pay.java.service.payrollcard.model.BusinessType; -import lombok.extern.java.Log; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -39,11 +38,12 @@ public class DriveSchoolCarController extends BaseController * 查询车辆信息列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolCar driveSchoolCar) + public CommonResult> list(DriveSchoolCar driveSchoolCar) { - startPage(); - List list = driveSchoolCarService.selectDriveSchoolCarList(driveSchoolCar); - return getDataTable(list); + Page page = new Page<>(driveSchoolCar.getPageNum(), driveSchoolCar.getPageSize()); + IPage driveSchoolCarIPage = driveSchoolCarService.selectDriveSchoolCarList(driveSchoolCar, page); + return CommonResult.success(driveSchoolCarIPage); + //return getDataTable(list); } /** @@ -52,7 +52,7 @@ public class DriveSchoolCarController extends BaseController @GetMapping("/listAll") public CommonResult listAll(DriveSchoolCar driveSchoolCar) { - List list = driveSchoolCarService.selectDriveSchoolCarList(driveSchoolCar); + List list = driveSchoolCarService.selectDriveSchoolCarListAll(driveSchoolCar); return CommonResult.success(list); } @@ -62,7 +62,7 @@ public class DriveSchoolCarController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, DriveSchoolCar driveSchoolCar) { - List list = driveSchoolCarService.selectDriveSchoolCarList(driveSchoolCar); + List list = driveSchoolCarService.selectDriveSchoolCarListAll(driveSchoolCar); ExcelUtil util = new ExcelUtil(DriveSchoolCar.class); util.exportExcel(response, list, "车辆信息数据"); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCarRepairController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCarRepairController.java index 0ab1e56c..4cca4bf0 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCarRepairController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCarRepairController.java @@ -2,12 +2,11 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCarRepair; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCarRepairService; import cn.iocoder.yudao.module.jx.utils.ExcelUtil; -import com.wechat.pay.java.service.payrollcard.model.BusinessType; -import lombok.extern.java.Log; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,11 +30,12 @@ public class DriveSchoolCarRepairController extends BaseController * 查询车辆维修记录列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolCarRepair driveSchoolCarRepair) + public CommonResult> list(DriveSchoolCarRepair driveSchoolCarRepair) { - startPage(); - List list = driveSchoolCarRepairService.selectDriveSchoolCarRepairList(driveSchoolCarRepair); - return getDataTable(list); + Page page = new Page<>(driveSchoolCarRepair.getPageNum(), driveSchoolCarRepair.getPageSize()); + IPage driveSchoolCarRepairIPage = driveSchoolCarRepairService.selectDriveSchoolCarRepairList(driveSchoolCarRepair, page); + return CommonResult.success(driveSchoolCarRepairIPage); + //return getDataTable(list); } /** @@ -44,7 +44,7 @@ public class DriveSchoolCarRepairController extends BaseController @GetMapping("/listAll") public CommonResult listAll(DriveSchoolCarRepair driveSchoolCarRepair) { - List list = driveSchoolCarRepairService.selectDriveSchoolCarRepairList(driveSchoolCarRepair); + List list = driveSchoolCarRepairService.selectDriveSchoolCarRepairListAll(driveSchoolCarRepair); return CommonResult.success(list); } @@ -54,7 +54,7 @@ public class DriveSchoolCarRepairController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, DriveSchoolCarRepair driveSchoolCarRepair) { - List list = driveSchoolCarRepairService.selectDriveSchoolCarRepairList(driveSchoolCarRepair); + List list = driveSchoolCarRepairService.selectDriveSchoolCarRepairListAll(driveSchoolCarRepair); ExcelUtil util = new ExcelUtil(DriveSchoolCarRepair.class); util.exportExcel(response, list, "车辆维修记录数据"); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCheckController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCheckController.java index 5cb9dffe..4b47829e 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCheckController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCheckController.java @@ -2,18 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCheck; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCheckService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; -import com.wechat.pay.java.service.payrollcard.model.BusinessType; -import lombok.extern.java.Log; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 车检管理Controller * @@ -31,23 +26,24 @@ public class DriveSchoolCheckController extends BaseController * 查询车检管理列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolCheck driveSchoolCheck) + public CommonResult> list(DriveSchoolCheck driveSchoolCheck) { - startPage(); - List list = driveSchoolCheckService.selectDriveSchoolCheckList(driveSchoolCheck); - return getDataTable(list); + Page page = new Page<>(driveSchoolCheck.getPageNum(), driveSchoolCheck.getPageSize()); + IPage driveSchoolCheckIPage = driveSchoolCheckService.selectDriveSchoolCheckList(driveSchoolCheck, page); + return success(driveSchoolCheckIPage); + //return getDataTable(list); } /** * 导出车检管理列表 */ - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolCheck driveSchoolCheck) - { - List list = driveSchoolCheckService.selectDriveSchoolCheckList(driveSchoolCheck); - ExcelUtil util = new ExcelUtil(DriveSchoolCheck.class); - util.exportExcel(response, list, "车检管理数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolCheck driveSchoolCheck) +// { +// List list = driveSchoolCheckService.selectDriveSchoolCheckList(driveSchoolCheck); +// ExcelUtil util = new ExcelUtil(DriveSchoolCheck.class); +// util.exportExcel(response, list, "车检管理数据"); +// } /** * 获取车检管理详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCoachController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCoachController.java index a13caa97..96d955bf 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCoachController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCoachController.java @@ -3,14 +3,14 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; import cn.iocoder.yudao.module.jx.core.page.PageDomain; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.core.page.TableSupport; import cn.iocoder.yudao.module.jx.core.text.HttpStatus; +import cn.iocoder.yudao.module.jx.domain.DriveSchoolCheck; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCoach; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCoachService; import cn.iocoder.yudao.module.jx.utils.ExcelUtil; -import com.wechat.pay.java.service.payrollcard.model.BusinessType; -import lombok.extern.java.Log; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -18,7 +18,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.stream.Collectors; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; /** * 驾校教练Controller @@ -41,40 +40,43 @@ public class DriveSchoolCoachController extends BaseController /** * 查询驾校教练列表 */ - /* @GetMapping("/list") + @GetMapping("/list") public CommonResult list(DriveSchoolCoach driveSchoolCoach) { - List list = driveSchoolCoachService.selectDriveSchoolCoachList(driveSchoolCoach); + List list = driveSchoolCoachService.selectDriveSchoolCoachListAll(driveSchoolCoach); return CommonResult.success(list); - }*/ - - @GetMapping("/list") - public TableDataInfo lists(DriveSchoolCoach driveSchoolCoach) - { - List list = driveSchoolCoachService.selectDriveSchoolCoachList(driveSchoolCoach); - PageDomain pageDomain = TableSupport.buildPageRequest(); - Integer pageNum = pageDomain.getPageNum(); - Integer pageSize = 20; - - int num = 100; - list = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - TableDataInfo rspData = new TableDataInfo(); - rspData.setCode(HttpStatus.SUCCESS); - rspData.setRows(list); - rspData.setTotal(num); - return rspData; } +// @GetMapping("/list") +// public CommonResult> lists(DriveSchoolCoach driveSchoolCoach) +// { +// Page page = new Page<>(driveSchoolCoach.getPageNum(), driveSchoolCoach.getPageSize()); +// +// IPage driveSchoolCoachIPage = driveSchoolCoachService.selectDriveSchoolCoachList(driveSchoolCoach, page); +// return CommonResult.success(driveSchoolCoachIPage); +//// PageDomain pageDomain = TableSupport.buildPageRequest(); +//// Integer pageNum = pageDomain.getPageNum(); +//// Integer pageSize = 20; +//// +//// int num = 100; +//// list = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); +//// CommonResult> rspData = new CommonResult>(); +//// rspData.setCode(HttpStatus.SUCCESS); +//// rspData.set(list); +//// rspData.setTotal(num); +//// return rspData; +// } + /** * 导出驾校教练列表 */ - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolCoach driveSchoolCoach) - { - List list = driveSchoolCoachService.selectDriveSchoolCoachList(driveSchoolCoach); - ExcelUtil util = new ExcelUtil(DriveSchoolCoach.class); - util.exportExcel(response, list, "驾校教练数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolCoach driveSchoolCoach) +// { +// List list = driveSchoolCoachService.selectDriveSchoolCoachList(driveSchoolCoach); +// ExcelUtil util = new ExcelUtil(DriveSchoolCoach.class); +// util.exportExcel(response, list, "驾校教练数据"); +// } /** * 获取驾校教练详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolContractController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolContractController.java index 48be513c..1d2ddd87 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolContractController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolContractController.java @@ -2,18 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolContract; import cn.iocoder.yudao.module.jx.service.IDriveSchoolContractService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; -import com.wechat.pay.java.service.payrollcard.model.BusinessType; -import lombok.extern.java.Log; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 驾校合同Controller * @@ -31,23 +26,24 @@ public class DriveSchoolContractController extends BaseController * 查询驾校合同列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolContract driveSchoolContract) + public CommonResult> list(DriveSchoolContract driveSchoolContract) { - startPage(); - List list = driveSchoolContractService.selectDriveSchoolContractList(driveSchoolContract); - return getDataTable(list); + Page page = new Page<>(driveSchoolContract.getPageNum(), driveSchoolContract.getPageSize()); + IPage driveSchoolContractIPage = driveSchoolContractService.selectDriveSchoolContractList(driveSchoolContract, page); + return success(driveSchoolContractIPage); + //return getDataTable(list); } /** * 导出驾校合同列表 */ - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolContract driveSchoolContract) - { - List list = driveSchoolContractService.selectDriveSchoolContractList(driveSchoolContract); - ExcelUtil util = new ExcelUtil(DriveSchoolContract.class); - util.exportExcel(response, list, "驾校合同数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolContract driveSchoolContract) +// { +// List list = driveSchoolContractService.selectDriveSchoolContractList(driveSchoolContract); +// ExcelUtil util = new ExcelUtil(DriveSchoolContract.class); +// util.exportExcel(response, list, "驾校合同数据"); +// } /** * 获取驾校合同详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseController.java index 57f9aa8d..ecb40e25 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseController.java @@ -2,18 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourse; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCourseService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; -import com.wechat.pay.java.service.payrollcard.model.BusinessType; -import lombok.extern.java.Log; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 驾校课程分类Controller * @@ -31,11 +26,12 @@ public class DriveSchoolCourseController extends BaseController * 查询驾校课程分类列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolCourse driveSchoolCourse) + public CommonResult> list(DriveSchoolCourse driveSchoolCourse) { - startPage(); - List list = driveSchoolCourseService.selectDriveSchoolCourseList(driveSchoolCourse); - return getDataTable(list); + Page page = new Page<>(driveSchoolCourse.getPageNum(), driveSchoolCourse.getPageSize()); + IPage driveSchoolCourseIPage = driveSchoolCourseService.selectDriveSchoolCourseList(driveSchoolCourse, page); + return CommonResult.success(driveSchoolCourseIPage); + //return getDataTable(list); } /** @@ -51,13 +47,13 @@ public class DriveSchoolCourseController extends BaseController /** * 导出驾校课程分类列表 */ - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolCourse driveSchoolCourse) - { - List list = driveSchoolCourseService.selectDriveSchoolCourseList(driveSchoolCourse); - ExcelUtil util = new ExcelUtil(DriveSchoolCourse.class); - util.exportExcel(response, list, "驾校课程分类数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolCourse driveSchoolCourse) +// { +// List list = driveSchoolCourseService.selectDriveSchoolCourseList(driveSchoolCourse); +// ExcelUtil util = new ExcelUtil(DriveSchoolCourse.class); +// util.exportExcel(response, list, "驾校课程分类数据"); +// } /** * 获取驾校课程分类详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseOrderController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseOrderController.java index 8fa456b3..6f2a8727 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseOrderController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseOrderController.java @@ -3,16 +3,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourseOrder; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCourseOrderService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 驾照报名订单Controller * @@ -30,24 +27,25 @@ public class DriveSchoolCourseOrderController extends BaseController * 查询驾照报名订单列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolCourseOrder driveSchoolCourseOrder) + public CommonResult> list(DriveSchoolCourseOrder driveSchoolCourseOrder) { - startPage(); - List list = driveSchoolCourseOrderService.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder); - return getDataTable(list); + Page page = new Page<>(driveSchoolCourseOrder.getPageNum(), driveSchoolCourseOrder.getPageSize()); + IPage driveSchoolCourseOrderIPage = driveSchoolCourseOrderService.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder, page); + return success(driveSchoolCourseOrderIPage); + //return getDataTable(list); } /** * 导出驾照报名订单列表 */ //@Log(title = "驾照报名订单", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolCourseOrder driveSchoolCourseOrder) - { - List list = driveSchoolCourseOrderService.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder); - ExcelUtil util = new ExcelUtil(DriveSchoolCourseOrder.class); - util.exportExcel(response, list, "驾照报名订单数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolCourseOrder driveSchoolCourseOrder) +// { +// List list = driveSchoolCourseOrderService.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder); +// ExcelUtil util = new ExcelUtil(DriveSchoolCourseOrder.class); +// util.exportExcel(response, list, "驾照报名订单数据"); +// } /** * 获取驾照报名订单详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCredentialsController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCredentialsController.java index 84d4e44e..98130400 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCredentialsController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCredentialsController.java @@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCredentials; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCredentialsService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 驾校资质信息Controller * @@ -29,24 +26,25 @@ public class DriveSchoolCredentialsController extends BaseController * 查询驾校资质信息列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolCredentials driveSchoolCredentials) + public CommonResult> list(DriveSchoolCredentials driveSchoolCredentials) { - startPage(); - List list = driveSchoolCredentialsService.selectDriveSchoolCredentialsList(driveSchoolCredentials); - return getDataTable(list); + Page page = new Page<>(driveSchoolCredentials.getPageNum(), driveSchoolCredentials.getPageSize()); + IPage driveSchoolCredentialsIPage = driveSchoolCredentialsService.selectDriveSchoolCredentialsList(driveSchoolCredentials, page); + return success(driveSchoolCredentialsIPage); + //return getDataTable(list); } /** * 导出驾校资质信息列表 */ //@Log(title = "驾校资质信息", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolCredentials driveSchoolCredentials) - { - List list = driveSchoolCredentialsService.selectDriveSchoolCredentialsList(driveSchoolCredentials); - ExcelUtil util = new ExcelUtil(DriveSchoolCredentials.class); - util.exportExcel(response, list, "驾校资质信息数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolCredentials driveSchoolCredentials) +// { +// List list = driveSchoolCredentialsService.selectDriveSchoolCredentialsList(driveSchoolCredentials); +// ExcelUtil util = new ExcelUtil(DriveSchoolCredentials.class); +// util.exportExcel(response, list, "驾校资质信息数据"); +// } /** * 获取驾校资质信息详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDailyManagementController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDailyManagementController.java index 331eb235..f5a6b9a4 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDailyManagementController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDailyManagementController.java @@ -3,16 +3,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDailyManagement; import cn.iocoder.yudao.module.jx.service.IDriveSchoolDailyManagementService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 驾校日常管理Controller * @@ -30,24 +27,25 @@ public class DriveSchoolDailyManagementController extends BaseController * 查询驾校日常管理列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolDailyManagement driveSchoolDailyManagement) + public CommonResult> list(DriveSchoolDailyManagement driveSchoolDailyManagement) { - startPage(); - List list = driveSchoolDailyManagementService.selectDriveSchoolDailyManagementList(driveSchoolDailyManagement); - return getDataTable(list); + Page page = new Page<>(driveSchoolDailyManagement.getPageNum(), driveSchoolDailyManagement.getPageSize()); + IPage driveSchoolDailyManagementIPage = driveSchoolDailyManagementService.selectDriveSchoolDailyManagementList(driveSchoolDailyManagement, page); + return success(driveSchoolDailyManagementIPage); + //return getDataTable(list); } /** * 导出驾校日常管理列表 */ //@Log(title = "驾校日常管理", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolDailyManagement driveSchoolDailyManagement) - { - List list = driveSchoolDailyManagementService.selectDriveSchoolDailyManagementList(driveSchoolDailyManagement); - ExcelUtil util = new ExcelUtil(DriveSchoolDailyManagement.class); - util.exportExcel(response, list, "驾校日常管理数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolDailyManagement driveSchoolDailyManagement) +// { +// List list = driveSchoolDailyManagementService.selectDriveSchoolDailyManagementList(driveSchoolDailyManagement); +// ExcelUtil util = new ExcelUtil(DriveSchoolDailyManagement.class); +// util.exportExcel(response, list, "驾校日常管理数据"); +// } /** * 获取驾校日常管理详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDeductController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDeductController.java index 0182ba4d..88107efe 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDeductController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDeductController.java @@ -3,16 +3,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDeduct; import cn.iocoder.yudao.module.jx.service.IDriveSchoolDeductService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 提成配置Controller * @@ -30,24 +27,25 @@ public class DriveSchoolDeductController extends BaseController * 查询提成配置列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolDeduct driveSchoolDeduct) + public CommonResult> list(DriveSchoolDeduct driveSchoolDeduct) { - startPage(); - List list = driveSchoolDeductService.selectDriveSchoolDeductList(driveSchoolDeduct); - return getDataTable(list); + Page page = new Page<>(driveSchoolDeduct.getPageNum(), driveSchoolDeduct.getPageSize()); + IPage driveSchoolDeductIPage = driveSchoolDeductService.selectDriveSchoolDeductList(driveSchoolDeduct, page); + return CommonResult.success(driveSchoolDeductIPage); + //return getDataTable(list); } /** * 导出提成配置列表 */ //@Log(title = "提成配置", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolDeduct driveSchoolDeduct) - { - List list = driveSchoolDeductService.selectDriveSchoolDeductList(driveSchoolDeduct); - ExcelUtil util = new ExcelUtil(DriveSchoolDeduct.class); - util.exportExcel(response, list, "提成配置数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolDeduct driveSchoolDeduct) +// { +// List list = driveSchoolDeductService.selectDriveSchoolDeductList(driveSchoolDeduct); +// ExcelUtil util = new ExcelUtil(DriveSchoolDeduct.class); +// util.exportExcel(response, list, "提成配置数据"); +// } /** * 获取提成配置详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDialController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDialController.java index 2eb3cca4..03fb2d6b 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDialController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDialController.java @@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDial; import cn.iocoder.yudao.module.jx.service.IDriveSchoolDialService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 日常日志Controller * @@ -29,35 +26,37 @@ public class DriveSchoolDialController extends BaseController * 查询日常日志列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolDial driveSchoolDial) + public CommonResult> list(DriveSchoolDial driveSchoolDial) { - startPage(); - List list = driveSchoolDialService.selectDriveSchoolDialList(driveSchoolDial); - return getDataTable(list); + Page page = new Page<>(driveSchoolDial.getPageNum(), driveSchoolDial.getPageSize()); + IPage driveSchoolDialIPage = driveSchoolDialService.selectDriveSchoolDialList(driveSchoolDial, page); + return CommonResult.success(driveSchoolDialIPage); + //return getDataTable(list); } /** * 查询日常日志列表 */ @GetMapping("/appList") - public TableDataInfo appList(DriveSchoolDial driveSchoolDial) + public CommonResult> appList(DriveSchoolDial driveSchoolDial) { - startPage(); - List list = driveSchoolDialService.selectDriveSchoolDialAppList(driveSchoolDial); - return getDataTable(list); + Page page = new Page<>(driveSchoolDial.getPageNum(), driveSchoolDial.getPageSize()); + IPage driveSchoolDialIPage = driveSchoolDialService.selectDriveSchoolDialAppList(driveSchoolDial, page); + return CommonResult.success(driveSchoolDialIPage); + //return getDataTable(list); } /** * 导出日常日志列表 */ //@Log(title = "日常日志", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolDial driveSchoolDial) - { - List list = driveSchoolDialService.selectDriveSchoolDialList(driveSchoolDial); - ExcelUtil util = new ExcelUtil(DriveSchoolDial.class); - util.exportExcel(response, list, "日常日志数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolDial driveSchoolDial) +// { +// List list = driveSchoolDialService.selectDriveSchoolDialList(driveSchoolDial); +// ExcelUtil util = new ExcelUtil(DriveSchoolDial.class); +// util.exportExcel(response, list, "日常日志数据"); +// } /** * 获取日常日志详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDynamicController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDynamicController.java index 61f0c627..40d1db02 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDynamicController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDynamicController.java @@ -2,14 +2,12 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDynamic; import cn.iocoder.yudao.module.jx.service.IDriveSchoolDynamicService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -29,11 +27,12 @@ public class DriveSchoolDynamicController extends BaseController * 查询行业动态列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolDynamic driveSchoolDynamic) + public CommonResult> list(DriveSchoolDynamic driveSchoolDynamic) { - startPage(); - List list = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic); - return getDataTable(list); + Page page = new Page<>(driveSchoolDynamic.getPageNum(), driveSchoolDynamic.getPageSize()); + IPage driveSchoolDynamicIPage = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic, page); + return CommonResult.success(driveSchoolDynamicIPage); + //return getDataTable(list); } /** @@ -42,7 +41,7 @@ public class DriveSchoolDynamicController extends BaseController @GetMapping("/applist") public CommonResult applist(DriveSchoolDynamic driveSchoolDynamic) { - List list = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic); + List list = driveSchoolDynamicService.selectDriveSchoolDynamicListAll(driveSchoolDynamic); return CommonResult.success(list); } @@ -50,13 +49,13 @@ public class DriveSchoolDynamicController extends BaseController * 导出行业动态列表 */ //@Log(title = "行业动态", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolDynamic driveSchoolDynamic) - { - List list = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic); - ExcelUtil util = new ExcelUtil(DriveSchoolDynamic.class); - util.exportExcel(response, list, "行业动态数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolDynamic driveSchoolDynamic) +// { +// List list = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic); +// ExcelUtil util = new ExcelUtil(DriveSchoolDynamic.class); +// util.exportExcel(response, list, "行业动态数据"); +// } /** * 获取行业动态详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolExamPassController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolExamPassController.java index 7b5fabf6..e8d8a160 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolExamPassController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolExamPassController.java @@ -4,22 +4,18 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCoach; import cn.iocoder.yudao.module.jx.domain.DriveSchoolExamPass; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCoachMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolExamPassService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import com.thoughtworks.xstream.core.SecurityUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import java.util.List; /** * 考试通过Controller @@ -41,22 +37,24 @@ public class DriveSchoolExamPassController extends BaseController * 查询考试通过列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolExamPass driveSchoolExamPass) + public CommonResult> list(DriveSchoolExamPass driveSchoolExamPass) { - startPage(); - List list = driveSchoolExamPassService.selectDriveSchoolExamPassList(driveSchoolExamPass); - return getDataTable(list); + Page page = new Page<>(driveSchoolExamPass.getPageNum(), driveSchoolExamPass.getPageSize()); + IPage driveSchoolExamPassIPage = driveSchoolExamPassService.selectDriveSchoolExamPassList(driveSchoolExamPass, page); + return CommonResult.success(driveSchoolExamPassIPage); + //return getDataTable(list); } /** * 查询教练工资 */ @GetMapping("/getBalanceList") - public TableDataInfo getBalanceList(DriveSchoolExamPass driveSchoolExamPass) + public CommonResult> getBalanceList(DriveSchoolExamPass driveSchoolExamPass) { - startPage(); - List list = driveSchoolExamPassService.getBalanceList(driveSchoolExamPass); - return getDataTable(list); + Page page = new Page<>(driveSchoolExamPass.getPageNum(), driveSchoolExamPass.getPageSize()); + IPage balanceList = driveSchoolExamPassService.getBalanceList(driveSchoolExamPass, page); + return CommonResult.success(balanceList); + //return getDataTable(list); } /** @@ -109,7 +107,7 @@ public class DriveSchoolExamPassController extends BaseController * 账单管理 */ @GetMapping("/checkList") - public TableDataInfo checkList(DriveSchoolExamPass driveSchoolExamPass) + public CommonResult> checkList(DriveSchoolExamPass driveSchoolExamPass) { //获取教练id Long userId = SecurityFrameworkUtils.getLoginUserId(); @@ -124,22 +122,23 @@ public class DriveSchoolExamPassController extends BaseController } driveSchoolExamPass.setJlId(jlId); - startPage(); - List list = driveSchoolExamPassService.checkList(driveSchoolExamPass); - return getDataTable(list); + Page page = new Page<>(driveSchoolExamPass.getPageNum(), driveSchoolExamPass.getPageSize()); + IPage driveSchoolExamPassIPage = driveSchoolExamPassService.checkList(driveSchoolExamPass, page); + return CommonResult.success(driveSchoolExamPassIPage); + //return getDataTable(list); } /** * 导出考试通过列表 */ //@Log(title = "考试通过", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolExamPass driveSchoolExamPass) - { - List list = driveSchoolExamPassService.selectDriveSchoolExamPassList(driveSchoolExamPass); - ExcelUtil util = new ExcelUtil(DriveSchoolExamPass.class); - util.exportExcel(response, list, "考试通过数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolExamPass driveSchoolExamPass) +// { +// List list = driveSchoolExamPassService.selectDriveSchoolExamPassList(driveSchoolExamPass); +// ExcelUtil util = new ExcelUtil(DriveSchoolExamPass.class); +// util.exportExcel(response, list, "考试通过数据"); +// } /** * 获取考试通过详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFacilityController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFacilityController.java index 2c0e8779..89d73fa7 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFacilityController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFacilityController.java @@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolFacility; import cn.iocoder.yudao.module.jx.service.IDriveSchoolFacilityService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 设备管理Controller * @@ -29,24 +26,25 @@ public class DriveSchoolFacilityController extends BaseController * 查询设备管理列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolFacility driveSchoolFacility) + public CommonResult> list(DriveSchoolFacility driveSchoolFacility) { - startPage(); - List list = driveSchoolFacilityService.selectDriveSchoolFacilityList(driveSchoolFacility); - return getDataTable(list); + Page page = new Page<>(driveSchoolFacility.getPageNum(), driveSchoolFacility.getPageSize()); + IPage driveSchoolFacilityIPage = driveSchoolFacilityService.selectDriveSchoolFacilityList(driveSchoolFacility, page); + return success(driveSchoolFacilityIPage); + //return getDataTable(list); } /** * 导出设备管理列表 */ //@Log(title = "设备管理", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolFacility driveSchoolFacility) - { - List list = driveSchoolFacilityService.selectDriveSchoolFacilityList(driveSchoolFacility); - ExcelUtil util = new ExcelUtil(DriveSchoolFacility.class); - util.exportExcel(response, list, "设备管理数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolFacility driveSchoolFacility) +// { +// List list = driveSchoolFacilityService.selectDriveSchoolFacilityList(driveSchoolFacility); +// ExcelUtil util = new ExcelUtil(DriveSchoolFacility.class); +// util.exportExcel(response, list, "设备管理数据"); +// } /** * 获取设备管理详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFileController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFileController.java index 1715476d..3ce47552 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFileController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFileController.java @@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolFile; import cn.iocoder.yudao.module.jx.service.IDriveSchoolFileService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 文件类型Controller * @@ -29,11 +26,12 @@ public class DriveSchoolFileController extends BaseController * 查询文件类型列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolFile driveSchoolFile) + public CommonResult> list(DriveSchoolFile driveSchoolFile) { - startPage(); - List list = driveSchoolFileService.selectDriveSchoolFileList(driveSchoolFile); - return getDataTable(list); + Page page = new Page<>(driveSchoolFile.getPageNum(), driveSchoolFile.getPageSize()); + IPage driveSchoolFileIPage = driveSchoolFileService.selectDriveSchoolFileList(driveSchoolFile, page); + return CommonResult.success(driveSchoolFileIPage); + //return getDataTable(list); } @@ -52,13 +50,13 @@ public class DriveSchoolFileController extends BaseController * 导出文件类型列表 */ //@Log(title = "文件类型", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolFile driveSchoolFile) - { - List list = driveSchoolFileService.selectDriveSchoolFileList(driveSchoolFile); - ExcelUtil util = new ExcelUtil(DriveSchoolFile.class); - util.exportExcel(response, list, "文件类型数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolFile driveSchoolFile) +// { +// List list = driveSchoolFileService.selectDriveSchoolFileList(driveSchoolFile); +// ExcelUtil util = new ExcelUtil(DriveSchoolFile.class); +// util.exportExcel(response, list, "文件类型数据"); +// } /** * 获取文件类型详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInfoController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInfoController.java index a230f13e..b22a53a1 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInfoController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInfoController.java @@ -2,15 +2,14 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolInfo; import cn.iocoder.yudao.module.jx.payment.vo.PayVo; import cn.iocoder.yudao.module.jx.service.IDriveSchoolInfoService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -41,24 +40,25 @@ public class DriveSchoolInfoController extends BaseController */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolInfo driveSchoolInfo) + public CommonResult> list(DriveSchoolInfo driveSchoolInfo) { - startPage(); - List list = driveSchoolInfoService.selectDriveSchoolInfoList(driveSchoolInfo); - return getDataTable(list); + Page page = new Page<>(driveSchoolInfo.getPageNum(), driveSchoolInfo.getPageSize()); + IPage driveSchoolInfoIPage = driveSchoolInfoService.selectDriveSchoolInfoList(driveSchoolInfo, page); + return CommonResult.success(driveSchoolInfoIPage); + //return getDataTable(list); } /** * 导出驾校信息列表 */ //@Log(title = "驾校信息", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolInfo driveSchoolInfo) - { - List list = driveSchoolInfoService.selectDriveSchoolInfoList(driveSchoolInfo); - ExcelUtil util = new ExcelUtil(DriveSchoolInfo.class); - util.exportExcel(response, list, "驾校信息数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolInfo driveSchoolInfo) +// { +// List list = driveSchoolInfoService.selectDriveSchoolInfoList(driveSchoolInfo); +// ExcelUtil util = new ExcelUtil(DriveSchoolInfo.class); +// util.exportExcel(response, list, "驾校信息数据"); +// } /** * 获取驾校信息详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInsuranceController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInsuranceController.java index 0e7e0072..119d92b0 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInsuranceController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInsuranceController.java @@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolInsurance; import cn.iocoder.yudao.module.jx.service.IDriveSchoolInsuranceService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 保险管理Controller * @@ -29,24 +26,25 @@ public class DriveSchoolInsuranceController extends BaseController * 查询保险管理列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolInsurance driveSchoolInsurance) + public CommonResult> list(DriveSchoolInsurance driveSchoolInsurance) { - startPage(); - List list = driveSchoolInsuranceService.selectDriveSchoolInsuranceList(driveSchoolInsurance); - return getDataTable(list); + Page page = new Page<>(driveSchoolInsurance.getPageNum(), driveSchoolInsurance.getPageSize()); + IPage driveSchoolInsuranceIPage = driveSchoolInsuranceService.selectDriveSchoolInsuranceList(driveSchoolInsurance, page); + return success(driveSchoolInsuranceIPage); + //return getDataTable(list); } /** * 导出保险管理列表 */ //@Log(title = "保险管理", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolInsurance driveSchoolInsurance) - { - List list = driveSchoolInsuranceService.selectDriveSchoolInsuranceList(driveSchoolInsurance); - ExcelUtil util = new ExcelUtil(DriveSchoolInsurance.class); - util.exportExcel(response, list, "保险管理数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolInsurance driveSchoolInsurance) +// { +// List list = driveSchoolInsuranceService.selectDriveSchoolInsuranceList(driveSchoolInsurance); +// ExcelUtil util = new ExcelUtil(DriveSchoolInsurance.class); +// util.exportExcel(response, list, "保险管理数据"); +// } /** * 获取保险管理详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolNewsController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolNewsController.java index c1d6dbd3..e11ff9c3 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolNewsController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolNewsController.java @@ -3,14 +3,12 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolNews; import cn.iocoder.yudao.module.jx.service.IDriveSchoolNewsService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -30,11 +28,12 @@ public class DriveSchoolNewsController extends BaseController * 查询校内新闻列表 */ @GetMapping("/list") - public TableDataInfo pclist(DriveSchoolNews driveSchoolNews) + public CommonResult> pclist(DriveSchoolNews driveSchoolNews) { - startPage(); - List list = driveSchoolNewsService.selectDriveSchoolNewsList(driveSchoolNews); - return getDataTable(list); + Page page = new Page<>(driveSchoolNews.getPageNum(), driveSchoolNews.getPageSize()); + IPage driveSchoolNewsIPage = driveSchoolNewsService.selectDriveSchoolNewsList(driveSchoolNews, page); + return CommonResult.success(driveSchoolNewsIPage); + //return getDataTable(list); } /** @@ -43,7 +42,7 @@ public class DriveSchoolNewsController extends BaseController @GetMapping("/applist") public CommonResult list(DriveSchoolNews driveSchoolNews) { - List list = driveSchoolNewsService.selectDriveSchoolNewsList(driveSchoolNews); + List list = driveSchoolNewsService.selectDriveSchoolNewsListAll(driveSchoolNews); return CommonResult.success(list); } @@ -51,13 +50,13 @@ public class DriveSchoolNewsController extends BaseController * 导出校内新闻列表 */ //@Log(title = "校内新闻", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolNews driveSchoolNews) - { - List list = driveSchoolNewsService.selectDriveSchoolNewsList(driveSchoolNews); - ExcelUtil util = new ExcelUtil(DriveSchoolNews.class); - util.exportExcel(response, list, "校内新闻数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolNews driveSchoolNews) +// { +// List list = driveSchoolNewsService.selectDriveSchoolNewsList(driveSchoolNews); +// ExcelUtil util = new ExcelUtil(DriveSchoolNews.class); +// util.exportExcel(response, list, "校内新闻数据"); +// } /** * 获取校内新闻详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolNoticeController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolNoticeController.java index 665539d7..9dbacf17 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolNoticeController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolNoticeController.java @@ -2,14 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolNotice; import cn.iocoder.yudao.module.jx.service.IDriveSchoolNoticeService; import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; - import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -30,11 +29,12 @@ public class DriveSchoolNoticeController extends BaseController * 查询通知列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolNotice driveSchoolNotice) + public CommonResult> list(DriveSchoolNotice driveSchoolNotice) { - startPage(); - List list = driveSchoolNoticeService.selectDriveSchoolNoticeList(driveSchoolNotice); - return getDataTable(list); + Page page = new Page<>(driveSchoolNotice.getPageNum(), driveSchoolNotice.getPageSize()); + IPage driveSchoolNoticeIPage = driveSchoolNoticeService.selectDriveSchoolNoticeList(driveSchoolNotice, page); + return CommonResult.success(driveSchoolNoticeIPage); + //return getDataTable(list); } @@ -52,13 +52,13 @@ public class DriveSchoolNoticeController extends BaseController * 导出通知列表 */ //@Log(title = "通知", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolNotice driveSchoolNotice) - { - List list = driveSchoolNoticeService.selectDriveSchoolNoticeList(driveSchoolNotice); - ExcelUtil util = new ExcelUtil(DriveSchoolNotice.class); - util.exportExcel(response, list, "通知数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolNotice driveSchoolNotice) +// { +// List list = driveSchoolNoticeService.selectDriveSchoolNoticeList(driveSchoolNotice); +// ExcelUtil util = new ExcelUtil(DriveSchoolNotice.class); +// util.exportExcel(response, list, "通知数据"); +// } /** * 获取通知详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolPhoneController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolPhoneController.java index 80d16d75..3010eaa3 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolPhoneController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolPhoneController.java @@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolPhone; import cn.iocoder.yudao.module.jx.service.IDriveSchoolPhoneService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 客服Controller * @@ -29,11 +26,12 @@ public class DriveSchoolPhoneController extends BaseController * 查询客服列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolPhone driveSchoolPhone) + public CommonResult> list(DriveSchoolPhone driveSchoolPhone) { - startPage(); - List list = driveSchoolPhoneService.selectDriveSchoolPhoneList(driveSchoolPhone); - return getDataTable(list); + Page page = new Page<>(driveSchoolPhone.getPageNum(), driveSchoolPhone.getPageSize()); + IPage driveSchoolPhoneIPage = driveSchoolPhoneService.selectDriveSchoolPhoneList(driveSchoolPhone, page); + return CommonResult.success(driveSchoolPhoneIPage); + //return getDataTable(list); } /** @@ -50,13 +48,13 @@ public class DriveSchoolPhoneController extends BaseController * 导出客服列表 */ //@Log(title = "客服", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolPhone driveSchoolPhone) - { - List list = driveSchoolPhoneService.selectDriveSchoolPhoneList(driveSchoolPhone); - ExcelUtil util = new ExcelUtil(DriveSchoolPhone.class); - util.exportExcel(response, list, "客服数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolPhone driveSchoolPhone) +// { +// List list = driveSchoolPhoneService.selectDriveSchoolPhoneList(driveSchoolPhone); +// ExcelUtil util = new ExcelUtil(DriveSchoolPhone.class); +// util.exportExcel(response, list, "客服数据"); +// } /** * 获取客服详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReimbursementController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReimbursementController.java index aad5773e..85d6b891 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReimbursementController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReimbursementController.java @@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolReimbursement; import cn.iocoder.yudao.module.jx.service.IDriveSchoolReimbursementService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 报销审核Controller * @@ -29,24 +26,25 @@ public class DriveSchoolReimbursementController extends BaseController * 查询报销审核列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolReimbursement driveSchoolReimbursement) + public CommonResult> list(DriveSchoolReimbursement driveSchoolReimbursement) { - startPage(); - List list = driveSchoolReimbursementService.selectDriveSchoolReimbursementList(driveSchoolReimbursement); - return getDataTable(list); + Page page = new Page<>(driveSchoolReimbursement.getPageNum(), driveSchoolReimbursement.getPageSize()); + IPage driveSchoolReimbursementIPage = driveSchoolReimbursementService.selectDriveSchoolReimbursementList(driveSchoolReimbursement, page); + return CommonResult.success(driveSchoolReimbursementIPage); + //return getDataTable(list); } /** * 导出报销审核列表 */ //@Log(title = "报销审核", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolReimbursement driveSchoolReimbursement) - { - List list = driveSchoolReimbursementService.selectDriveSchoolReimbursementList(driveSchoolReimbursement); - ExcelUtil util = new ExcelUtil(DriveSchoolReimbursement.class); - util.exportExcel(response, list, "报销审核数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolReimbursement driveSchoolReimbursement) +// { +// List list = driveSchoolReimbursementService.selectDriveSchoolReimbursementList(driveSchoolReimbursement); +// ExcelUtil util = new ExcelUtil(DriveSchoolReimbursement.class); +// util.exportExcel(response, list, "报销审核数据"); +// } /** * 获取报销审核详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReservationCourseController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReservationCourseController.java index ce156dcd..761d1035 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReservationCourseController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReservationCourseController.java @@ -3,15 +3,17 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCoach; import cn.iocoder.yudao.module.jx.domain.DriveSchoolReservationCourse; +import cn.iocoder.yudao.module.jx.domain.DriveSchoolTeachingJournal; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCoachMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolInfoService; import cn.iocoder.yudao.module.jx.service.IDriveSchoolReservationCourseService; import cn.iocoder.yudao.module.jx.utils.ExcelUtil; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -48,31 +50,34 @@ public class DriveSchoolReservationCourseController extends BaseController * 查询预约练车列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolReservationCourse driveSchoolReservationCourse) + public CommonResult> list(DriveSchoolReservationCourse driveSchoolReservationCourse) { - startPage(); - List list = driveSchoolReservationCourseService.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse); - return getDataTable(list); + Page page = new Page<>(driveSchoolReservationCourse.getPageNum(), driveSchoolReservationCourse.getPageSize()); + IPage driveSchoolReservationCourseIPage = driveSchoolReservationCourseService.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse, page); + return CommonResult.success(driveSchoolReservationCourseIPage); + //return getDataTable(list); } /** * 查询预约练车列表pc */ @GetMapping("/pclist") - public TableDataInfo pclist(DriveSchoolReservationCourse driveSchoolReservationCourse) + public CommonResult> pclist(DriveSchoolReservationCourse driveSchoolReservationCourse) { - startPage(); - List list = driveSchoolReservationCourseService.selectDriveSchoolReservationCoursePclist(driveSchoolReservationCourse); - return getDataTable(list); + Page page = new Page<>(driveSchoolReservationCourse.getPageNum(), driveSchoolReservationCourse.getPageSize()); + IPage driveSchoolReservationCourseIPage = driveSchoolReservationCourseService.selectDriveSchoolReservationCoursePclist(driveSchoolReservationCourse, page); + return CommonResult.success(driveSchoolReservationCourseIPage); + //return getDataTable(list); } @GetMapping("/listUser") public CommonResult listUser(DriveSchoolReservationCourse driveSchoolReservationCourse) { + Page page = new Page<>(driveSchoolReservationCourse.getPageNum(), 9999); driveSchoolReservationCourse.setUserId(SecurityFrameworkUtils.getLoginUserId()); - List list = driveSchoolReservationCourseService.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse); - - return CommonResult.success(list); + IPage driveSchoolReservationCourseIPage = driveSchoolReservationCourseService.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse, page); + List records = driveSchoolReservationCourseIPage.getRecords(); + return CommonResult.success(records); } @GetMapping("/getListUser") @@ -87,13 +92,13 @@ public class DriveSchoolReservationCourseController extends BaseController * 导出预约练车列表 */ //@Log(title = "预约练车", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolReservationCourse driveSchoolReservationCourse) - { - List list = driveSchoolReservationCourseService.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse); - ExcelUtil util = new ExcelUtil(DriveSchoolReservationCourse.class); - util.exportExcel(response, list, "预约练车数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolReservationCourse driveSchoolReservationCourse) +// { +// List list = driveSchoolReservationCourseService.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse); +// ExcelUtil util = new ExcelUtil(DriveSchoolReservationCourse.class); +// util.exportExcel(response, list, "预约练车数据"); +// } /** * 获取预约练车详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolSeparateController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolSeparateController.java index cc710641..dd9fb5a7 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolSeparateController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolSeparateController.java @@ -3,15 +3,12 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolSeparate; import cn.iocoder.yudao.module.jx.service.IDriveSchoolSeparateService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; import java.util.Map; /** @@ -31,11 +28,12 @@ public class DriveSchoolSeparateController extends BaseController * 查询驾校分账列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolSeparate driveSchoolSeparate) + public CommonResult> list(DriveSchoolSeparate driveSchoolSeparate) { - startPage(); - List list = driveSchoolSeparateService.selectDriveSchoolSeparateList(driveSchoolSeparate); - return getDataTable(list); + Page page = new Page<>(driveSchoolSeparate.getPageNum(), driveSchoolSeparate.getPageSize()); + IPage driveSchoolSeparateIPage = driveSchoolSeparateService.selectDriveSchoolSeparateList(driveSchoolSeparate, page); + return CommonResult.success(driveSchoolSeparateIPage); + //return getDataTable(list); } /** @@ -52,13 +50,13 @@ public class DriveSchoolSeparateController extends BaseController * 导出驾校分账列表 */ //@Log(title = "驾校分账", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolSeparate driveSchoolSeparate) - { - List list = driveSchoolSeparateService.selectDriveSchoolSeparateList(driveSchoolSeparate); - ExcelUtil util = new ExcelUtil(DriveSchoolSeparate.class); - util.exportExcel(response, list, "驾校分账数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolSeparate driveSchoolSeparate) +// { +// List list = driveSchoolSeparateService.selectDriveSchoolSeparateList(driveSchoolSeparate); +// ExcelUtil util = new ExcelUtil(DriveSchoolSeparate.class); +// util.exportExcel(response, list, "驾校分账数据"); +// } /** * 获取驾校分账详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTeachingJournalController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTeachingJournalController.java index e0550e72..1a53af9d 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTeachingJournalController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTeachingJournalController.java @@ -2,11 +2,8 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolTeachingJournal; import cn.iocoder.yudao.module.jx.service.IDriveSchoolTeachingJournalService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; -import cn.iocoder.yudao.module.rescue.domain.RescueCarInfo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTextController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTextController.java index ebab53a1..a89a1482 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTextController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTextController.java @@ -3,16 +3,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolText; import cn.iocoder.yudao.module.jx.service.IDriveSchoolTextService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 驾校公告Controller * @@ -30,24 +27,25 @@ public class DriveSchoolTextController extends BaseController * 查询驾校公告列表 */ @GetMapping("/list") - public TableDataInfo list(DriveSchoolText driveSchoolText) + public CommonResult> list(DriveSchoolText driveSchoolText) { - startPage(); - List list = driveSchoolTextService.selectDriveSchoolTextList(driveSchoolText); - return getDataTable(list); + Page page = new Page<>(driveSchoolText.getPageNum(), driveSchoolText.getPageSize()); + IPage driveSchoolTextIPage = driveSchoolTextService.selectDriveSchoolTextList(driveSchoolText, page); + return CommonResult.success(driveSchoolTextIPage); + //return getDataTable(list); } /** * 导出驾校公告列表 */ //@Log(title = "驾校公告", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolText driveSchoolText) - { - List list = driveSchoolTextService.selectDriveSchoolTextList(driveSchoolText); - ExcelUtil util = new ExcelUtil(DriveSchoolText.class); - util.exportExcel(response, list, "驾校公告数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolText driveSchoolText) +// { +// List list = driveSchoolTextService.selectDriveSchoolTextList(driveSchoolText); +// ExcelUtil util = new ExcelUtil(DriveSchoolText.class); +// util.exportExcel(response, list, "驾校公告数据"); +// } /** * 获取驾校公告详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolUpkeepController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolUpkeepController.java index 66a52d89..8d428c3e 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolUpkeepController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolUpkeepController.java @@ -2,17 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolUpkeep; import cn.iocoder.yudao.module.jx.service.IDriveSchoolUpkeepService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 车辆保养记录Controller * @@ -31,24 +27,25 @@ public class DriveSchoolUpkeepController extends BaseController */ //@PreAuthorize("@ss.hasPermi('drivingSchool/system:drivingSchoolUpkeep:list')") @GetMapping("/list") - public TableDataInfo list(DriveSchoolUpkeep driveSchoolUpkeep) + public CommonResult> list(DriveSchoolUpkeep driveSchoolUpkeep) { - startPage(); - List list = driveSchoolUpkeepService.selectDriveSchoolUpkeepList(driveSchoolUpkeep); - return getDataTable(list); + Page page = new Page<>(driveSchoolUpkeep.getPageNum(), driveSchoolUpkeep.getPageSize()); + IPage driveSchoolUpkeepIPage = driveSchoolUpkeepService.selectDriveSchoolUpkeepList(driveSchoolUpkeep, page); + return CommonResult.success(driveSchoolUpkeepIPage); + //return getDataTable(list); } /** * 导出车辆保养记录列表 */ //@Log(title = "车辆保养记录", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DriveSchoolUpkeep driveSchoolUpkeep) - { - List list = driveSchoolUpkeepService.selectDriveSchoolUpkeepList(driveSchoolUpkeep); - ExcelUtil util = new ExcelUtil(DriveSchoolUpkeep.class); - util.exportExcel(response, list, "车辆保养记录数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolUpkeep driveSchoolUpkeep) +// { +// List list = driveSchoolUpkeepService.selectDriveSchoolUpkeepList(driveSchoolUpkeep); +// ExcelUtil util = new ExcelUtil(DriveSchoolUpkeep.class); +// util.exportExcel(response, list, "车辆保养记录数据"); +// } /** * 获取车辆保养记录详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/SopeNessController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/SopeNessController.java index c2892d16..11fdf860 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/SopeNessController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/SopeNessController.java @@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.jx.core.controller.BaseController; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.SopeNess; import cn.iocoder.yudao.module.jx.service.ISopeNessService; -import cn.iocoder.yudao.module.jx.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 经营范围Controller * @@ -29,24 +26,25 @@ public class SopeNessController extends BaseController * 查询经营范围列表 */ @GetMapping("/list") - public TableDataInfo list(SopeNess sopeNess) + public CommonResult> list(SopeNess sopeNess) { - startPage(); - List list = sopeNessService.selectSopeNessList(sopeNess); - return getDataTable(list); + Page page = new Page<>(sopeNess.getPageNum(), sopeNess.getPageSize()); + IPage sopeNessIPage = sopeNessService.selectSopeNessList(sopeNess, page); + return CommonResult.success(sopeNessIPage); + //return getDataTable(list); } /** * 导出经营范围列表 */ - @PostMapping("/export") - public void export(HttpServletResponse response, SopeNess sopeNess) - { - - List list = sopeNessService.selectSopeNessList(sopeNess); - ExcelUtil util = new ExcelUtil(SopeNess.class); - util.exportExcel(response, list, "经营范围数据"); - } +// @PostMapping("/export") +// public void export(HttpServletResponse response, SopeNess sopeNess) +// { +// +// List list = sopeNessService.selectSopeNessList(sopeNess); +// ExcelUtil util = new ExcelUtil(SopeNess.class); +// util.exportExcel(response, list, "经营范围数据"); +// } /** * 获取经营范围详细信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/controller/BaseController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/controller/BaseController.java index 82e57f8d..db4588e8 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/controller/BaseController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/controller/BaseController.java @@ -5,8 +5,10 @@ import cn.iocoder.yudao.module.jx.core.page.*; import cn.iocoder.yudao.module.jx.core.text.HttpStatus; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.security.core.LoginUser; +import cn.iocoder.yudao.module.jx.domain.DriveSchoolTeachingJournal; import cn.iocoder.yudao.module.jx.utils.DateUtils; import cn.iocoder.yudao.module.jx.utils.StringUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -54,7 +56,7 @@ public class BaseController */ protected void startPage() { - PageUtils.startPage(); + //Page page = new Page<>(driveSchoolTeachingJournal.getPageNum(), driveSchoolTeachingJournal.getPageSize()); } /** @@ -82,13 +84,13 @@ public class BaseController * 响应请求分页数据 */ @SuppressWarnings({ "rawtypes", "unchecked" }) - protected TableDataInfo getDataTable(List list) + protected CommonResult> getDataTable(List list) { - TableDataInfo rspData = new TableDataInfo(); + CommonResult> rspData = new CommonResult>(); rspData.setCode(HttpStatus.SUCCESS); rspData.setMsg("查询成功"); - rspData.setRows(list); - rspData.setTotal(new PageInfo(list).getTotal()); +// rspData.setRows(list); +// rspData.setTotal(new PageInfo(list).getTotal()); return rspData; } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/BaseEntity.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/BaseEntity.java deleted file mode 100644 index e3a57c84..00000000 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/BaseEntity.java +++ /dev/null @@ -1,114 +0,0 @@ -package cn.iocoder.yudao.module.jx.core.page; - -import cn.iocoder.yudao.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * Entity基类 - * - * @author ruoyi - */ -@Data -public class BaseEntity implements Serializable -{ - private static final long serialVersionUID = 1L; - - /** 搜索值 */ - @JsonIgnore - @TableField(exist = false) - private String searchValue; - - /** 创建者 */ - private String creator; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "报名日期") - private Date createTime; - - /** 更新者 */ - private String updater; - - /** 当前记录起始索引 */ - private Integer pageNum; - - /** 每页显示记录数 */ - private Integer pageSize; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; - - /** 备注 */ - @TableField(exist = false) - private String remark; - - /** 请求参数 */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @TableField(exist = false) - private Map params; - - public String getSearchValue() - { - return searchValue; - } - - public void setSearchValue(String searchValue) - { - this.searchValue = searchValue; - } - - - public Date getCreateTime() - { - return createTime; - } - - public void setCreateTime(Date createTime) - { - this.createTime = createTime; - } - - public Date getUpdateTime() - { - return updateTime; - } - - public void setUpdateTime(Date updateTime) - { - this.updateTime = updateTime; - } - - public String getRemark() - { - return remark; - } - - public void setRemark(String remark) - { - this.remark = remark; - } - - public Map getParams() - { - if (params == null) - { - params = new HashMap<>(); - } - return params; - } - - public void setParams(Map params) - { - this.params = params; - } -} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/TableDataInfo.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/TableDataInfo.java deleted file mode 100644 index 08345216..00000000 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/TableDataInfo.java +++ /dev/null @@ -1,85 +0,0 @@ -package cn.iocoder.yudao.module.jx.core.page; - -import java.io.Serializable; -import java.util.List; - -/** - * 表格分页数据对象 - * - * @author ruoyi - */ -public class TableDataInfo implements Serializable -{ - private static final long serialVersionUID = 1L; - - /** 总记录数 */ - private long total; - - /** 列表数据 */ - private List rows; - - /** 消息状态码 */ - private int code; - - /** 消息内容 */ - private String msg; - - /** - * 表格数据对象 - */ - public TableDataInfo() - { - } - - /** - * 分页 - * - * @param list 列表数据 - * @param total 总记录数 - */ - public TableDataInfo(List list, int total) - { - this.rows = list; - this.total = total; - } - - public long getTotal() - { - return total; - } - - public void setTotal(long total) - { - this.total = total; - } - - public List getRows() - { - return rows; - } - - public void setRows(List rows) - { - this.rows = rows; - } - - public int getCode() - { - return code; - } - - public void setCode(int code) - { - this.code = code; - } - - public String getMsg() - { - return msg; - } - - public void setMsg(String msg) - { - this.msg = msg; - } -} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/TenantBaDO.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/TenantBaDO.java new file mode 100644 index 00000000..efdf318f --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/TenantBaDO.java @@ -0,0 +1,64 @@ +package cn.iocoder.yudao.module.jx.core.page; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fhs.core.trans.vo.TransPojo; +import lombok.Data; +import org.apache.ibatis.type.JdbcType; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@JsonIgnoreProperties(value = "transMap") +public class TenantBaDO implements Serializable, TransPojo { + /** + * 多租户编号 + */ + private Long tenantId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + /** + * 最后更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + /** + * 创建者，目前使用 SysUser 的 id 编号 + * + * 使用 String 类型的原因是，未来可能会存在非数值的情况，留好拓展性。 + */ + @TableField(fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR) + private String creator; + /** + * 更新者，目前使用 SysUser 的 id 编号 + * + * 使用 String 类型的原因是，未来可能会存在非数值的情况，留好拓展性。 + */ + @TableField(fill = FieldFill.INSERT_UPDATE, jdbcType = JdbcType.VARCHAR) + private String updater; + /** + * 是否删除 + */ + @TableLogic + private Boolean deleted; + + /** 当前记录起始索引 */ + private Integer pageNum; + + /** 每页显示记录数 */ + private Integer pageSize; + +} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveCarBind.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveCarBind.java index 8561474e..143c8436 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveCarBind.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveCarBind.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; /** @@ -12,7 +12,7 @@ import lombok.Data; * @date 2024-04-01 */ @Data -public class DriveCarBind extends BaseEntity +public class DriveCarBind extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveContractTest.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveContractTest.java index 8a42f40c..101fad0d 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveContractTest.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveContractTest.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -13,7 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024-05-25 */ @Data -public class DriveContractTest extends BaseEntity +public class DriveContractTest extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCar.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCar.java index 909777f6..df52b0db 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCar.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCar.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -16,7 +16,7 @@ import java.util.Date; * @date 2024-05-08 */ @Data -public class DriveSchoolCar extends BaseEntity +public class DriveSchoolCar extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCarRepair.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCarRepair.java index a6585a76..cd5a0658 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCarRepair.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCarRepair.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -15,7 +15,7 @@ import java.util.Date; * @date 2024-04-01 */ @Data -public class DriveSchoolCarRepair extends BaseEntity +public class DriveSchoolCarRepair extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCheck.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCheck.java index 0acb78b5..f14e2843 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCheck.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCheck.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -17,7 +17,7 @@ import java.util.Date; * @date 2024-05-10 */ @Data -public class DriveSchoolCheck extends BaseEntity +public class DriveSchoolCheck extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCoach.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCoach.java index 273889b1..cc129612 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCoach.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCoach.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; /** @@ -11,7 +11,7 @@ import lombok.Data; * @date 2024-03-29 */ @Data -public class DriveSchoolCoach extends BaseEntity +public class DriveSchoolCoach extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolContract.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolContract.java index 95d44676..9ae74bd5 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolContract.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolContract.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -13,7 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024-05-25 */ @Data -public class DriveSchoolContract extends BaseEntity +public class DriveSchoolContract extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCourse.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCourse.java index c057dee9..13e212b8 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCourse.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCourse.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; @@ -15,7 +15,7 @@ import java.util.List; * @date 2024-03-21 */ @Data -public class DriveSchoolCourse extends BaseEntity +public class DriveSchoolCourse extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCourseOrder.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCourseOrder.java index f9d2d683..7f2b99ac 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCourseOrder.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCourseOrder.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; import java.math.BigDecimal; @@ -14,7 +14,7 @@ import java.math.BigDecimal; * @date 2024-03-25 */ @Data -public class DriveSchoolCourseOrder extends BaseEntity +public class DriveSchoolCourseOrder extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCredentials.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCredentials.java index 314b1189..c3019759 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCredentials.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCredentials.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -15,7 +15,7 @@ import java.util.Date; * @date 2024-05-23 */ @Data -public class DriveSchoolCredentials extends BaseEntity +public class DriveSchoolCredentials extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDailyManagement.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDailyManagement.java index bcc1f341..c906d8e3 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDailyManagement.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDailyManagement.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; /** @@ -12,7 +12,7 @@ import lombok.Data; * @date 2024-05-24 */ @Data -public class DriveSchoolDailyManagement extends BaseEntity +public class DriveSchoolDailyManagement extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDeduct.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDeduct.java index 850865bc..a085b065 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDeduct.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDeduct.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -16,7 +16,7 @@ import java.math.BigDecimal; * @date 2024-05-07 */ @Data -public class DriveSchoolDeduct extends BaseEntity +public class DriveSchoolDeduct extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDial.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDial.java index e818fa32..8e243f86 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDial.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDial.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024-05-24 */ @Data -public class DriveSchoolDial extends BaseEntity +public class DriveSchoolDial extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDynamic.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDynamic.java index 466304f6..0bfc1085 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDynamic.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDynamic.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024-05-10 */ @Data -public class DriveSchoolDynamic extends BaseEntity +public class DriveSchoolDynamic extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolExamPass.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolExamPass.java index f387f61c..b226ebcc 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolExamPass.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolExamPass.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -19,7 +19,7 @@ import java.util.Date; */ @Data -public class DriveSchoolExamPass extends BaseEntity +public class DriveSchoolExamPass extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFacility.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFacility.java index 8a957073..1613219f 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFacility.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFacility.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -14,7 +14,7 @@ import java.util.Date; * @date 2024-05-23 */ @Data -public class DriveSchoolFacility extends BaseEntity +public class DriveSchoolFacility extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFile.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFile.java index ffe9647c..64b669f5 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFile.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFile.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -13,7 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024-05-10 */ @Data -public class DriveSchoolFile extends BaseEntity +public class DriveSchoolFile extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInfo.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInfo.java index 2e7b6fff..5613a7a0 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInfo.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInfo.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; import java.math.BigDecimal; @@ -14,7 +14,7 @@ import java.math.BigDecimal; * @date 2024-03-19 */ @Data -public class DriveSchoolInfo extends BaseEntity +public class DriveSchoolInfo extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInsurance.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInsurance.java index 84b75413..07f1e687 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInsurance.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInsurance.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -16,7 +16,7 @@ import java.util.Date; * @date 2024-05-06 */ @Data -public class DriveSchoolInsurance extends BaseEntity +public class DriveSchoolInsurance extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNews.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNews.java index f364ff8d..a0c4f86e 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNews.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNews.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024-05-10 */ @Data -public class DriveSchoolNews extends BaseEntity +public class DriveSchoolNews extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNotice.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNotice.java index cad348c7..70129c76 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNotice.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNotice.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024-05-28 */ @Data -public class DriveSchoolNotice extends BaseEntity +public class DriveSchoolNotice extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolPhone.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolPhone.java index 01947cde..ebc73f36 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolPhone.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolPhone.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024-05-10 */ @Data -public class DriveSchoolPhone extends BaseEntity +public class DriveSchoolPhone extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReimbursement.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReimbursement.java index d4c3dce9..fa8fb1fc 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReimbursement.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReimbursement.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024-05-19 */ @Data -public class DriveSchoolReimbursement extends BaseEntity +public class DriveSchoolReimbursement extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReservationCourse.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReservationCourse.java index a16214bb..bf399a71 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReservationCourse.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReservationCourse.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import cn.iocoder.yudao.module.jx.payment.entity.DriveSchoolPay; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import com.baomidou.mybatisplus.annotation.TableField; @@ -17,7 +17,7 @@ import java.util.Date; * @date 2024-04-08 */ @Data -public class DriveSchoolReservationCourse extends BaseEntity +public class DriveSchoolReservationCourse extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSeparate.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSeparate.java index 5d78015d..c6347aa4 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSeparate.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSeparate.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024-05-28 */ @Data -public class DriveSchoolSeparate extends BaseEntity +public class DriveSchoolSeparate extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSwiper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSwiper.java index 566bf8c7..38ab85b8 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSwiper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSwiper.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; /** @@ -12,7 +12,7 @@ import lombok.Data; * @date 2024-03-19 */ @Data -public class DriveSchoolSwiper extends BaseEntity +public class DriveSchoolSwiper extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolTeachingJournal.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolTeachingJournal.java index 9de5e78e..fc815145 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolTeachingJournal.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolTeachingJournal.java @@ -3,7 +3,8 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -22,7 +23,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; @Builder @NoArgsConstructor @AllArgsConstructor -public class DriveSchoolTeachingJournal extends TenantBaseDO +public class DriveSchoolTeachingJournal extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolText.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolText.java index 4c7ce06f..4e530106 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolText.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolText.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import lombok.Data; /** @@ -12,7 +12,7 @@ import lombok.Data; * @date 2024-04-16 */ @Data -public class DriveSchoolText extends BaseEntity +public class DriveSchoolText extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolUpkeep.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolUpkeep.java index ff298a51..94777962 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolUpkeep.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolUpkeep.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -15,7 +15,7 @@ import java.util.Date; * @date 2024-04-01 */ @Data -public class DriveSchoolUpkeep extends BaseEntity +public class DriveSchoolUpkeep extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/SopeNess.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/SopeNess.java index f4c58008..29c3c909 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/SopeNess.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/SopeNess.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.domain; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -15,7 +15,7 @@ import java.util.Date; * @date 2024-05-23 */ @Data -public class SopeNess extends BaseEntity +public class SopeNess extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveCarBindMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveCarBindMapper.java index 987f7103..9c587a39 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveCarBindMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveCarBindMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveCarBind; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,7 @@ public interface DriveCarBindMapper * @param driveCarBind 车辆绑定（教练） * @return 车辆绑定（教练）集合 */ - public List selectDriveCarBindList(DriveCarBind driveCarBind); + public IPage selectDriveCarBindList(@Param("entity") DriveCarBind driveCarBind, Page page); /** * 新增车辆绑定（教练） diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveContractTestMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveContractTestMapper.java index 578200a4..f3d3de46 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveContractTestMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveContractTestMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveContractTest; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +32,7 @@ public interface DriveContractTestMapper * @param driveContractTest 合同模板 * @return 合同模板集合 */ - public List selectDriveContractTestList(DriveContractTest driveContractTest); + public IPage selectDriveContractTestList(@Param("entity") DriveContractTest driveContractTest, Page page); /** * 新增合同模板 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarMapper.java index f625f3ff..a556ad5a 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCar; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,8 @@ public interface DriveSchoolCarMapper * @param driveSchoolCar 车辆信息 * @return 车辆信息集合 */ - public List selectDriveSchoolCarList(DriveSchoolCar driveSchoolCar); + public IPage selectDriveSchoolCarList(@Param("entity") DriveSchoolCar driveSchoolCar, Page page); + public List selectDriveSchoolCarListAll(@Param("entity") DriveSchoolCar driveSchoolCar); /** * 新增车辆信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarRepairMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarRepairMapper.java index dbd45f18..7da560f0 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarRepairMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarRepairMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCarRepair; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,8 @@ public interface DriveSchoolCarRepairMapper * @param driveSchoolCarRepair 车辆维修记录 * @return 车辆维修记录集合 */ - public List selectDriveSchoolCarRepairList(DriveSchoolCarRepair driveSchoolCarRepair); + public IPage selectDriveSchoolCarRepairList(@Param("entity") DriveSchoolCarRepair driveSchoolCarRepair, Page page); + public List selectDriveSchoolCarRepairListAll(DriveSchoolCarRepair driveSchoolCarRepair); /** * 新增车辆维修记录 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCheckMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCheckMapper.java index bcdbd581..4630b679 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCheckMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCheckMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCheck; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,7 @@ public interface DriveSchoolCheckMapper * @param driveSchoolCheck 车检管理 * @return 车检管理集合 */ - public List selectDriveSchoolCheckList(DriveSchoolCheck driveSchoolCheck); + public IPage selectDriveSchoolCheckList(@Param("entity") DriveSchoolCheck driveSchoolCheck, Page page); /** * 新增车检管理 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCoachMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCoachMapper.java index 9115db90..1a1e9c8c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCoachMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCoachMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCoach; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,8 @@ public interface DriveSchoolCoachMapper * @param driveSchoolCoach 驾校教练 * @return 驾校教练集合 */ - public List selectDriveSchoolCoachList(DriveSchoolCoach driveSchoolCoach); + public IPage selectDriveSchoolCoachList(@Param("entity") DriveSchoolCoach driveSchoolCoach, Page page); + public List selectDriveSchoolCoachListAll(@Param("entity") DriveSchoolCoach driveSchoolCoach); /** * 新增驾校教练 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolContractMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolContractMapper.java index d8a01e3b..c400188b 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolContractMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolContractMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolContract; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,7 @@ public interface DriveSchoolContractMapper * @param driveSchoolContract 驾校合同 * @return 驾校合同集合 */ - public List selectDriveSchoolContractList(DriveSchoolContract driveSchoolContract); + public IPage selectDriveSchoolContractList(@Param("entity") DriveSchoolContract driveSchoolContract, Page page); /** * 新增驾校合同 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCourseMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCourseMapper.java index 7ecdcaac..243b7f10 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCourseMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCourseMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,8 +31,9 @@ public interface DriveSchoolCourseMapper * @param driveSchoolCourse 驾校课程分类 * @return 驾校课程分类集合 */ - public List selectDriveSchoolCourseList(DriveSchoolCourse driveSchoolCourse); - public List selectDriveSchoolCourseAppletList(DriveSchoolCourse driveSchoolCourse); + public IPage selectDriveSchoolCourseList(@Param("entity") DriveSchoolCourse driveSchoolCourse, Page page); + public IPage selectDriveSchoolCourseAppletList(@Param("entity") DriveSchoolCourse driveSchoolCourse,Page page); + public List selectDriveSchoolCourseAppletListAll(@Param("entity") DriveSchoolCourse driveSchoolCourse); public List selectDriveSchoolCourseAppletFavorableListList(DriveSchoolCourse driveSchoolCourse); /** diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCourseOrderMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCourseOrderMapper.java index 2fba985d..e950017c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCourseOrderMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCourseOrderMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourseOrder; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,7 @@ public interface DriveSchoolCourseOrderMapper * @param driveSchoolCourseOrder 驾照报名订单 * @return 驾照报名订单集合 */ - public List selectDriveSchoolCourseOrderList(DriveSchoolCourseOrder driveSchoolCourseOrder); + public IPage selectDriveSchoolCourseOrderList(@Param("entity") DriveSchoolCourseOrder driveSchoolCourseOrder, Page page); /** * 新增驾照报名订单 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCredentialsMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCredentialsMapper.java index d1671c21..d7cc276b 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCredentialsMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCredentialsMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCredentials; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,7 @@ public interface DriveSchoolCredentialsMapper * @param driveSchoolCredentials 驾校资质信息 * @return 驾校资质信息集合 */ - public List selectDriveSchoolCredentialsList(DriveSchoolCredentials driveSchoolCredentials); + public IPage selectDriveSchoolCredentialsList(@Param("entity") DriveSchoolCredentials driveSchoolCredentials, Page page); /** * 新增驾校资质信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDailyManagementMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDailyManagementMapper.java index aeb0d955..3f3f18ed 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDailyManagementMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDailyManagementMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDailyManagement; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,7 @@ public interface DriveSchoolDailyManagementMapper * @param driveSchoolDailyManagement 驾校日常管理 * @return 驾校日常管理集合 */ - public List selectDriveSchoolDailyManagementList(DriveSchoolDailyManagement driveSchoolDailyManagement); + public IPage selectDriveSchoolDailyManagementList(@Param("entity") DriveSchoolDailyManagement driveSchoolDailyManagement, Page page); /** * 新增驾校日常管理 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDeductMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDeductMapper.java index 6ee9609f..875b0164 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDeductMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDeductMapper.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDeduct; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -29,7 +31,8 @@ public interface DriveSchoolDeductMapper * @param driveSchoolDeduct 提成配置 * @return 提成配置集合 */ - public List selectDriveSchoolDeductList(DriveSchoolDeduct driveSchoolDeduct); + public IPage selectDriveSchoolDeductList(@Param("entity") DriveSchoolDeduct driveSchoolDeduct, Page page); + public List selectDriveSchoolDeductListAll(@Param("entity") DriveSchoolDeduct driveSchoolDeduct); /** * 新增提成配置 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDialMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDialMapper.java index 4699540c..55365204 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDialMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDialMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDial; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,8 @@ public interface DriveSchoolDialMapper * @param driveSchoolDial 日常日志 * @return 日常日志集合 */ - public List selectDriveSchoolDialList(DriveSchoolDial driveSchoolDial); + public IPage selectDriveSchoolDialList(@Param("entity") DriveSchoolDial driveSchoolDial, Page page); + public List selectDriveSchoolDialListAll(@Param("entity") DriveSchoolDial driveSchoolDial); /** * 新增日常日志 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDynamicMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDynamicMapper.java index 286d7bca..1adc915b 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDynamicMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDynamicMapper.java @@ -1,7 +1,11 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDynamic; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +32,8 @@ public interface DriveSchoolDynamicMapper * @param driveSchoolDynamic 行业动态 * @return 行业动态集合 */ - public List selectDriveSchoolDynamicList(DriveSchoolDynamic driveSchoolDynamic); + public IPage selectDriveSchoolDynamicList(@Param("entity") DriveSchoolDynamic driveSchoolDynamic, Page page); + public List selectDriveSchoolDynamicListAll(@Param("entity") DriveSchoolDynamic driveSchoolDynamic); /** * 新增行业动态 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolExamPassMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolExamPassMapper.java index 535638b1..ff032d9a 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolExamPassMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolExamPassMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolExamPass; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,7 @@ public interface DriveSchoolExamPassMapper * @param driveSchoolExamPass 考试通过 * @return 考试通过集合 */ - public List selectDriveSchoolExamPassList(DriveSchoolExamPass driveSchoolExamPass); + public IPage selectDriveSchoolExamPassList(@Param("entity") DriveSchoolExamPass driveSchoolExamPass, Page page); /** * 新增考试通过 @@ -64,9 +67,9 @@ public interface DriveSchoolExamPassMapper List selectDriveSchoolExamPassByUserId(Long userId); - List checkList(Long userId); + IPage checkList(@Param("Page") Long userId, Page page); - List getBalanceList(DriveSchoolExamPass driveSchoolExamPass); + IPage getBalanceList(@Param("entity") DriveSchoolExamPass driveSchoolExamPass,Page page); DriveSchoolExamPass getBalance(DriveSchoolExamPass driveSchoolExamPass); DriveSchoolExamPass getBalanceByCaochId(DriveSchoolExamPass driveSchoolExamPass); DriveSchoolExamPass getBalanceApp (DriveSchoolExamPass driveSchoolExamPass); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolFacilityMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolFacilityMapper.java index bbce8827..cb8a5820 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolFacilityMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolFacilityMapper.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolFacility; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +32,7 @@ public interface DriveSchoolFacilityMapper * @param driveSchoolFacility 设备管理 * @return 设备管理集合 */ - public List selectDriveSchoolFacilityList(DriveSchoolFacility driveSchoolFacility); + public IPage selectDriveSchoolFacilityList(@Param("entity") DriveSchoolFacility driveSchoolFacility, Page page); /** * 新增设备管理 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolFileMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolFileMapper.java index d588214e..f658e3c1 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolFileMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolFileMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolFile; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,8 @@ public interface DriveSchoolFileMapper * @param driveSchoolFile 文件类型 * @return 文件类型集合 */ - public List selectDriveSchoolFileList(DriveSchoolFile driveSchoolFile); + public IPage selectDriveSchoolFileList(@Param("entity") DriveSchoolFile driveSchoolFile, Page page); + public List selectDriveSchoolFileListAll(@Param("entity") DriveSchoolFile driveSchoolFile); /** * 新增文件类型 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolInfoMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolInfoMapper.java index 8ff50eec..a2c3bf0a 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolInfoMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolInfoMapper.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolInfo; import cn.iocoder.yudao.module.jx.vo.DriveSchoolInfoVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,7 +33,7 @@ public interface DriveSchoolInfoMapper * @param driveSchoolInfo 驾校信息 * @return 驾校信息集合 */ - public List selectDriveSchoolInfoList(DriveSchoolInfo driveSchoolInfo); + public IPage selectDriveSchoolInfoList(@Param("entity") DriveSchoolInfo driveSchoolInfo, Page page); /** * 新增驾校信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolInsuranceMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolInsuranceMapper.java index 1347b667..ee824bc8 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolInsuranceMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolInsuranceMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolInsurance; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,7 @@ public interface DriveSchoolInsuranceMapper * @param driveSchoolInsurance 保险管理 * @return 保险管理集合 */ - public List selectDriveSchoolInsuranceList(DriveSchoolInsurance driveSchoolInsurance); + public IPage selectDriveSchoolInsuranceList(@Param("entity") DriveSchoolInsurance driveSchoolInsurance, Page page); /** * 新增保险管理 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolNewsMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolNewsMapper.java index 15ba5cc7..1a7be08e 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolNewsMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolNewsMapper.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolNews; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +32,8 @@ public interface DriveSchoolNewsMapper * @param driveSchoolNews 校内新闻 * @return 校内新闻集合 */ - public List selectDriveSchoolNewsList(DriveSchoolNews driveSchoolNews); + public IPage selectDriveSchoolNewsList(@Param("entity") DriveSchoolNews driveSchoolNews, Page page); + public List selectDriveSchoolNewsListAll(@Param("entity") DriveSchoolNews driveSchoolNews); /** * 新增校内新闻 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolNoticeMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolNoticeMapper.java index ffc9c6ae..eab1e591 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolNoticeMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolNoticeMapper.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolNotice; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +32,8 @@ public interface DriveSchoolNoticeMapper * @param driveSchoolNotice 通知 * @return 通知集合 */ - public List selectDriveSchoolNoticeList(DriveSchoolNotice driveSchoolNotice); + public IPage selectDriveSchoolNoticeList(@Param("entity") DriveSchoolNotice driveSchoolNotice, Page page); + public List selectDriveSchoolNoticeListAll(@Param("entity") DriveSchoolNotice driveSchoolNotice); /** * 新增通知 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolPhoneMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolPhoneMapper.java index 2cb6d02f..0dc0e9c9 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolPhoneMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolPhoneMapper.java @@ -2,7 +2,11 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolPhone; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.tencentcloudapi.waf.v20180125.models.IpAccessControlData; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +33,7 @@ public interface DriveSchoolPhoneMapper * @param driveSchoolPhone 客服 * @return 客服集合 */ - public List selectDriveSchoolPhoneList(DriveSchoolPhone driveSchoolPhone); + public IPage selectDriveSchoolPhoneList(@Param("entity") DriveSchoolPhone driveSchoolPhone, Page page); /** * 新增客服 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolReimbursementMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolReimbursementMapper.java index 715e292b..89acd339 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolReimbursementMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolReimbursementMapper.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolReimbursement; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +32,7 @@ public interface DriveSchoolReimbursementMapper * @param driveSchoolReimbursement 报销审核 * @return 报销审核集合 */ - public List selectDriveSchoolReimbursementList(DriveSchoolReimbursement driveSchoolReimbursement); + public IPage selectDriveSchoolReimbursementList(@Param("entity") DriveSchoolReimbursement driveSchoolReimbursement, Page page); /** * 新增报销审核 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolReservationCourseMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolReservationCourseMapper.java index 1e134c56..ae7f80b3 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolReservationCourseMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolReservationCourseMapper.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolReservationCourse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -30,7 +32,7 @@ public interface DriveSchoolReservationCourseMapper * @param driveSchoolReservationCourse 预约练车 * @return 预约练车集合 */ - public List selectDriveSchoolReservationCourseList(DriveSchoolReservationCourse driveSchoolReservationCourse); + public IPage selectDriveSchoolReservationCourseList(@Param("entity") DriveSchoolReservationCourse driveSchoolReservationCourse, Page page); /** * 新增预约练车 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolSeparateMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolSeparateMapper.java index b4afba53..da889aaa 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolSeparateMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolSeparateMapper.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolSeparate; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +32,7 @@ public interface DriveSchoolSeparateMapper * @param driveSchoolSeparate 驾校分账 * @return 驾校分账集合 */ - public List selectDriveSchoolSeparateList(DriveSchoolSeparate driveSchoolSeparate); + public IPage selectDriveSchoolSeparateList(@Param("entity") DriveSchoolSeparate driveSchoolSeparate, Page page); /** * 新增驾校分账 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolTextMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolTextMapper.java index cf08e8df..bae8ad2e 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolTextMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolTextMapper.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolText; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +32,7 @@ public interface DriveSchoolTextMapper * @param driveSchoolText 驾校公告 * @return 驾校公告集合 */ - public List selectDriveSchoolTextList(DriveSchoolText driveSchoolText); + public IPage selectDriveSchoolTextList(@Param("entity") DriveSchoolText driveSchoolText, Page page); /** * 新增驾校公告 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolUpkeepMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolUpkeepMapper.java index 403d0794..342ec00a 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolUpkeepMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolUpkeepMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolUpkeep; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,7 @@ public interface DriveSchoolUpkeepMapper * @param driveSchoolUpkeep 车辆保养记录 * @return 车辆保养记录集合 */ - public List selectDriveSchoolUpkeepList(DriveSchoolUpkeep driveSchoolUpkeep); + public IPage selectDriveSchoolUpkeepList(@Param("entity") DriveSchoolUpkeep driveSchoolUpkeep, Page page); /** * 新增车辆保养记录 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/SopeNessMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/SopeNessMapper.java index 6701a30c..c0039fe1 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/SopeNessMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/SopeNessMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.SopeNess; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,7 +31,7 @@ public interface SopeNessMapper * @param sopeNess 经营范围 * @return 经营范围集合 */ - public List selectSopeNessList(SopeNess sopeNess); + public IPage selectSopeNessList(@Param("entity") SopeNess sopeNess, Page page); /** * 新增经营范围 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/api/DriveSchoolPayController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/api/DriveSchoolPayController.java new file mode 100644 index 00000000..825aed16 --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/api/DriveSchoolPayController.java @@ -0,0 +1,242 @@ +package cn.iocoder.yudao.module.jx.payment.api; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.module.jx.core.controller.BaseController; +import cn.iocoder.yudao.module.jx.domain.DriveSchoolCoach; +import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCoachMapper; +import cn.iocoder.yudao.module.jx.payment.entity.DriveSchoolPay; +import cn.iocoder.yudao.module.jx.payment.service.DriveSchoolPayService; +import cn.iocoder.yudao.module.jx.payment.vo.PayVo; +import cn.iocoder.yudao.module.jx.service.IDriveSchoolInfoService; +import cn.iocoder.yudao.module.jx.vo.DriveSchoolInfoVO; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 订单Controller + * + * @author ruoyi + * @date 2024-04-24 + */ +@RestController +@RequestMapping("/admin-api/system/pay") +public class DriveSchoolPayController extends BaseController +{ + @Autowired + private DriveSchoolPayService driveSchoolPayService; + @Autowired + private IDriveSchoolInfoService driveSchoolInfoService; + + @Resource + private AdminUserApi userApi; + + + @GetMapping("updatePayById") + public void updatePayById(Integer id, String name, Integer jlId) { + driveSchoolPayService.updatePayById(id, name, jlId); + } + + + /** + * 查询订单列表 + */ + @GetMapping("/list") + public CommonResult> list(DriveSchoolPay driveSchoolPay) + { + + int number = 0; + int numbers = 0; + int allNumber = 0; + DriveSchoolInfoVO schoolInfo = driveSchoolInfoService.getSchoolInfoByDeptId(); + + if (schoolInfo != null) { + driveSchoolPay.setJxId(schoolInfo.getId()); + } + + Page page = new Page<>(driveSchoolPay.getPageNum(), driveSchoolPay.getPageSize()); + IPage driveSchoolPayIPage = driveSchoolPayService.selectDriveSchoolPayList(driveSchoolPay, page); + List list = driveSchoolPayIPage.getRecords(); + for (DriveSchoolPay row :list) { + numbers += 1; + allNumber = (driveSchoolPay.getPageNum()-1) * driveSchoolPay.getPageSize(); + number = allNumber + numbers; + String formattedNumber = String.format("%05d", number); + row.setSorNumber(formattedNumber); + } + return CommonResult.success(driveSchoolPayIPage); + } + + /** + * 查询订单列表 + */ + @GetMapping("/stuList") + public CommonResult> stuList(DriveSchoolPay driveSchoolPay) + { + Page page = new Page<>(driveSchoolPay.getPageNum(), driveSchoolPay.getPageSize()); + IPage driveSchoolPayIPage = driveSchoolPayService.stuList(driveSchoolPay, page); + return CommonResult.success(driveSchoolPayIPage); + } + + +// @Resource +// private SysUserMapper sysUserMapper; + + @Resource + private DriveSchoolCoachMapper driveSchoolCoachMapper; + + /** + * 查询订单列表 + */ + @GetMapping("/stuListByCoachId") + public CommonResult> stuListByCoachId(DriveSchoolPay driveSchoolPay) + { + Long userId = SecurityFrameworkUtils.getLoginUserId(); + AdminUserRespDTO sysUser = userApi.getUser(userId); + String phonenumber = sysUser.getMobile(); +// Long userId = SecurityUtils.getUserId(); +// SysUser sysUser = sysUserMapper.selectUserById(userId); +// String phonenumber = sysUser.getPhonenumber(); + DriveSchoolCoach driveSchoolCoach = driveSchoolCoachMapper.selectByPhonenumber(phonenumber); + Long jlId = 0L; + if (ObjectUtils.isNotEmpty(driveSchoolCoach)){ + jlId= driveSchoolCoach.getId(); + } + driveSchoolPay.setJlId(jlId); + Page page = new Page<>(driveSchoolPay.getPageNum(), driveSchoolPay.getPageSize()); + IPage driveSchoolPayIPage = driveSchoolPayService.stuListByCoachId(driveSchoolPay, page); + return CommonResult.success(driveSchoolPayIPage); + } + + + /** + * 导出订单列表 + */ +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolPay driveSchoolPay) +// { +// List list = driveSchoolPayService.selectDriveSchoolPayList(driveSchoolPay); +// ExcelUtil util = new ExcelUtil(DriveSchoolPay.class); +// util.exportExcel(response, list, "订单数据"); +// } + + /** + * 导入学员信息 + */ +// @PostMapping("/exportIn") +// public void exportIn(HttpServletResponse response, DriveSchoolPay driveSchoolPay) +// { +// List list = driveSchoolPayService.selectDriveSchoolPayList(driveSchoolPay); +// ExcelUtil util = new ExcelUtil(DriveSchoolPay.class); +// util.exportExcel(response, list, "订单数据"); +// } + + + +// @PostMapping("/importData") +// public CommonResult importData(MultipartFile file, boolean updateSupport) throws Exception +// { +// ExcelUtil util = new ExcelUtil(DriveSchoolPay.class); +// List userList = util.importExcel(file.getInputStream()); +// String operName = getUsername(); +// String message = driveSchoolPayService.importUser(userList, updateSupport, operName); +// return success(message); +// } + + + /** + * 获取订单详细信息 + */ + @GetMapping(value = "/{id}") + public CommonResult getInfo(@PathVariable("id") Long id) + { + return success(driveSchoolPayService.selectDriveSchoolPayById(id)); + } + + /** + * 获取订单详细信息 + */ + @GetMapping(value = "/getInfoByUserId/{userId}") + public CommonResult getInfoByUserId(@PathVariable("userId") Long userId) + { + return success(driveSchoolPayService.getInfoByUserId(userId)); + } + + /** + * 获取订单详细信息 + */ + @GetMapping(value = "/getInfoByUserIndenty/{userId}") + public CommonResult getInfoByUserIndenty(@PathVariable("userId") String userId) + { + return success(driveSchoolPayService.getInfoByUserIndenty(userId)); + } + + /** + * 新增订单 + */ + @PostMapping + public CommonResult add(@RequestBody DriveSchoolPay driveSchoolPay) + { + return toAjax(driveSchoolPayService.insertDriveSchoolPay(driveSchoolPay)); + } + + /** + * 修改订单 + */ + @PutMapping + public CommonResult edit(@RequestBody DriveSchoolPay driveSchoolPay) + { + return toAjax(driveSchoolPayService.updateDriveSchoolPay(driveSchoolPay)); + } + + /** + * 删除订单 + */ + @DeleteMapping("/{ids}") + public CommonResult remove(@PathVariable Long[] ids) + { + return toAjax(driveSchoolPayService.deleteDriveSchoolPayByIds(ids)); + } + + /** + * 学员详情-报名课程接口 + */ + @GetMapping("/applet/getReportCourseList") + public CommonResult> getReportCourseList(DriveSchoolPay driveSchoolPay) + { + Page page = new Page<>(driveSchoolPay.getPageNum(), driveSchoolPay.getPageSize()); + IPage reportCourseList = driveSchoolPayService.getReportCourseList(driveSchoolPay, page); + return CommonResult.success(reportCourseList); + } + + /** + * 学员详情列表 + */ + @GetMapping("/applet/getUserList") + public CommonResult> getUserList(DriveSchoolPay driveSchoolPay) + { + Page page = new Page<>(driveSchoolPay.getPageNum(), driveSchoolPay.getPageSize()); + IPage userList = driveSchoolPayService.getUserList(driveSchoolPay, page); + return CommonResult.success(userList); + } + + /** + * 返回教练提成金额 + */ + @GetMapping("/getDeductByUserInfo") + public CommonResult getDeductByUserInfo(DriveSchoolPay driveSchoolPay) + { + PayVo payVo = driveSchoolPayService.getDeductByUserInfo(driveSchoolPay); + + return CommonResult.success(payVo); + } + +} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolBooking.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolBooking.java index dfc8bd45..badf76bc 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolBooking.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolBooking.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.jx.payment.entity; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -16,7 +16,7 @@ import java.util.Date; * @date 2024-04-25 */ @Data -public class DriveSchoolBooking extends BaseEntity +public class DriveSchoolBooking extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolPay.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolPay.java index b64a4c97..e79062bc 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolPay.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolPay.java @@ -1,19 +1,16 @@ package cn.iocoder.yudao.module.jx.payment.entity; import cn.iocoder.yudao.annotation.Excel; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourse; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import java.util.Date; @Data -public class DriveSchoolPay extends BaseEntity +public class DriveSchoolPay extends TenantBaDO { private static final long serialVersionUID = 1L; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/commentVo.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/commentVo.java index b1b4af9d..ab82a38d 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/commentVo.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/commentVo.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.jx.payment.entity; -import cn.iocoder.yudao.module.jx.core.page.BaseEntity; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @Data -public class commentVo extends BaseEntity { +public class commentVo extends TenantBaDO { private String commentDesc; private Integer commentStar; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/mapper/DriveSchoolBookingMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/mapper/DriveSchoolBookingMapper.java index adbf6c31..ea292e6f 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/mapper/DriveSchoolBookingMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/mapper/DriveSchoolBookingMapper.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.payment.mapper; import cn.iocoder.yudao.module.jx.payment.entity.DriveSchoolBooking; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +32,7 @@ public interface DriveSchoolBookingMapper * @param driveSchoolBooking 预约 * @return 预约集合 */ - public List selectDriveSchoolBookingList(DriveSchoolBooking driveSchoolBooking); + public IPage selectDriveSchoolBookingList(@Param("entity") DriveSchoolBooking driveSchoolBooking, Page page); public List listByUser(DriveSchoolBooking driveSchoolBooking); /** diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/mapper/DriveSchoolPayMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/mapper/DriveSchoolPayMapper.java index 26f5e92d..8ac0a187 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/mapper/DriveSchoolPayMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/mapper/DriveSchoolPayMapper.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.jx.payment.mapper; import cn.iocoder.yudao.module.jx.payment.entity.DriveSchoolPay; import cn.iocoder.yudao.module.jx.vo.DriveSchoolPayVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -30,10 +32,10 @@ public interface DriveSchoolPayMapper * @param driveSchoolPay 订单 * @return 订单集合 */ - public List selectDriveSchoolPayList(DriveSchoolPay driveSchoolPay); - public List stuList(DriveSchoolPay driveSchoolPay); - public List stuOneList(DriveSchoolPay driveSchoolPay); - public List stuTwoList(DriveSchoolPay driveSchoolPay); + public IPage selectDriveSchoolPayList(@Param("entity") DriveSchoolPay driveSchoolPay, Page page); + public IPage stuList(@Param("entity") DriveSchoolPay driveSchoolPay,Page page); + public IPage stuOneList(@Param("entity") DriveSchoolPay driveSchoolPay,Page page); + public IPage stuTwoList(@Param("entity")DriveSchoolPay driveSchoolPay,Page page); /** * 新增订单 @@ -69,9 +71,9 @@ public interface DriveSchoolPayMapper void updatePayById(@Param("id") Integer id, @Param("name") String name, @Param("jlId") Integer jlId); - List getReportCourseList(DriveSchoolPay driveSchoolPay); + IPage getReportCourseList(@Param("entity") DriveSchoolPay driveSchoolPay,Page page); - List getUserList(DriveSchoolPay driveSchoolPay); + IPage getUserList(@Param("entity") DriveSchoolPay driveSchoolPay,Page page); List getInfoByUserId(Long userId); List getInfoByUserIndenty(String userId); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/service/DriveSchoolPayService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/service/DriveSchoolPayService.java index 209901e9..210dba6e 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/service/DriveSchoolPayService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/service/DriveSchoolPayService.java @@ -4,6 +4,8 @@ package cn.iocoder.yudao.module.jx.payment.service; import cn.iocoder.yudao.module.jx.payment.entity.DriveSchoolPay; import cn.iocoder.yudao.module.jx.payment.vo.PayVo; import cn.iocoder.yudao.module.jx.vo.DriveSchoolPayVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -29,8 +31,8 @@ public interface DriveSchoolPayService * @param driveSchoolPay 订单 * @return 订单集合 */ - public List selectDriveSchoolPayList(DriveSchoolPay driveSchoolPay); - public List stuList(DriveSchoolPay driveSchoolPay); + public IPage selectDriveSchoolPayList(DriveSchoolPay driveSchoolPay, Page page); + public IPage stuList(DriveSchoolPay driveSchoolPay,Page page); /** * 新增订单 @@ -66,16 +68,16 @@ public interface DriveSchoolPayService void updatePayById(Integer id, String name, Integer jlId); - List getReportCourseList(DriveSchoolPay driveSchoolPay); + IPage getReportCourseList(DriveSchoolPay driveSchoolPay,Page page); - List getUserList(DriveSchoolPay driveSchoolPay); + IPage getUserList(DriveSchoolPay driveSchoolPay,Page page); DriveSchoolPay getInfoByUserId(Long userId); DriveSchoolPay getInfoByUserIndenty(String userId); PayVo getDeductByUserInfo(DriveSchoolPay driveSchoolPay); - List stuListByCoachId(DriveSchoolPay driveSchoolPay); + IPage stuListByCoachId(DriveSchoolPay driveSchoolPay,Page page); DriveSchoolPay selectByUserId(Long userId); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/service/impl/DriveSchoolPayServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/service/impl/DriveSchoolPayServiceImpl.java index 4cae68fc..847f0ca9 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/service/impl/DriveSchoolPayServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/service/impl/DriveSchoolPayServiceImpl.java @@ -13,8 +13,9 @@ import cn.iocoder.yudao.module.jx.payment.vo.PayVo; import cn.iocoder.yudao.module.jx.vo.DriveSchoolPayVo; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.thoughtworks.xstream.core.SecurityUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -73,9 +74,10 @@ public class DriveSchoolPayServiceImpl implements DriveSchoolPayService * @return 订单 */ @Override - public List selectDriveSchoolPayList(DriveSchoolPay driveSchoolPay) + public IPage selectDriveSchoolPayList(DriveSchoolPay driveSchoolPay, Page page) { - List driveSchoolPays = driveSchoolPayMapper.selectDriveSchoolPayList(driveSchoolPay); + IPage driveSchoolPayIPage = driveSchoolPayMapper.selectDriveSchoolPayList(driveSchoolPay, page); + List driveSchoolPays = driveSchoolPayIPage.getRecords(); driveSchoolPays.forEach(item->{ DriveSchoolCourse driveSchoolCourse = driveSchoolCourseMapper.selectDriveSchoolCourseById(item.getCourseId()); if (ObjectUtils.isEmpty(driveSchoolCourse)){ @@ -88,13 +90,14 @@ public class DriveSchoolPayServiceImpl implements DriveSchoolPayService item.setCourseName(driveSchoolCourse.getAutomatic()); } }); - return driveSchoolPays; + return driveSchoolPayIPage; } @Override - public List stuList(DriveSchoolPay driveSchoolPay) + public IPage stuList(DriveSchoolPay driveSchoolPay,Page page) { - List driveSchoolPays = driveSchoolPayMapper.stuList(driveSchoolPay); + IPage driveSchoolPayIPage = driveSchoolPayMapper.stuList(driveSchoolPay, page); + List driveSchoolPays = driveSchoolPayIPage.getRecords(); ArrayList collect = driveSchoolPays.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(DriveSchoolPay::getIdentity))), ArrayList::new)); @@ -108,7 +111,8 @@ public class DriveSchoolPayServiceImpl implements DriveSchoolPayService } //根据时间倒序排序 collect.sort(Comparator.comparing(DriveSchoolPay::getCreateTime).reversed()); - return collect; + driveSchoolPayIPage.setRecords(collect); + return driveSchoolPayIPage; } /** @@ -165,16 +169,16 @@ public class DriveSchoolPayServiceImpl implements DriveSchoolPayService } @Override - public List getReportCourseList(DriveSchoolPay driveSchoolPay) { + public IPage getReportCourseList(DriveSchoolPay driveSchoolPay,Page page) { /*Long deptId = SecurityUtils.getDeptId(); driveSchoolPay.setJxId(deptId);*/ - List reportCourseList = driveSchoolPayMapper.getReportCourseList(driveSchoolPay); + IPage reportCourseList = driveSchoolPayMapper.getReportCourseList(driveSchoolPay, page); return reportCourseList; } @Override - public List getUserList(DriveSchoolPay driveSchoolPay) { - List userList = driveSchoolPayMapper.getUserList(driveSchoolPay); + public IPage getUserList(DriveSchoolPay driveSchoolPay,Page page) { + return driveSchoolPayMapper.getUserList(driveSchoolPay,page); // ArrayList collect = userList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> // new TreeSet<>(Comparator.comparing(DriveSchoolPay::getPhone))), ArrayList::new)); @@ -183,7 +187,7 @@ public class DriveSchoolPayServiceImpl implements DriveSchoolPayService SysUser sysUserData = sysUserMapper.findSysUserById(driveSchoolPayVo.getUserId()); driveSchoolPayVo.setPhone(sysUserData.getPhonenumber()); }*/ - return userList; + // return userList; } @Override @@ -230,17 +234,20 @@ public class DriveSchoolPayServiceImpl implements DriveSchoolPayService private DriveSchoolCoachMapper driveSchoolCoachMapper; @Override - public List stuListByCoachId(DriveSchoolPay driveSchoolPay) { + public IPage stuListByCoachId(DriveSchoolPay driveSchoolPay,Page page) { //获取教练id List driveSchoolPays = new ArrayList<>(); + IPage driveSchoolPayIPage = new Page<>(); if (ObjectUtils.isNotEmpty(driveSchoolPay.getType())){ if (driveSchoolPay.getType().equals("2")){ driveSchoolPay.setType("科目一"); - driveSchoolPays = driveSchoolPayMapper.stuOneList(driveSchoolPay); + driveSchoolPayIPage = driveSchoolPayMapper.stuOneList(driveSchoolPay, page); + driveSchoolPays = driveSchoolPayIPage.getRecords(); }else { driveSchoolPay.setType("科目二"); - driveSchoolPays = driveSchoolPayMapper.stuTwoList(driveSchoolPay); + driveSchoolPayIPage = driveSchoolPayMapper.stuTwoList(driveSchoolPay, page); + driveSchoolPays = driveSchoolPayIPage.getRecords(); } } @@ -257,7 +264,7 @@ public class DriveSchoolPayServiceImpl implements DriveSchoolPayService } } - return driveSchoolPays; + return driveSchoolPayIPage; } @Override diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/DriveSchoolBookingService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/DriveSchoolBookingService.java index e83381aa..698d7392 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/DriveSchoolBookingService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/DriveSchoolBookingService.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.payment.entity.DriveSchoolBooking; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -27,7 +29,7 @@ public interface DriveSchoolBookingService * @param driveSchoolBooking 预约 * @return 预约集合 */ - public List selectDriveSchoolBookingList(DriveSchoolBooking driveSchoolBooking); + public IPage selectDriveSchoolBookingList(DriveSchoolBooking driveSchoolBooking, Page page); public List listByUser(DriveSchoolBooking driveSchoolBooking); /** diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveCarBindService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveCarBindService.java index aac6d057..5523dd0f 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveCarBindService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveCarBindService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveCarBind; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,7 @@ public interface IDriveCarBindService * @param driveCarBind 车辆绑定（教练） * @return 车辆绑定（教练）集合 */ - public List selectDriveCarBindList(DriveCarBind driveCarBind); + public IPage selectDriveCarBindList(DriveCarBind driveCarBind, Page page); /** * 新增车辆绑定（教练） diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveContractTestService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveContractTestService.java index b99e4c41..51f87f4c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveContractTestService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveContractTestService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveContractTest; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,7 @@ public interface IDriveContractTestService * @param driveContractTest 合同模板 * @return 合同模板集合 */ - public List selectDriveContractTestList(DriveContractTest driveContractTest); + public IPage selectDriveContractTestList(DriveContractTest driveContractTest, Page page); /** * 新增合同模板 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCarRepairService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCarRepairService.java index 090c6229..564e0bfa 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCarRepairService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCarRepairService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCarRepair; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,8 @@ public interface IDriveSchoolCarRepairService * @param driveSchoolCarRepair 车辆维修记录 * @return 车辆维修记录集合 */ - public List selectDriveSchoolCarRepairList(DriveSchoolCarRepair driveSchoolCarRepair); + public IPage selectDriveSchoolCarRepairList(DriveSchoolCarRepair driveSchoolCarRepair, Page page); + public List selectDriveSchoolCarRepairListAll(DriveSchoolCarRepair driveSchoolCarRepair); /** * 新增车辆维修记录 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCarService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCarService.java index e51c8ca3..b04e923f 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCarService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCarService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCar; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,8 @@ public interface IDriveSchoolCarService * @param driveSchoolCar 车辆信息 * @return 车辆信息集合 */ - public List selectDriveSchoolCarList(DriveSchoolCar driveSchoolCar); + public IPage selectDriveSchoolCarList(DriveSchoolCar driveSchoolCar, Page page); + public List selectDriveSchoolCarListAll(DriveSchoolCar driveSchoolCar); /** * 新增车辆信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCheckService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCheckService.java index 459ce11e..c6b7e8c8 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCheckService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCheckService.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCheck; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import javax.imageio.IIOParam; import java.util.List; /** @@ -26,7 +29,7 @@ public interface IDriveSchoolCheckService * @param driveSchoolCheck 车检管理 * @return 车检管理集合 */ - public List selectDriveSchoolCheckList(DriveSchoolCheck driveSchoolCheck); + public IPage selectDriveSchoolCheckList(DriveSchoolCheck driveSchoolCheck, Page page); /** * 新增车检管理 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCoachService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCoachService.java index bc4fbfd7..13af5b5a 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCoachService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCoachService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCoach; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,8 @@ public interface IDriveSchoolCoachService * @param driveSchoolCoach 驾校教练 * @return 驾校教练集合 */ - public List selectDriveSchoolCoachList(DriveSchoolCoach driveSchoolCoach); + public IPage selectDriveSchoolCoachList(DriveSchoolCoach driveSchoolCoach, Page page); + public List selectDriveSchoolCoachListAll(DriveSchoolCoach driveSchoolCoach); /** * 新增驾校教练 @@ -62,7 +65,7 @@ public interface IDriveSchoolCoachService List selectDriveSchoolCoachLimitList(DriveSchoolCoach driveSchoolCoach); - List selectDriveSchoolCoachListAll(DriveSchoolCoach driveSchoolCoach); +// List selectDriveSchoolCoachListAll(DriveSchoolCoach driveSchoolCoach); List findSelfJlListByJxId(Long jxId); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolContractService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolContractService.java index 16274edf..960b8ad9 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolContractService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolContractService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolContract; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,7 @@ public interface IDriveSchoolContractService * @param driveSchoolContract 驾校合同 * @return 驾校合同集合 */ - public List selectDriveSchoolContractList(DriveSchoolContract driveSchoolContract); + public IPage selectDriveSchoolContractList(DriveSchoolContract driveSchoolContract, Page page); /** * 新增驾校合同 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCourseOrderService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCourseOrderService.java index e36344aa..494c3159 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCourseOrderService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCourseOrderService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourseOrder; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,7 @@ public interface IDriveSchoolCourseOrderService * @param driveSchoolCourseOrder 驾照报名订单 * @return 驾照报名订单集合 */ - public List selectDriveSchoolCourseOrderList(DriveSchoolCourseOrder driveSchoolCourseOrder); + public IPage selectDriveSchoolCourseOrderList(DriveSchoolCourseOrder driveSchoolCourseOrder, Page page); /** * 新增驾照报名订单 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCourseService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCourseService.java index 2dae1bcb..b1980375 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCourseService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCourseService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -27,9 +29,9 @@ public interface IDriveSchoolCourseService * @param driveSchoolCourse 驾校课程分类 * @return 驾校课程分类集合 */ - public List selectDriveSchoolCourseList(DriveSchoolCourse driveSchoolCourse); - public List selectDriveSchoolCourseAppList(DriveSchoolCourse driveSchoolCourse); - public List selectDriveSchoolCourseAppletList(DriveSchoolCourse driveSchoolCourse); + public IPage selectDriveSchoolCourseList(DriveSchoolCourse driveSchoolCourse, Page page); + public IPage selectDriveSchoolCourseAppList(DriveSchoolCourse driveSchoolCourse,Page page); + public List selectDriveSchoolCourseAppletListAll(DriveSchoolCourse driveSchoolCourse); public List selectDriveSchoolCourseAppletFavorableListList(DriveSchoolCourse driveSchoolCourse); /** diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCredentialsService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCredentialsService.java index 39c06867..9966cf1a 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCredentialsService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCredentialsService.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCredentials; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -27,7 +29,7 @@ public interface IDriveSchoolCredentialsService * @param driveSchoolCredentials 驾校资质信息 * @return 驾校资质信息集合 */ - public List selectDriveSchoolCredentialsList(DriveSchoolCredentials driveSchoolCredentials); + public IPage selectDriveSchoolCredentialsList(DriveSchoolCredentials driveSchoolCredentials, Page page); /** * 新增驾校资质信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDailyManagementService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDailyManagementService.java index c1fe3078..a92f505a 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDailyManagementService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDailyManagementService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDailyManagement; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,7 @@ public interface IDriveSchoolDailyManagementService * @param driveSchoolDailyManagement 驾校日常管理 * @return 驾校日常管理集合 */ - public List selectDriveSchoolDailyManagementList(DriveSchoolDailyManagement driveSchoolDailyManagement); + public IPage selectDriveSchoolDailyManagementList(DriveSchoolDailyManagement driveSchoolDailyManagement, Page page); /** * 新增驾校日常管理 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDeductService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDeductService.java index 5d1ace86..4fa8813c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDeductService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDeductService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDeduct; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,7 @@ public interface IDriveSchoolDeductService * @param driveSchoolDeduct 提成配置 * @return 提成配置集合 */ - public List selectDriveSchoolDeductList(DriveSchoolDeduct driveSchoolDeduct); + public IPage selectDriveSchoolDeductList(DriveSchoolDeduct driveSchoolDeduct, Page page); /** * 新增提成配置 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDialService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDialService.java index 39c041b6..16bfff32 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDialService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDialService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDial; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,8 +28,8 @@ public interface IDriveSchoolDialService * @param driveSchoolDial 日常日志 * @return 日常日志集合 */ - public List selectDriveSchoolDialList(DriveSchoolDial driveSchoolDial); - public List selectDriveSchoolDialAppList(DriveSchoolDial driveSchoolDial); + public IPage selectDriveSchoolDialList(DriveSchoolDial driveSchoolDial, Page page); + public IPage selectDriveSchoolDialAppList(DriveSchoolDial driveSchoolDial,Page page); /** * 新增日常日志 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDynamicService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDynamicService.java index f178eebe..d5292d89 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDynamicService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolDynamicService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDynamic; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,8 @@ public interface IDriveSchoolDynamicService * @param driveSchoolDynamic 行业动态 * @return 行业动态集合 */ - public List selectDriveSchoolDynamicList(DriveSchoolDynamic driveSchoolDynamic); + public IPage selectDriveSchoolDynamicList(DriveSchoolDynamic driveSchoolDynamic, Page page); + public List selectDriveSchoolDynamicListAll(DriveSchoolDynamic driveSchoolDynamic); /** * 新增行业动态 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolExamPassService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolExamPassService.java index 8f9288f5..2168d8d2 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolExamPassService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolExamPassService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolExamPass; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,7 @@ public interface IDriveSchoolExamPassService * @param driveSchoolExamPass 考试通过 * @return 考试通过集合 */ - public List selectDriveSchoolExamPassList(DriveSchoolExamPass driveSchoolExamPass); + public IPage selectDriveSchoolExamPassList(DriveSchoolExamPass driveSchoolExamPass, Page page); /** * 新增考试通过 @@ -60,9 +62,9 @@ public interface IDriveSchoolExamPassService */ public int deleteDriveSchoolExamPassById(Long id); - List checkList(DriveSchoolExamPass driveSchoolExamPass); + IPage checkList(DriveSchoolExamPass driveSchoolExamPass,Page page); - List getBalanceList(DriveSchoolExamPass driveSchoolExamPass); + IPage getBalanceList(DriveSchoolExamPass driveSchoolExamPass,Page page); int pay(DriveSchoolExamPass driveSchoolExamPass); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolFacilityService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolFacilityService.java index 61727066..38506b7c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolFacilityService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolFacilityService.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolFacility; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -27,7 +29,7 @@ public interface IDriveSchoolFacilityService * @param driveSchoolFacility 设备管理 * @return 设备管理集合 */ - public List selectDriveSchoolFacilityList(DriveSchoolFacility driveSchoolFacility); + public IPage selectDriveSchoolFacilityList(DriveSchoolFacility driveSchoolFacility, Page page); /** * 新增设备管理 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolFileService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolFileService.java index f8e7e65c..b5e59720 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolFileService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolFileService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolFile; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,7 @@ public interface IDriveSchoolFileService * @param driveSchoolFile 文件类型 * @return 文件类型集合 */ - public List selectDriveSchoolFileList(DriveSchoolFile driveSchoolFile); + public IPage selectDriveSchoolFileList(DriveSchoolFile driveSchoolFile, Page page); /** * 新增文件类型 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolInfoService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolInfoService.java index 315b342b..9c62506a 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolInfoService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolInfoService.java @@ -1,10 +1,11 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; import cn.iocoder.yudao.module.jx.domain.DriveSchoolInfo; import cn.iocoder.yudao.module.jx.payment.vo.PayVo; import cn.iocoder.yudao.module.jx.vo.DriveSchoolInfoVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -30,8 +31,8 @@ public interface IDriveSchoolInfoService * @param driveSchoolInfo 驾校信息 * @return 驾校信息集合 */ - public List selectDriveSchoolInfoList(DriveSchoolInfo driveSchoolInfo); - public TableDataInfo selectDriveSchoolInfoAppletList(DriveSchoolInfo driveSchoolInfo); + public IPage selectDriveSchoolInfoList(DriveSchoolInfo driveSchoolInfo, Page page); + public IPage selectDriveSchoolInfoAppletList(DriveSchoolInfo driveSchoolInfo,Page page); /** * 新增驾校信息 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolInsuranceService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolInsuranceService.java index d03fdbf7..5aa926c5 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolInsuranceService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolInsuranceService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolInsurance; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,7 @@ public interface IDriveSchoolInsuranceService * @param driveSchoolInsurance 保险管理 * @return 保险管理集合 */ - public List selectDriveSchoolInsuranceList(DriveSchoolInsurance driveSchoolInsurance); + public IPage selectDriveSchoolInsuranceList(DriveSchoolInsurance driveSchoolInsurance, Page page); /** * 新增保险管理 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolNewsService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolNewsService.java index 6cca086a..c64cf7fd 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolNewsService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolNewsService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolNews; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,8 @@ public interface IDriveSchoolNewsService * @param driveSchoolNews 校内新闻 * @return 校内新闻集合 */ - public List selectDriveSchoolNewsList(DriveSchoolNews driveSchoolNews); + public IPage selectDriveSchoolNewsList(DriveSchoolNews driveSchoolNews, Page page); + public List selectDriveSchoolNewsListAll(DriveSchoolNews driveSchoolNews); /** * 新增校内新闻 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolNoticeService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolNoticeService.java index 3c42e961..72578b26 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolNoticeService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolNoticeService.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolNotice; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import javax.imageio.IIOParam; import java.util.List; /** @@ -26,7 +29,7 @@ public interface IDriveSchoolNoticeService * @param driveSchoolNotice 通知 * @return 通知集合 */ - public List selectDriveSchoolNoticeList(DriveSchoolNotice driveSchoolNotice); + public IPage selectDriveSchoolNoticeList(DriveSchoolNotice driveSchoolNotice, Page page); public List selectDriveSchoolNoticeAppList(DriveSchoolNotice driveSchoolNotice); /** diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolPhoneService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolPhoneService.java index 0733af8e..bdb78ebb 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolPhoneService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolPhoneService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolPhone; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,7 @@ public interface IDriveSchoolPhoneService * @param driveSchoolPhone 客服 * @return 客服集合 */ - public List selectDriveSchoolPhoneList(DriveSchoolPhone driveSchoolPhone); + public IPage selectDriveSchoolPhoneList(DriveSchoolPhone driveSchoolPhone, Page page); /** * 新增客服 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolReimbursementService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolReimbursementService.java index 5e65b07b..386822aa 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolReimbursementService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolReimbursementService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolReimbursement; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,7 @@ public interface IDriveSchoolReimbursementService * @param driveSchoolReimbursement 报销审核 * @return 报销审核集合 */ - public List selectDriveSchoolReimbursementList(DriveSchoolReimbursement driveSchoolReimbursement); + public IPage selectDriveSchoolReimbursementList(DriveSchoolReimbursement driveSchoolReimbursement, Page page); /** * 新增报销审核 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolReservationCourseService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolReservationCourseService.java index dc7014c3..d070d6d2 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolReservationCourseService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolReservationCourseService.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolReservationCourse; +import cn.iocoder.yudao.module.jx.domain.DriveSchoolTeachingJournal; import cn.iocoder.yudao.module.jx.vo.StatisticsVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -27,8 +30,8 @@ public interface IDriveSchoolReservationCourseService * @param driveSchoolReservationCourse 预约练车 * @return 预约练车集合 */ - public List selectDriveSchoolReservationCourseList(DriveSchoolReservationCourse driveSchoolReservationCourse); - public List selectDriveSchoolReservationCoursePclist(DriveSchoolReservationCourse driveSchoolReservationCourse); + public IPage selectDriveSchoolReservationCourseList(DriveSchoolReservationCourse driveSchoolReservationCourse, Page page); + public IPage selectDriveSchoolReservationCoursePclist(DriveSchoolReservationCourse driveSchoolReservationCourse,Page page); /** * 新增预约练车 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolSeparateService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolSeparateService.java index 25d807aa..4f0c609a 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolSeparateService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolSeparateService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolSeparate; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; import java.util.Map; @@ -27,7 +29,7 @@ public interface IDriveSchoolSeparateService * @param driveSchoolSeparate 驾校分账 * @return 驾校分账集合 */ - public List selectDriveSchoolSeparateList(DriveSchoolSeparate driveSchoolSeparate); + public IPage selectDriveSchoolSeparateList(DriveSchoolSeparate driveSchoolSeparate, Page page); public Map getAllMoney(DriveSchoolSeparate driveSchoolSeparate); /** diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolTextService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolTextService.java index 79a925a7..b3cc82d2 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolTextService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolTextService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolText; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,7 @@ public interface IDriveSchoolTextService * @param driveSchoolText 驾校公告 * @return 驾校公告集合 */ - public List selectDriveSchoolTextList(DriveSchoolText driveSchoolText); + public IPage selectDriveSchoolTextList(DriveSchoolText driveSchoolText, Page page); /** * 新增驾校公告 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolUpkeepService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolUpkeepService.java index 4f5157ad..a0f4c1c3 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolUpkeepService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolUpkeepService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolUpkeep; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -26,7 +28,7 @@ public interface IDriveSchoolUpkeepService * @param driveSchoolUpkeep 车辆保养记录 * @return 车辆保养记录集合 */ - public List selectDriveSchoolUpkeepList(DriveSchoolUpkeep driveSchoolUpkeep); + public IPage selectDriveSchoolUpkeepList(DriveSchoolUpkeep driveSchoolUpkeep, Page page); /** * 新增车辆保养记录 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/ISopeNessService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/ISopeNessService.java index 24e5987b..4871264d 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/ISopeNessService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/ISopeNessService.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.SopeNess; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -27,7 +29,7 @@ public interface ISopeNessService * @param sopeNess 经营范围 * @return 经营范围集合 */ - public List selectSopeNessList(SopeNess sopeNess); + public IPage selectSopeNessList(SopeNess sopeNess, Page page); /** * 新增经营范围 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveCarBindServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveCarBindServiceImpl.java index ddb7ecbb..ed58da5e 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveCarBindServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveCarBindServiceImpl.java @@ -4,6 +4,8 @@ import cn.iocoder.yudao.module.jx.domain.DriveCarBind; import cn.iocoder.yudao.module.jx.mapper.DriveCarBindMapper; import cn.iocoder.yudao.module.jx.service.IDriveCarBindService; import cn.iocoder.yudao.module.jx.utils.DateUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,9 +43,9 @@ public class DriveCarBindServiceImpl implements IDriveCarBindService * @return 车辆绑定（教练） */ @Override - public List selectDriveCarBindList(DriveCarBind driveCarBind) + public IPage selectDriveCarBindList(DriveCarBind driveCarBind, Page page) { - return driveCarBindMapper.selectDriveCarBindList(driveCarBind); + return driveCarBindMapper.selectDriveCarBindList(driveCarBind, page); } /** @@ -67,7 +69,7 @@ public class DriveCarBindServiceImpl implements IDriveCarBindService @Override public int updateDriveCarBind(DriveCarBind driveCarBind) { - driveCarBind.setUpdateTime(DateUtils.getNowDate()); + //driveCarBind.setUpdateTime(DateUtils.getNowDate()); return driveCarBindMapper.updateDriveCarBind(driveCarBind); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveContractTestServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveContractTestServiceImpl.java index 0c90308d..3c3a87e2 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveContractTestServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveContractTestServiceImpl.java @@ -4,6 +4,8 @@ import cn.iocoder.yudao.module.jx.domain.DriveContractTest; import cn.iocoder.yudao.module.jx.mapper.DriveContractTestMapper; import cn.iocoder.yudao.module.jx.service.IDriveContractTestService; import cn.iocoder.yudao.module.jx.utils.DateUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,9 +42,9 @@ public class DriveContractTestServiceImpl implements IDriveContractTestService * @return 合同模板 */ @Override - public List selectDriveContractTestList(DriveContractTest driveContractTest) + public IPage selectDriveContractTestList(DriveContractTest driveContractTest, Page page) { - return driveContractTestMapper.selectDriveContractTestList(driveContractTest); + return driveContractTestMapper.selectDriveContractTestList(driveContractTest,page); } /** @@ -66,7 +68,7 @@ public class DriveContractTestServiceImpl implements IDriveContractTestService @Override public int updateDriveContractTest(DriveContractTest driveContractTest) { - driveContractTest.setUpdateTime(DateUtils.getNowDate()); + //driveContractTest.setUpdateTime(DateUtils.getNowDate()); return driveContractTestMapper.updateDriveContractTest(driveContractTest); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolBookingServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolBookingServiceImpl.java index 8ad31fed..53747a43 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolBookingServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolBookingServiceImpl.java @@ -4,6 +4,8 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.jx.payment.entity.DriveSchoolBooking; import cn.iocoder.yudao.module.jx.payment.mapper.DriveSchoolBookingMapper; import cn.iocoder.yudao.module.jx.service.DriveSchoolBookingService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.thoughtworks.xstream.core.SecurityUtils; import org.springframework.stereotype.Service; @@ -42,9 +44,9 @@ public class DriveSchoolBookingServiceImpl implements DriveSchoolBookingService * @return 预约 */ @Override - public List selectDriveSchoolBookingList(DriveSchoolBooking driveSchoolBooking) + public IPage selectDriveSchoolBookingList(DriveSchoolBooking driveSchoolBooking, Page page) { - return driveSchoolBookingMapper.selectDriveSchoolBookingList(driveSchoolBooking); + return driveSchoolBookingMapper.selectDriveSchoolBookingList(driveSchoolBooking,page); } @Override diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCarRepairServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCarRepairServiceImpl.java index 5535b385..390ea356 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCarRepairServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCarRepairServiceImpl.java @@ -9,6 +9,8 @@ import cn.iocoder.yudao.module.jx.service.IDriveSchoolCarRepairService; import cn.iocoder.yudao.module.jx.utils.DateUtils; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.thoughtworks.xstream.core.SecurityUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -54,13 +56,31 @@ public class DriveSchoolCarRepairServiceImpl implements IDriveSchoolCarRepairSer * @return 车辆维修记录 */ @Override - public List selectDriveSchoolCarRepairList(DriveSchoolCarRepair driveSchoolCarRepair) + public IPage selectDriveSchoolCarRepairList(DriveSchoolCarRepair driveSchoolCarRepair, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolCarRepair.setDeptId(deptId); - List driveSchoolCarRepairs = driveSchoolCarRepairMapper.selectDriveSchoolCarRepairList(driveSchoolCarRepair); + IPage driveSchoolCarRepairIPage = driveSchoolCarRepairMapper.selectDriveSchoolCarRepairList(driveSchoolCarRepair, page); + List driveSchoolCarRepairs = driveSchoolCarRepairIPage.getRecords(); + for (DriveSchoolCarRepair schoolCarRepair : driveSchoolCarRepairs) { + DriveSchoolCar driveSchoolCar = driveSchoolCarMapper.selectDriveSchoolCarById(schoolCarRepair.getCarId()); + if (ObjectUtils.isNotEmpty(driveSchoolCar)){ + schoolCarRepair.setCarName(driveSchoolCar.getCarModel()); + } + } + return driveSchoolCarRepairIPage; + } + + @Override + public List selectDriveSchoolCarRepairListAll(DriveSchoolCarRepair driveSchoolCarRepair) + { + Long userId = SecurityFrameworkUtils.getLoginUserId(); + AdminUserRespDTO user = userApi.getUser(userId); + Long deptId = user.getDeptId(); + driveSchoolCarRepair.setDeptId(deptId); + List driveSchoolCarRepairs = driveSchoolCarRepairMapper.selectDriveSchoolCarRepairListAll(driveSchoolCarRepair); for (DriveSchoolCarRepair schoolCarRepair : driveSchoolCarRepairs) { DriveSchoolCar driveSchoolCar = driveSchoolCarMapper.selectDriveSchoolCarById(schoolCarRepair.getCarId()); if (ObjectUtils.isNotEmpty(driveSchoolCar)){ @@ -95,7 +115,7 @@ public class DriveSchoolCarRepairServiceImpl implements IDriveSchoolCarRepairSer @Override public int updateDriveSchoolCarRepair(DriveSchoolCarRepair driveSchoolCarRepair) { - driveSchoolCarRepair.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolCarRepair.setUpdateTime(DateUtils.getNowDate()); return driveSchoolCarRepairMapper.updateDriveSchoolCarRepair(driveSchoolCarRepair); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCarServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCarServiceImpl.java index 9b51f2e0..79f8e1c3 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCarServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCarServiceImpl.java @@ -4,10 +4,12 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.jx.utils.DateUtils; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCar; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCarMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCarService; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.thoughtworks.xstream.core.SecurityUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -51,13 +53,23 @@ public class DriveSchoolCarServiceImpl implements IDriveSchoolCarService * @return 车辆信息 */ @Override - public List selectDriveSchoolCarList(DriveSchoolCar driveSchoolCar) + public IPage selectDriveSchoolCarList(DriveSchoolCar driveSchoolCar, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolCar.setDeptId(deptId); - return driveSchoolCarMapper.selectDriveSchoolCarList(driveSchoolCar); + return driveSchoolCarMapper.selectDriveSchoolCarList(driveSchoolCar,page); + } + + @Override + public List selectDriveSchoolCarListAll(DriveSchoolCar driveSchoolCar) + { + Long userId = SecurityFrameworkUtils.getLoginUserId(); + AdminUserRespDTO user = userApi.getUser(userId); + Long deptId = user.getDeptId(); + driveSchoolCar.setDeptId(deptId); + return driveSchoolCarMapper.selectDriveSchoolCarListAll(driveSchoolCar); } /** @@ -89,7 +101,7 @@ public class DriveSchoolCarServiceImpl implements IDriveSchoolCarService @Override public int updateDriveSchoolCar(DriveSchoolCar driveSchoolCar) { - driveSchoolCar.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolCar.setUpdateTime(DateUtils.getNowDate()); return driveSchoolCarMapper.updateDriveSchoolCar(driveSchoolCar); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCheckServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCheckServiceImpl.java index d1152cb3..6b1da41f 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCheckServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCheckServiceImpl.java @@ -6,10 +6,10 @@ import cn.iocoder.yudao.module.jx.domain.DriveSchoolCheck; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCarMapper; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCheckMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCheckService; -import cn.iocoder.yudao.module.jx.utils.DateUtils; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import com.thoughtworks.xstream.core.SecurityUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,19 +54,22 @@ public class DriveSchoolCheckServiceImpl implements IDriveSchoolCheckService * @return 车检管理 */ @Override - public List selectDriveSchoolCheckList(DriveSchoolCheck driveSchoolCheck) + public IPage selectDriveSchoolCheckList(DriveSchoolCheck driveSchoolCheck, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolCheck.setDeptId(deptId); - List driveSchoolChecks = driveSchoolCheckMapper.selectDriveSchoolCheckList(driveSchoolCheck); + IPage driveSchoolCheckIPage = driveSchoolCheckMapper.selectDriveSchoolCheckList(driveSchoolCheck, page); + List driveSchoolChecks = driveSchoolCheckIPage.getRecords(); for (DriveSchoolCheck schoolCheck : driveSchoolChecks) { DriveSchoolCar driveSchoolCar = driveSchoolCarMapper.selectDriveSchoolCarById(schoolCheck.getCarId()); if (ObjectUtils.isNotEmpty(driveSchoolCar) && ObjectUtils.isNotEmpty(driveSchoolCar.getCarModel())) - schoolCheck.setCarName(driveSchoolCar.getCarModel()); + { + schoolCheck.setCarName(driveSchoolCar.getCarModel()); + } } - return driveSchoolChecks; + return driveSchoolCheckIPage; } /** @@ -100,7 +103,7 @@ public class DriveSchoolCheckServiceImpl implements IDriveSchoolCheckService @Override public int updateDriveSchoolCheck(DriveSchoolCheck driveSchoolCheck) { - driveSchoolCheck.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolCheck.setUpdateTime(DateUtils.getNowDate()); return driveSchoolCheckMapper.updateDriveSchoolCheck(driveSchoolCheck); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCoachServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCoachServiceImpl.java index 5103e251..7d4431f9 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCoachServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCoachServiceImpl.java @@ -11,12 +11,14 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper; import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper; import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCoach; import cn.iocoder.yudao.module.jx.domain.DriveSchoolInfo; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCoachMapper; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolInfoMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCoachService; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.thoughtworks.xstream.core.SecurityUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -80,10 +82,11 @@ public class DriveSchoolCoachServiceImpl implements IDriveSchoolCoachService * @return 驾校教练 */ @Override - public List selectDriveSchoolCoachList(DriveSchoolCoach driveSchoolCoach) + public IPage selectDriveSchoolCoachList(DriveSchoolCoach driveSchoolCoach, Page page) { - List driveSchoolCoaches = driveSchoolCoachMapper.selectDriveSchoolCoachList(driveSchoolCoach); + IPage driveSchoolCoachIPage = driveSchoolCoachMapper.selectDriveSchoolCoachList(driveSchoolCoach, page); + List driveSchoolCoaches = driveSchoolCoachIPage.getRecords(); for (DriveSchoolCoach schoolCoach : driveSchoolCoaches) { Integer integer = driveSchoolPayMapper.selectByCoachId(schoolCoach.getId()); schoolCoach.setStudent(integer); @@ -92,9 +95,25 @@ public class DriveSchoolCoachServiceImpl implements IDriveSchoolCoachService schoolCoach.setSubjectTypeList(split); } } - return driveSchoolCoaches; + return driveSchoolCoachIPage; } +// @Override +// public List selectDriveSchoolCoachListAll(DriveSchoolCoach driveSchoolCoach) +// { +// +// List driveSchoolCoaches = driveSchoolCoachMapper.selectDriveSchoolCoachListAll(driveSchoolCoach); +// for (DriveSchoolCoach schoolCoach : driveSchoolCoaches) { +// Integer integer = driveSchoolPayMapper.selectByCoachId(schoolCoach.getId()); +// schoolCoach.setStudent(integer); +// if (ObjectUtils.isNotEmpty(schoolCoach.getSubjectType())){ +// String[] split = schoolCoach.getSubjectType().split(","); +// schoolCoach.setSubjectTypeList(split); +// } +// } +// return driveSchoolCoaches; +// } + @Resource private AdminUserService adminUserService; @@ -183,7 +202,7 @@ public class DriveSchoolCoachServiceImpl implements IDriveSchoolCoachService @Override public int updateDriveSchoolCoach(DriveSchoolCoach driveSchoolCoach) { - driveSchoolCoach.setUpdateTime(DateUtils.getNowDate()); + // driveSchoolCoach.setUpdateTime(DateUtils.getNowDate()); String[] subjectTypeList = driveSchoolCoach.getSubjectTypeList(); String subjectType = ""; for (String s : subjectTypeList) { @@ -219,7 +238,7 @@ public class DriveSchoolCoachServiceImpl implements IDriveSchoolCoachService @Override public List selectDriveSchoolCoachLimitList(DriveSchoolCoach driveSchoolCoach) { - List driveSchoolCoaches = driveSchoolCoachMapper.selectDriveSchoolCoachList(driveSchoolCoach); + List driveSchoolCoaches = driveSchoolCoachMapper.selectDriveSchoolCoachListAll(driveSchoolCoach); if (CollectionUtils.isNotEmpty(driveSchoolCoaches) && driveSchoolCoaches.size()>2){ return driveSchoolCoaches.subList(0, 2); } @@ -228,9 +247,10 @@ public class DriveSchoolCoachServiceImpl implements IDriveSchoolCoachService @Override public List selectDriveSchoolCoachListAll(DriveSchoolCoach driveSchoolCoach) { + driveSchoolCoach.setDeptId(12L); DriveSchoolInfo jxInfoData = driveSchoolInfoMapper.findInfoByJxId(driveSchoolCoach.getDeptId()); driveSchoolCoach.setDeptId(jxInfoData.getDeptId()); - return driveSchoolCoachMapper.selectDriveSchoolCoachList(driveSchoolCoach); + return driveSchoolCoachMapper.selectDriveSchoolCoachListAll(driveSchoolCoach); } @Override diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolContractServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolContractServiceImpl.java index 58cb68ae..491e8336 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolContractServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolContractServiceImpl.java @@ -13,6 +13,8 @@ import cn.iocoder.yudao.module.jx.service.IDriveSchoolContractService; import cn.iocoder.yudao.module.jx.utils.DateUtils; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -66,9 +68,9 @@ public class DriveSchoolContractServiceImpl implements IDriveSchoolContractServi * @return 驾校合同 */ @Override - public List selectDriveSchoolContractList(DriveSchoolContract driveSchoolContract) + public IPage selectDriveSchoolContractList(DriveSchoolContract driveSchoolContract, Page page) { - return driveSchoolContractMapper.selectDriveSchoolContractList(driveSchoolContract); + return driveSchoolContractMapper.selectDriveSchoolContractList(driveSchoolContract,page); } /** @@ -93,7 +95,7 @@ public class DriveSchoolContractServiceImpl implements IDriveSchoolContractServi String name = content.replaceAll("name", driveSchoolContract.getUserName()); String adress = name.replaceAll("adress", driveSchoolContract.getAddress()); - driveSchoolContract.setCreateTime(DateUtils.getNowDate()); + //driveSchoolContract.setCreateTime(DateUtils.getNowDate()); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -115,7 +117,7 @@ public class DriveSchoolContractServiceImpl implements IDriveSchoolContractServi String carType = type.replaceAll("carType", driveSchoolCourse.getName()); String money = carType.replaceAll("money", driveSchoolCourse.getReserveMoney().toString()); - driveSchoolContract.setCreateTime(DateUtils.getNowDate()); + //driveSchoolContract.setCreateTime(DateUtils.getNowDate()); driveSchoolContract.setContent(money); return driveSchoolContractMapper.insertDriveSchoolContract(driveSchoolContract); } @@ -129,7 +131,7 @@ public class DriveSchoolContractServiceImpl implements IDriveSchoolContractServi @Override public int updateDriveSchoolContract(DriveSchoolContract driveSchoolContract) { - driveSchoolContract.setUpdateTime(DateUtils.getNowDate()); + // driveSchoolContract.setUpdateTime(DateUtils.getNowDate()); return driveSchoolContractMapper.updateDriveSchoolContract(driveSchoolContract); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseOrderServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseOrderServiceImpl.java index 33cbf5eb..8d3d8ab3 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseOrderServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseOrderServiceImpl.java @@ -4,6 +4,8 @@ import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourseOrder; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCourseOrderMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCourseOrderService; import cn.iocoder.yudao.module.jx.utils.DateUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,9 +42,9 @@ public class DriveSchoolCourseOrderServiceImpl implements IDriveSchoolCourseOrde * @return 驾照报名订单 */ @Override - public List selectDriveSchoolCourseOrderList(DriveSchoolCourseOrder driveSchoolCourseOrder) + public IPage selectDriveSchoolCourseOrderList(DriveSchoolCourseOrder driveSchoolCourseOrder, Page page) { - return driveSchoolCourseOrderMapper.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder); + return driveSchoolCourseOrderMapper.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder,page); } /** @@ -66,7 +68,7 @@ public class DriveSchoolCourseOrderServiceImpl implements IDriveSchoolCourseOrde @Override public int updateDriveSchoolCourseOrder(DriveSchoolCourseOrder driveSchoolCourseOrder) { - driveSchoolCourseOrder.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolCourseOrder.setUpdateTime(DateUtils.getNowDate()); return driveSchoolCourseOrderMapper.updateDriveSchoolCourseOrder(driveSchoolCourseOrder); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseServiceImpl.java index 551a3f77..fff91f42 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseServiceImpl.java @@ -9,6 +9,8 @@ import cn.iocoder.yudao.module.jx.service.IDriveSchoolCourseService; import cn.iocoder.yudao.module.jx.utils.DateUtils; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; @@ -67,13 +69,14 @@ public class DriveSchoolCourseServiceImpl implements IDriveSchoolCourseService * @return 驾校课程分类 */ @Override - public List selectDriveSchoolCourseList(DriveSchoolCourse driveSchoolCourse) + public IPage selectDriveSchoolCourseList(DriveSchoolCourse driveSchoolCourse, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolCourse.setDeptId(deptId); - List driveSchoolCourses = driveSchoolCourseMapper.selectDriveSchoolCourseList(driveSchoolCourse); + IPage driveSchoolCourseIPage = driveSchoolCourseMapper.selectDriveSchoolCourseList(driveSchoolCourse, page); + List driveSchoolCourses = driveSchoolCourseIPage.getRecords(); for (DriveSchoolCourse driveSchoolCours : driveSchoolCourses) { DriveSchoolInfo driveSchoolInfo = driveSchoolInfoMapper.getSchoolInfoByDeptId(driveSchoolCours.getDeptId()); driveSchoolCours.setPhone(driveSchoolInfo.getPhone()); @@ -85,23 +88,25 @@ public class DriveSchoolCourseServiceImpl implements IDriveSchoolCourseService item.setPhone(driveSchoolInfo.getPhone()); }); } - return driveSchoolCourses; + return driveSchoolCourseIPage; } @Override - public List selectDriveSchoolCourseAppList(DriveSchoolCourse driveSchoolCourse) { - return null; - } - - @Override - public List selectDriveSchoolCourseAppletList(DriveSchoolCourse driveSchoolCourse) + public IPage selectDriveSchoolCourseAppList(DriveSchoolCourse driveSchoolCourse,Page page) { - return driveSchoolCourseMapper.selectDriveSchoolCourseAppletList(driveSchoolCourse); + return driveSchoolCourseMapper.selectDriveSchoolCourseAppletList(driveSchoolCourse,page); } + + @Override + public List selectDriveSchoolCourseAppletListAll(DriveSchoolCourse driveSchoolCourse) + { + return driveSchoolCourseMapper.selectDriveSchoolCourseAppletListAll(driveSchoolCourse); + } + @Override public List selectDriveSchoolCourseAppletFavorableListList(DriveSchoolCourse driveSchoolCourse) { - return driveSchoolCourseMapper.selectDriveSchoolCourseAppletList(driveSchoolCourse); + return driveSchoolCourseMapper.selectDriveSchoolCourseAppletListAll(driveSchoolCourse); } /** @@ -129,7 +134,7 @@ public class DriveSchoolCourseServiceImpl implements IDriveSchoolCourseService @Override public int updateDriveSchoolCourse(DriveSchoolCourse driveSchoolCourse) { - driveSchoolCourse.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolCourse.setUpdateTime(DateUtils.getNowDate()); /*String[] weekDay = driveSchoolCourse.getWeekDay(); driveSchoolCourse.setDayStart(weekDay[0]); driveSchoolCourse.setDayEnd(weekDay[1]);*/ diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCredentialsServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCredentialsServiceImpl.java index 531b9db1..719ddad1 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCredentialsServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCredentialsServiceImpl.java @@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCredentials; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCredentialsMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCredentialsService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,13 +48,13 @@ public class DriveSchoolCredentialsServiceImpl implements IDriveSchoolCredential * @return 驾校资质信息 */ @Override - public List selectDriveSchoolCredentialsList(DriveSchoolCredentials driveSchoolCredentials) + public IPage selectDriveSchoolCredentialsList(DriveSchoolCredentials driveSchoolCredentials, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolCredentials.setDeptId(deptId); - return driveSchoolCredentialsMapper.selectDriveSchoolCredentialsList(driveSchoolCredentials); + return driveSchoolCredentialsMapper.selectDriveSchoolCredentialsList(driveSchoolCredentials,page); } /** @@ -68,7 +70,7 @@ public class DriveSchoolCredentialsServiceImpl implements IDriveSchoolCredential AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolCredentials.setDeptId(deptId); - driveSchoolCredentials.setCreateTime(DateUtils.getNowDate()); + //driveSchoolCredentials.setCreateTime(DateUtils.getNowDate()); return driveSchoolCredentialsMapper.insertDriveSchoolCredentials(driveSchoolCredentials); } @@ -85,7 +87,7 @@ public class DriveSchoolCredentialsServiceImpl implements IDriveSchoolCredential AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolCredentials.setDeptId(deptId); - driveSchoolCredentials.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolCredentials.setUpdateTime(DateUtils.getNowDate()); return driveSchoolCredentialsMapper.updateDriveSchoolCredentials(driveSchoolCredentials); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDailyManagementServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDailyManagementServiceImpl.java index 694286e6..fd1fc140 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDailyManagementServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDailyManagementServiceImpl.java @@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.jx.service.IDriveSchoolDailyManagementService; import cn.iocoder.yudao.module.jx.utils.DateUtils; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,13 +49,13 @@ public class DriveSchoolDailyManagementServiceImpl implements IDriveSchoolDailyM * @return 驾校日常管理 */ @Override - public List selectDriveSchoolDailyManagementList(DriveSchoolDailyManagement driveSchoolDailyManagement) + public IPage selectDriveSchoolDailyManagementList(DriveSchoolDailyManagement driveSchoolDailyManagement, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolDailyManagement.setDeptId(deptId); - return driveSchoolDailyManagementMapper.selectDriveSchoolDailyManagementList(driveSchoolDailyManagement); + return driveSchoolDailyManagementMapper.selectDriveSchoolDailyManagementList(driveSchoolDailyManagement,page); } /** @@ -69,7 +71,7 @@ public class DriveSchoolDailyManagementServiceImpl implements IDriveSchoolDailyM AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolDailyManagement.setDeptId(deptId); - driveSchoolDailyManagement.setCreateTime(DateUtils.getNowDate()); + //driveSchoolDailyManagement.setCreateTime(DateUtils.getNowDate()); return driveSchoolDailyManagementMapper.insertDriveSchoolDailyManagement(driveSchoolDailyManagement); } @@ -86,7 +88,7 @@ public class DriveSchoolDailyManagementServiceImpl implements IDriveSchoolDailyM AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolDailyManagement.setDeptId(deptId); - driveSchoolDailyManagement.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolDailyManagement.setUpdateTime(DateUtils.getNowDate()); return driveSchoolDailyManagementMapper.updateDriveSchoolDailyManagement(driveSchoolDailyManagement); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDeductServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDeductServiceImpl.java index e9b623e4..ed5153a5 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDeductServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDeductServiceImpl.java @@ -1,13 +1,14 @@ package cn.iocoder.yudao.module.jx.service.impl; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.yudao.module.jx.utils.DateUtils; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDeduct; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolDeductMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolDeductService; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,13 +49,13 @@ public class DriveSchoolDeductServiceImpl implements IDriveSchoolDeductService * @return 提成配置 */ @Override - public List selectDriveSchoolDeductList(DriveSchoolDeduct driveSchoolDeduct) + public IPage selectDriveSchoolDeductList(DriveSchoolDeduct driveSchoolDeduct, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolDeduct.setDeptId(deptId); - return driveSchoolDeductMapper.selectDriveSchoolDeductList(driveSchoolDeduct); + return driveSchoolDeductMapper.selectDriveSchoolDeductList(driveSchoolDeduct,page); } /** @@ -72,7 +73,7 @@ public class DriveSchoolDeductServiceImpl implements IDriveSchoolDeductService String courseSubject = driveSchoolDeduct.getCourseSubject(); DriveSchoolDeduct driveSchoolDeduct1 = new DriveSchoolDeduct(); driveSchoolDeduct1.setCourseSubject(courseSubject); - List driveSchoolDeducts = driveSchoolDeductMapper.selectDriveSchoolDeductList(driveSchoolDeduct1); + List driveSchoolDeducts = driveSchoolDeductMapper.selectDriveSchoolDeductListAll(driveSchoolDeduct1); if (CollectionUtils.isNotEmpty(driveSchoolDeducts)){ throw new Exception("该科目提成配置已存在！"); } @@ -88,7 +89,7 @@ public class DriveSchoolDeductServiceImpl implements IDriveSchoolDeductService @Override public int updateDriveSchoolDeduct(DriveSchoolDeduct driveSchoolDeduct) { - driveSchoolDeduct.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolDeduct.setUpdateTime(DateUtils.getNowDate()); return driveSchoolDeductMapper.updateDriveSchoolDeduct(driveSchoolDeduct); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDialServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDialServiceImpl.java index 0fd06072..d175eabb 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDialServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDialServiceImpl.java @@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.jx.domain.DriveSchoolDial; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolDialMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolDialService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,21 +49,21 @@ public class DriveSchoolDialServiceImpl implements IDriveSchoolDialService * @return 日常日志 */ @Override - public List selectDriveSchoolDialList(DriveSchoolDial driveSchoolDial) + public IPage selectDriveSchoolDialList(DriveSchoolDial driveSchoolDial, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolDial.setDeptId(deptId); - return driveSchoolDialMapper.selectDriveSchoolDialList(driveSchoolDial); + return driveSchoolDialMapper.selectDriveSchoolDialList(driveSchoolDial,page); } @Override - public List selectDriveSchoolDialAppList(DriveSchoolDial driveSchoolDial) + public IPage selectDriveSchoolDialAppList(DriveSchoolDial driveSchoolDial, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); driveSchoolDial.setJlId(userId); - return driveSchoolDialMapper.selectDriveSchoolDialList(driveSchoolDial); + return driveSchoolDialMapper.selectDriveSchoolDialList(driveSchoolDial,page); } // @Resource @@ -94,7 +96,7 @@ public class DriveSchoolDialServiceImpl implements IDriveSchoolDialService @Override public int updateDriveSchoolDial(DriveSchoolDial driveSchoolDial) { - driveSchoolDial.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolDial.setUpdateTime(DateUtils.getNowDate()); return driveSchoolDialMapper.updateDriveSchoolDial(driveSchoolDial); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDynamicServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDynamicServiceImpl.java index 546e2e72..f01b9e5f 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDynamicServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolDynamicServiceImpl.java @@ -9,6 +9,8 @@ import cn.iocoder.yudao.module.jx.domain.DriveSchoolInfo; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolDynamicMapper; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolInfoMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolDynamicService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.thoughtworks.xstream.core.SecurityUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +55,7 @@ public class DriveSchoolDynamicServiceImpl implements IDriveSchoolDynamicService * @return 行业动态 */ @Override - public List selectDriveSchoolDynamicList(DriveSchoolDynamic driveSchoolDynamic) + public IPage selectDriveSchoolDynamicList(DriveSchoolDynamic driveSchoolDynamic, Page page) { Long deptId = 0L; if (ObjectUtils.isNotEmpty(driveSchoolDynamic.getDeptId())){ @@ -66,7 +68,24 @@ public class DriveSchoolDynamicServiceImpl implements IDriveSchoolDynamicService deptId = user.getDeptId(); } driveSchoolDynamic.setDeptId(deptId); - return driveSchoolDynamicMapper.selectDriveSchoolDynamicList(driveSchoolDynamic); + return driveSchoolDynamicMapper.selectDriveSchoolDynamicList(driveSchoolDynamic,page); + } + + @Override + public List selectDriveSchoolDynamicListAll(DriveSchoolDynamic driveSchoolDynamic) + { + Long deptId = 0L; + if (ObjectUtils.isNotEmpty(driveSchoolDynamic.getDeptId())){ + deptId = driveSchoolDynamic.getDeptId(); + DriveSchoolInfo driveSchoolInfo = driveSchoolInfoMapper.selectDriveSchoolInfoById(deptId); + deptId = driveSchoolInfo.getDeptId(); + }else { + Long userId = SecurityFrameworkUtils.getLoginUserId(); + AdminUserRespDTO user = userApi.getUser(userId); + deptId = user.getDeptId(); + } + driveSchoolDynamic.setDeptId(deptId); + return driveSchoolDynamicMapper.selectDriveSchoolDynamicListAll(driveSchoolDynamic); } /** @@ -94,7 +113,7 @@ public class DriveSchoolDynamicServiceImpl implements IDriveSchoolDynamicService @Override public int updateDriveSchoolDynamic(DriveSchoolDynamic driveSchoolDynamic) { - driveSchoolDynamic.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolDynamic.setUpdateTime(DateUtils.getNowDate()); return driveSchoolDynamicMapper.updateDriveSchoolDynamic(driveSchoolDynamic); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolExamPassServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolExamPassServiceImpl.java index 6fbf3eef..0ec59596 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolExamPassServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolExamPassServiceImpl.java @@ -19,6 +19,8 @@ import cn.iocoder.yudao.module.jx.mapper.DriveSchoolExamPassMapper; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolInfoMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolExamPassService; import cn.iocoder.yudao.module.jx.vo.DriveSchoolInfoVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.thoughtworks.xstream.core.SecurityUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -85,14 +87,14 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi * @return 考试通过 */ @Override - public List selectDriveSchoolExamPassList(DriveSchoolExamPass driveSchoolExamPass) + public IPage selectDriveSchoolExamPassList(DriveSchoolExamPass driveSchoolExamPass, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); DriveSchoolInfoVO schoolInfoByDeptId = driveSchoolInfoMapper.getSchoolInfoByDeptId(deptId); driveSchoolExamPass.setJxId(schoolInfoByDeptId.getId()); - return driveSchoolExamPassMapper.selectDriveSchoolExamPassList(driveSchoolExamPass); + return driveSchoolExamPassMapper.selectDriveSchoolExamPassList(driveSchoolExamPass,page); } @Autowired @@ -154,7 +156,7 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi @Override public int updateDriveSchoolExamPass(DriveSchoolExamPass driveSchoolExamPass) { - driveSchoolExamPass.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolExamPass.setUpdateTime(DateUtils.getNowDate()); return driveSchoolExamPassMapper.updateDriveSchoolExamPass(driveSchoolExamPass); } @@ -184,16 +186,17 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi @Override - public List checkList(DriveSchoolExamPass driveSchoolExamPass) { + public IPage checkList(DriveSchoolExamPass driveSchoolExamPass,Page page) { - List driveSchoolExamPasses = driveSchoolExamPassMapper.checkList(driveSchoolExamPass.getJlId()); + IPage driveSchoolExamPassIPage = driveSchoolExamPassMapper.checkList(driveSchoolExamPass.getJlId(), page); + List driveSchoolExamPasses = driveSchoolExamPassIPage.getRecords(); for (DriveSchoolExamPass schoolExamPass : driveSchoolExamPasses) { DriveSchoolCourse driveSchoolCourse = driveSchoolCourseMapper.selectDriveSchoolCourseById(schoolExamPass.getCourseId()); if (ObjectUtils.isNotEmpty(driveSchoolCourse)){ schoolExamPass.setCourseName(driveSchoolCourse.getName()); } } - return driveSchoolExamPasses; + return driveSchoolExamPassIPage; } /** @@ -202,7 +205,7 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi * @return */ @Override - public List getBalanceList(DriveSchoolExamPass driveSchoolExamPass) { + public IPage getBalanceList(DriveSchoolExamPass driveSchoolExamPass,Page page) { if (ObjectUtils.isNotEmpty(driveSchoolExamPass.getJxId())){ driveSchoolExamPass.setJxId(driveSchoolExamPass.getId()); @@ -218,8 +221,8 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi driveSchoolExamPass.setPayStartTimes(simpleDateFormat.format(driveSchoolExamPass.getPayStartTime())); driveSchoolExamPass.setPayEndTimes(simpleDateFormat.format(driveSchoolExamPass.getPayEndTime())); } - List balanceList = driveSchoolExamPassMapper.getBalanceList(driveSchoolExamPass); - + IPage records = driveSchoolExamPassMapper.getBalanceList(driveSchoolExamPass, page); + List balanceList = records.getRecords(); balanceList.forEach(s->{ DriveSchoolExamPass driveSchoolExamPass1 = new DriveSchoolExamPass(); DriveSchoolExamPass balance = driveSchoolExamPassMapper.getBalance(driveSchoolExamPass1); @@ -229,7 +232,7 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi s.setDeducts(new BigDecimal(0)); } }); - return balanceList; + return records; } @Override diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFacilityServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFacilityServiceImpl.java index 382fbc96..b83eaa74 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFacilityServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFacilityServiceImpl.java @@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.jx.domain.DriveSchoolFacility; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolFacilityMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolFacilityService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; @@ -51,31 +53,31 @@ public class DriveSchoolFacilityServiceImpl implements IDriveSchoolFacilityServi * @return 设备管理 */ @Override - public List selectDriveSchoolFacilityList(DriveSchoolFacility driveSchoolFacility) + public IPage selectDriveSchoolFacilityList(DriveSchoolFacility driveSchoolFacility, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolFacility.setDeptId(deptId); - return driveSchoolFacilityMapper.selectDriveSchoolFacilityList(driveSchoolFacility); + return driveSchoolFacilityMapper.selectDriveSchoolFacilityList(driveSchoolFacility,page); } - @Scheduled(cron = "0 0 7 * * ?") - public void onTimme() - { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - List driveSchoolFacilities = driveSchoolFacilityMapper.selectDriveSchoolFacilityList(new DriveSchoolFacility()); - for (DriveSchoolFacility driveSchoolFacility : driveSchoolFacilities) { - if(ObjectUtils.isNotEmpty(driveSchoolFacility.getYearcheckTime() )&& ObjectUtils.isNotEmpty(driveSchoolFacility.getPhone()) && ObjectUtils.isNotEmpty(driveSchoolFacility.getCustodian())){ - String format = simpleDateFormat.format(new Date()); - //如果当天是年检时间就发短信通知 -// if (format.equals(simpleDateFormat.format(driveSchoolFacility.getYearcheckTime()))){ -// SendSmsUtil.sendMsgCommon(new String[]{driveSchoolFacility.getCustodian()+" "+driveSchoolFacility.getCustodian(),format+" "+(format)}, driveSchoolFacility.getPhone(),"1400852709","蓝安汽车小程序","2143603"); -// } - } - } - } +// @Scheduled(cron = "0 0 7 * * ?") +// public void onTimme() +// { +// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); +// List driveSchoolFacilities = driveSchoolFacilityMapper.selectDriveSchoolFacilityList(new DriveSchoolFacility()); +// for (DriveSchoolFacility driveSchoolFacility : driveSchoolFacilities) { +// if(ObjectUtils.isNotEmpty(driveSchoolFacility.getYearcheckTime() )&& ObjectUtils.isNotEmpty(driveSchoolFacility.getPhone()) && ObjectUtils.isNotEmpty(driveSchoolFacility.getCustodian())){ +// String format = simpleDateFormat.format(new Date()); +// //如果当天是年检时间就发短信通知 +//// if (format.equals(simpleDateFormat.format(driveSchoolFacility.getYearcheckTime()))){ +//// SendSmsUtil.sendMsgCommon(new String[]{driveSchoolFacility.getCustodian()+" "+driveSchoolFacility.getCustodian(),format+" "+(format)}, driveSchoolFacility.getPhone(),"1400852709","蓝安汽车小程序","2143603"); +//// } +// } +// } +// } /** * 新增设备管理 @@ -90,7 +92,7 @@ public class DriveSchoolFacilityServiceImpl implements IDriveSchoolFacilityServi AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolFacility.setDeptId(deptId); - driveSchoolFacility.setCreateTime(DateUtils.getNowDate()); + //driveSchoolFacility.setCreateTime(DateUtils.getNowDate()); return driveSchoolFacilityMapper.insertDriveSchoolFacility(driveSchoolFacility); } @@ -107,7 +109,7 @@ public class DriveSchoolFacilityServiceImpl implements IDriveSchoolFacilityServi AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolFacility.setDeptId(deptId); - driveSchoolFacility.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolFacility.setUpdateTime(DateUtils.getNowDate()); return driveSchoolFacilityMapper.updateDriveSchoolFacility(driveSchoolFacility); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFileServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFileServiceImpl.java index c0db7eef..4d366eb4 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFileServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFileServiceImpl.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.jx.service.impl; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.yudao.module.jx.utils.DateUtils; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.jx.domain.DriveSchoolFile; @@ -9,6 +8,8 @@ import cn.iocoder.yudao.module.jx.mapper.DriveSchoolFileMapper; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolInfoMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolFileService; import cn.iocoder.yudao.module.jx.vo.DriveSchoolInfoVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -52,13 +53,13 @@ public class DriveSchoolFileServiceImpl implements IDriveSchoolFileService * @return 文件类型 */ @Override - public List selectDriveSchoolFileList(DriveSchoolFile driveSchoolFile) + public IPage selectDriveSchoolFileList(DriveSchoolFile driveSchoolFile, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolFile.setDeptId(deptId); - return driveSchoolFileMapper.selectDriveSchoolFileList(driveSchoolFile); + return driveSchoolFileMapper.selectDriveSchoolFileList(driveSchoolFile,page); } /** @@ -77,7 +78,7 @@ public class DriveSchoolFileServiceImpl implements IDriveSchoolFileService DriveSchoolFile driveSchoolFile1 = new DriveSchoolFile(); driveSchoolFile1.setDeptId(deptId); driveSchoolFile1.setFileType(driveSchoolFile.getFileType()); - List driveSchoolFiles = driveSchoolFileMapper.selectDriveSchoolFileList(driveSchoolFile1); + List driveSchoolFiles = driveSchoolFileMapper.selectDriveSchoolFileListAll(driveSchoolFile1); if (ObjectUtils.isNotEmpty(driveSchoolFiles)){ throw new Exception("驾校已存在文件类型，请勿重复添加!"); } @@ -94,7 +95,7 @@ public class DriveSchoolFileServiceImpl implements IDriveSchoolFileService @Override public int updateDriveSchoolFile(DriveSchoolFile driveSchoolFile) { - driveSchoolFile.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolFile.setUpdateTime(DateUtils.getNowDate()); return driveSchoolFileMapper.updateDriveSchoolFile(driveSchoolFile); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolInfoServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolInfoServiceImpl.java index cbcc0fe2..2d7b1dd5 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolInfoServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolInfoServiceImpl.java @@ -2,14 +2,9 @@ package cn.iocoder.yudao.module.jx.service.impl; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.yudao.module.jx.core.page.PageDomain; -import cn.iocoder.yudao.module.jx.core.page.TableDataInfo; -import cn.iocoder.yudao.module.jx.core.page.TableSupport; -import cn.iocoder.yudao.module.jx.core.text.HttpStatus; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCoach; import cn.iocoder.yudao.module.jx.payment.mapper.DrivePayMapper; import cn.iocoder.yudao.module.jx.payment.vo.PayVo; -import cn.iocoder.yudao.module.jx.utils.DateUtils; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.jx.domain.DriveSchoolInfo; @@ -23,8 +18,8 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper; import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper; import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper; -import cn.iocoder.yudao.module.system.service.dept.DeptService; -import com.thoughtworks.xstream.core.SecurityUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.password.PasswordEncoder; @@ -34,7 +29,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Comparator; import java.util.List; -import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.config.CommonStr.USER_TYPE_STAFF; @@ -85,16 +79,17 @@ public class DriveSchoolInfoServiceImpl implements IDriveSchoolInfoService * @return 驾校信息 */ @Override - public List selectDriveSchoolInfoList(DriveSchoolInfo driveSchoolInfo) + public IPage selectDriveSchoolInfoList(DriveSchoolInfo driveSchoolInfo, Page page) { - return driveSchoolInfoMapper.selectDriveSchoolInfoList(driveSchoolInfo); + return driveSchoolInfoMapper.selectDriveSchoolInfoList(driveSchoolInfo,page); } @Override - public TableDataInfo selectDriveSchoolInfoAppletList(DriveSchoolInfo driveSchoolInfo) + public IPage selectDriveSchoolInfoAppletList(DriveSchoolInfo driveSchoolInfo,Page page) { - List driveSchoolInfos = driveSchoolInfoMapper.selectDriveSchoolInfoList(driveSchoolInfo); + IPage driveSchoolInfoIPage = driveSchoolInfoMapper.selectDriveSchoolInfoList(driveSchoolInfo, page); + List driveSchoolInfos = driveSchoolInfoIPage.getRecords(); for (DriveSchoolInfo driveSchoolInfo1 : driveSchoolInfos) { if (ObjectUtils.isNotEmpty(driveSchoolInfo.getLat()) &&ObjectUtils.isNotEmpty(driveSchoolInfo.getLgt()) && @@ -108,18 +103,19 @@ public class DriveSchoolInfoServiceImpl implements IDriveSchoolInfoService } } driveSchoolInfos.sort(Comparator.comparingDouble(DriveSchoolInfo::getDistance)); - PageDomain pageDomain = TableSupport.buildPageRequest(); - Integer pageNum = pageDomain.getPageNum(); - Integer pageSize = pageDomain.getPageSize(); - - //获取处理好的list集合 - int num = driveSchoolInfos.size(); - driveSchoolInfos = driveSchoolInfos.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - TableDataInfo rspData = new TableDataInfo(); - rspData.setCode(HttpStatus.SUCCESS); - rspData.setRows(driveSchoolInfos); - rspData.setTotal(num); - return rspData; +// PageDomain pageDomain = TableSupport.buildPageRequest(); +// Integer pageNum = pageDomain.getPageNum(); +// Integer pageSize = pageDomain.getPageSize(); +// +// //获取处理好的list集合 +// int num = driveSchoolInfos.size(); +// driveSchoolInfos = driveSchoolInfos.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); +// CommonResult> rspData = new CommonResult>(); +// rspData.setCode(HttpStatus.SUCCESS); +// rspData.setRows(driveSchoolInfos); +// rspData.setTotal(num); +// return rspData; + return driveSchoolInfoIPage; } @Resource @@ -232,7 +228,7 @@ public class DriveSchoolInfoServiceImpl implements IDriveSchoolInfoService @Override public int updateDriveSchoolInfo(DriveSchoolInfo driveSchoolInfo) { - driveSchoolInfo.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolInfo.setUpdateTime(DateUtils.getNowDate()); return driveSchoolInfoMapper.updateDriveSchoolInfo(driveSchoolInfo); } @@ -280,7 +276,7 @@ public class DriveSchoolInfoServiceImpl implements IDriveSchoolInfoService jlId = driveSchoolCoach.getId(); } - DriveSchoolInfoVO schoolInfoByDeptId = driveSchoolInfoMapper.getSchoolInfoByDeptId(deptId); + DriveSchoolInfoVO schoolInfoByDeptId = driveSchoolInfoMapper.getSchoolInfoByDeptId(227L); schoolInfoByDeptId.setJlId(jlId); return schoolInfoByDeptId; } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolInsuranceServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolInsuranceServiceImpl.java index 11758206..fdf608de 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolInsuranceServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolInsuranceServiceImpl.java @@ -9,6 +9,8 @@ import cn.iocoder.yudao.module.jx.domain.DriveSchoolInsurance; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCarMapper; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolInsuranceMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolInsuranceService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,20 +55,21 @@ public class DriveSchoolInsuranceServiceImpl implements IDriveSchoolInsuranceSer * @return 保险管理 */ @Override - public List selectDriveSchoolInsuranceList(DriveSchoolInsurance driveSchoolInsurance) + public IPage selectDriveSchoolInsuranceList(DriveSchoolInsurance driveSchoolInsurance, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolInsurance.setDeptId(deptId); - List driveSchoolInsurances = driveSchoolInsuranceMapper.selectDriveSchoolInsuranceList(driveSchoolInsurance); + IPage driveSchoolInsuranceIPage = driveSchoolInsuranceMapper.selectDriveSchoolInsuranceList(driveSchoolInsurance, page); + List driveSchoolInsurances = driveSchoolInsuranceIPage.getRecords(); for (DriveSchoolInsurance schoolInsurance : driveSchoolInsurances) { DriveSchoolCar driveSchoolCar = driveSchoolCarMapper.selectDriveSchoolCarById(schoolInsurance.getCarId()); schoolInsurance.setCarName(driveSchoolCar.getCarModel()); } - return driveSchoolInsurances; + return driveSchoolInsuranceIPage; } /** @@ -99,7 +102,7 @@ public class DriveSchoolInsuranceServiceImpl implements IDriveSchoolInsuranceSer @Override public int updateDriveSchoolInsurance(DriveSchoolInsurance driveSchoolInsurance) { - driveSchoolInsurance.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolInsurance.setUpdateTime(DateUtils.getNowDate()); return driveSchoolInsuranceMapper.updateDriveSchoolInsurance(driveSchoolInsurance); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolNewsServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolNewsServiceImpl.java index 5b16d7cb..81cfc359 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolNewsServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolNewsServiceImpl.java @@ -9,6 +9,8 @@ import cn.iocoder.yudao.module.jx.domain.DriveSchoolNews; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolInfoMapper; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolNewsMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolNewsService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.thoughtworks.xstream.core.SecurityUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -54,7 +56,7 @@ public class DriveSchoolNewsServiceImpl implements IDriveSchoolNewsService * @return 校内新闻 */ @Override - public List selectDriveSchoolNewsList(DriveSchoolNews driveSchoolNews) + public IPage selectDriveSchoolNewsList(DriveSchoolNews driveSchoolNews, Page page) { Long deptId = 0L; if (ObjectUtils.isNotEmpty(driveSchoolNews.getDeptId())){ @@ -67,7 +69,24 @@ public class DriveSchoolNewsServiceImpl implements IDriveSchoolNewsService deptId = user.getDeptId(); } driveSchoolNews.setDeptId(deptId); - return driveSchoolNewsMapper.selectDriveSchoolNewsList(driveSchoolNews); + return driveSchoolNewsMapper.selectDriveSchoolNewsList(driveSchoolNews,page); + } + + @Override + public List selectDriveSchoolNewsListAll(DriveSchoolNews driveSchoolNews) + { + Long deptId = 0L; + if (ObjectUtils.isNotEmpty(driveSchoolNews.getDeptId())){ + deptId = driveSchoolNews.getDeptId(); + DriveSchoolInfo driveSchoolInfo = driveSchoolInfoMapper.selectDriveSchoolInfoById(deptId); + deptId = driveSchoolInfo.getDeptId(); + }else { + Long userId = SecurityFrameworkUtils.getLoginUserId(); + AdminUserRespDTO user = userApi.getUser(userId); + deptId = user.getDeptId(); + } + driveSchoolNews.setDeptId(deptId); + return driveSchoolNewsMapper.selectDriveSchoolNewsListAll(driveSchoolNews); } /** @@ -95,7 +114,7 @@ public class DriveSchoolNewsServiceImpl implements IDriveSchoolNewsService @Override public int updateDriveSchoolNews(DriveSchoolNews driveSchoolNews) { - driveSchoolNews.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolNews.setUpdateTime(DateUtils.getNowDate()); return driveSchoolNewsMapper.updateDriveSchoolNews(driveSchoolNews); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolNoticeServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolNoticeServiceImpl.java index 8f47789e..af988f93 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolNoticeServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolNoticeServiceImpl.java @@ -7,10 +7,13 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.jx.domain.DriveSchoolNotice; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolNoticeMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolNoticeService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.imageio.IIOParam; import java.util.List; /** * 通知Service业务层处理 @@ -46,13 +49,13 @@ public class DriveSchoolNoticeServiceImpl implements IDriveSchoolNoticeService * @return 通知 */ @Override - public List selectDriveSchoolNoticeList(DriveSchoolNotice driveSchoolNotice) + public IPage selectDriveSchoolNoticeList(DriveSchoolNotice driveSchoolNotice, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolNotice.setDeptId(deptId); - return driveSchoolNoticeMapper.selectDriveSchoolNoticeList(driveSchoolNotice); + return driveSchoolNoticeMapper.selectDriveSchoolNoticeList(driveSchoolNotice,page); } @Override @@ -62,7 +65,7 @@ public class DriveSchoolNoticeServiceImpl implements IDriveSchoolNoticeService AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolNotice.setDeptId(deptId); - return driveSchoolNoticeMapper.selectDriveSchoolNoticeList(driveSchoolNotice); + return driveSchoolNoticeMapper.selectDriveSchoolNoticeListAll(driveSchoolNotice); } /** @@ -86,7 +89,7 @@ public class DriveSchoolNoticeServiceImpl implements IDriveSchoolNoticeService @Override public int updateDriveSchoolNotice(DriveSchoolNotice driveSchoolNotice) { - driveSchoolNotice.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolNotice.setUpdateTime(DateUtils.getNowDate()); return driveSchoolNoticeMapper.updateDriveSchoolNotice(driveSchoolNotice); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolPhoneServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolPhoneServiceImpl.java index c8bb466e..d69f25eb 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolPhoneServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolPhoneServiceImpl.java @@ -9,6 +9,8 @@ import cn.iocoder.yudao.module.jx.mapper.DriveSchoolInfoMapper; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolPhoneMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolPhoneService; import cn.iocoder.yudao.module.jx.vo.DriveSchoolInfoVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,13 +52,13 @@ public class DriveSchoolPhoneServiceImpl implements IDriveSchoolPhoneService * @return 客服 */ @Override - public List selectDriveSchoolPhoneList(DriveSchoolPhone driveSchoolPhone) + public IPage selectDriveSchoolPhoneList(DriveSchoolPhone driveSchoolPhone,Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolPhone.setDeptId(deptId); - return driveSchoolPhoneMapper.selectDriveSchoolPhoneList(driveSchoolPhone); + return driveSchoolPhoneMapper.selectDriveSchoolPhoneList(driveSchoolPhone,page); } /** @@ -84,7 +86,7 @@ public class DriveSchoolPhoneServiceImpl implements IDriveSchoolPhoneService @Override public int updateDriveSchoolPhone(DriveSchoolPhone driveSchoolPhone) { - driveSchoolPhone.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolPhone.setUpdateTime(DateUtils.getNowDate()); return driveSchoolPhoneMapper.updateDriveSchoolPhone(driveSchoolPhone); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReimbursementServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReimbursementServiceImpl.java index bb333bf4..c6a2e489 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReimbursementServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReimbursementServiceImpl.java @@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.jx.domain.DriveSchoolReimbursement; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolReimbursementMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolReimbursementService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.thoughtworks.xstream.core.SecurityUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -53,13 +55,13 @@ public class DriveSchoolReimbursementServiceImpl implements IDriveSchoolReimburs * @return 报销审核 */ @Override - public List selectDriveSchoolReimbursementList(DriveSchoolReimbursement driveSchoolReimbursement) + public IPage selectDriveSchoolReimbursementList(DriveSchoolReimbursement driveSchoolReimbursement, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolReimbursement.setDeptId(deptId); - return driveSchoolReimbursementMapper.selectDriveSchoolReimbursementList(driveSchoolReimbursement); + return driveSchoolReimbursementMapper.selectDriveSchoolReimbursementList(driveSchoolReimbursement,page); } /** @@ -93,7 +95,7 @@ public class DriveSchoolReimbursementServiceImpl implements IDriveSchoolReimburs @Override public int updateDriveSchoolReimbursement(DriveSchoolReimbursement driveSchoolReimbursement) { - driveSchoolReimbursement.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolReimbursement.setUpdateTime(DateUtils.getNowDate()); return driveSchoolReimbursementMapper.updateDriveSchoolReimbursement(driveSchoolReimbursement); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java index ec31f8a9..375b0285 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java @@ -16,6 +16,8 @@ import cn.iocoder.yudao.module.jx.vo.DriveSchoolInfoVO; import cn.iocoder.yudao.module.jx.vo.StatisticsVo; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.thoughtworks.xstream.core.SecurityUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -92,9 +94,10 @@ public class DriveSchoolReservationCourseServiceImpl implements IDriveSchoolRese * @return 预约练车 */ @Override - public List selectDriveSchoolReservationCourseList(DriveSchoolReservationCourse driveSchoolReservationCourse) + public IPage selectDriveSchoolReservationCourseList(DriveSchoolReservationCourse driveSchoolReservationCourse,Page page) { - List courseList = driveSchoolReservationCourseMapper.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse); + IPage driveSchoolReservationCourseIPage = driveSchoolReservationCourseMapper.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse, page); + List courseList = driveSchoolReservationCourseIPage.getRecords(); courseList.forEach(item -> { if (item.getTimePeriod().equals("1")){ @@ -109,7 +112,7 @@ public class DriveSchoolReservationCourseServiceImpl implements IDriveSchoolRese item.setSysUser(adminUserDO); item.setUserName(sysUserData.getNickname()); }); - return courseList; + return driveSchoolReservationCourseIPage; } @@ -120,13 +123,14 @@ public class DriveSchoolReservationCourseServiceImpl implements IDriveSchoolRese * @return 预约练车 */ @Override - public List selectDriveSchoolReservationCoursePclist(DriveSchoolReservationCourse driveSchoolReservationCourse) + public IPage selectDriveSchoolReservationCoursePclist(DriveSchoolReservationCourse driveSchoolReservationCourse, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); driveSchoolReservationCourse.setDeptId(deptId); - List courseList = driveSchoolReservationCourseMapper.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse); + IPage driveSchoolReservationCourseIPage = driveSchoolReservationCourseMapper.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse, page); + List courseList = driveSchoolReservationCourseIPage.getRecords(); courseList.forEach(item -> { if (item.getTimePeriod().equals("1")){ @@ -147,7 +151,7 @@ public class DriveSchoolReservationCourseServiceImpl implements IDriveSchoolRese item.setUserName(driveSchoolPay.getName()); } }); - return courseList; + return driveSchoolReservationCourseIPage; } // @Autowired @@ -391,7 +395,7 @@ public class DriveSchoolReservationCourseServiceImpl implements IDriveSchoolRese } } - driveSchoolReservationCourse.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolReservationCourse.setUpdateTime(DateUtils.getNowDate()); driveSchoolReservationCourse.setAuditStatus(driveSchoolReservationCourse1.getAuditStatus()); return driveSchoolReservationCourseMapper.updateDriveSchoolReservationCourse(driveSchoolReservationCourse); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolSeparateServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolSeparateServiceImpl.java index 17f706f9..33bffb2e 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolSeparateServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolSeparateServiceImpl.java @@ -5,6 +5,8 @@ import cn.iocoder.yudao.module.jx.mapper.DriveSchoolSeparateMapper; import cn.iocoder.yudao.module.jx.payment.service.DriveSchoolPayService; import cn.iocoder.yudao.module.jx.service.IDriveSchoolSeparateService; import cn.iocoder.yudao.module.jx.utils.DateUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,9 +48,9 @@ public class DriveSchoolSeparateServiceImpl implements IDriveSchoolSeparateServi * @return 驾校分账 */ @Override - public List selectDriveSchoolSeparateList(DriveSchoolSeparate driveSchoolSeparate) + public IPage selectDriveSchoolSeparateList(DriveSchoolSeparate driveSchoolSeparate, Page page) { - return driveSchoolSeparateMapper.selectDriveSchoolSeparateList(driveSchoolSeparate); + return driveSchoolSeparateMapper.selectDriveSchoolSeparateList(driveSchoolSeparate,page); } @Override @@ -81,7 +83,7 @@ public class DriveSchoolSeparateServiceImpl implements IDriveSchoolSeparateServi @Override public int updateDriveSchoolSeparate(DriveSchoolSeparate driveSchoolSeparate) { - driveSchoolSeparate.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolSeparate.setUpdateTime(DateUtils.getNowDate()); return driveSchoolSeparateMapper.updateDriveSchoolSeparate(driveSchoolSeparate); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolSwiperServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolSwiperServiceImpl.java index 3016e1f0..d5a606be 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolSwiperServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolSwiperServiceImpl.java @@ -102,7 +102,7 @@ public class DriveSchoolSwiperServiceImpl implements IDriveSchoolSwiperService @Override public int updateDriveSchoolSwiper(DriveSchoolSwiper driveSchoolSwiper) { - driveSchoolSwiper.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolSwiper.setUpdateTime(DateUtils.getNowDate()); return driveSchoolSwiperMapper.updateDriveSchoolSwiper(driveSchoolSwiper); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolTextServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolTextServiceImpl.java index 2e769ebd..b133f763 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolTextServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolTextServiceImpl.java @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.jx.service.impl; import cn.iocoder.yudao.module.jx.domain.DriveSchoolText; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolTextMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolTextService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,9 +41,9 @@ public class DriveSchoolTextServiceImpl implements IDriveSchoolTextService * @return 驾校公告 */ @Override - public List selectDriveSchoolTextList(DriveSchoolText driveSchoolText) + public IPage selectDriveSchoolTextList(DriveSchoolText driveSchoolText, Page page) { - return driveSchoolTextMapper.selectDriveSchoolTextList(driveSchoolText); + return driveSchoolTextMapper.selectDriveSchoolTextList(driveSchoolText,page); } /** diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolUpkeepServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolUpkeepServiceImpl.java index d1036810..fde05eb8 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolUpkeepServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolUpkeepServiceImpl.java @@ -4,6 +4,8 @@ import cn.iocoder.yudao.module.jx.domain.DriveSchoolUpkeep; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolUpkeepMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolUpkeepService; import cn.iocoder.yudao.module.jx.utils.DateUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,9 +42,9 @@ public class DriveSchoolUpkeepServiceImpl implements IDriveSchoolUpkeepService * @return 车辆保养记录 */ @Override - public List selectDriveSchoolUpkeepList(DriveSchoolUpkeep driveSchoolUpkeep) + public IPage selectDriveSchoolUpkeepList(DriveSchoolUpkeep driveSchoolUpkeep, Page page) { - return driveSchoolUpkeepMapper.selectDriveSchoolUpkeepList(driveSchoolUpkeep); + return driveSchoolUpkeepMapper.selectDriveSchoolUpkeepList(driveSchoolUpkeep,page); } /** @@ -66,7 +68,7 @@ public class DriveSchoolUpkeepServiceImpl implements IDriveSchoolUpkeepService @Override public int updateDriveSchoolUpkeep(DriveSchoolUpkeep driveSchoolUpkeep) { - driveSchoolUpkeep.setUpdateTime(DateUtils.getNowDate()); + //driveSchoolUpkeep.setUpdateTime(DateUtils.getNowDate()); return driveSchoolUpkeepMapper.updateDriveSchoolUpkeep(driveSchoolUpkeep); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/SopeNessServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/SopeNessServiceImpl.java index 84acc8b4..d8dd6218 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/SopeNessServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/SopeNessServiceImpl.java @@ -1,21 +1,19 @@ package cn.iocoder.yudao.module.jx.service.impl; -import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.jx.domain.SopeNess; import cn.iocoder.yudao.module.jx.mapper.SopeNessMapper; import cn.iocoder.yudao.module.jx.service.ISopeNessService; -import cn.iocoder.yudao.module.jx.utils.DateUtils; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.List; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; /** * 经营范围Service业务层处理 @@ -51,13 +49,13 @@ public class SopeNessServiceImpl implements ISopeNessService * @return 经营范围 */ @Override - public List selectSopeNessList(SopeNess sopeNess) + public IPage selectSopeNessList(SopeNess sopeNess, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); sopeNess.setDeptId(deptId); - return sopeNessMapper.selectSopeNessList(sopeNess); + return sopeNessMapper.selectSopeNessList(sopeNess,page); } /** @@ -73,7 +71,7 @@ public class SopeNessServiceImpl implements ISopeNessService AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); sopeNess.setDeptId(deptId); - sopeNess.setCreateTime(DateUtils.getNowDate()); + //sopeNess.setCreateTime(DateUtils.getNowDate()); return sopeNessMapper.insertSopeNess(sopeNess); } @@ -90,7 +88,7 @@ public class SopeNessServiceImpl implements ISopeNessService AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); sopeNess.setDeptId(deptId); - sopeNess.setUpdateTime(DateUtils.getNowDate()); + //sopeNess.setUpdateTime(DateUtils.getNowDate()); return sopeNessMapper.updateSopeNess(sopeNess); } diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveCarBindMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveCarBindMapper.xml index d5cb1da7..2cd9abcc 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveCarBindMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveCarBindMapper.xml @@ -12,9 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -24,11 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -46,9 +46,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_name, drive_license, create_time, - creator, + creator, update_time, - updater, + updater, #{deptId}, @@ -57,9 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{userName}, #{driveLicense}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -72,9 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_name = #{userName}, drive_license = #{driveLicense}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveContractTestMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveContractTestMapper.xml index 769270e2..b5205edc 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveContractTestMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveContractTestMapper.xml @@ -9,9 +9,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -21,8 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -37,17 +37,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, content, create_time, - creator, + creator, update_time, - updater, + updater, #{deptId}, #{content}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -57,9 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id = #{deptId}, content = #{content}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolBookingMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolBookingMapper.xml index 9063aeba..ab9c9e16 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolBookingMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolBookingMapper.xml @@ -19,10 +19,10 @@ diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml index 56f14cc3..5a3608d5 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml @@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -37,20 +37,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -78,9 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" outline_date, repair_date, create_time, - creator, + creator, update_time, - updater, + updater, baoxian_sttime, baoxian_entime, company, @@ -102,9 +123,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{outlineDate}, #{repairDate}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, #{baoxianSttime}, #{baoxianEntime}, #{company}, @@ -130,9 +151,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" outline_date = #{outlineDate}, repair_date = #{repairDate}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, baoxian_sttime = #{baoxianSttime}, baoxian_entime = #{baoxianEntime}, company = #{company}, diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarRepairMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarRepairMapper.xml index 0cb15a6d..d0d8c77f 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarRepairMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarRepairMapper.xml @@ -16,9 +16,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -37,14 +37,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -67,9 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content, money, create_time, - creator, + creator, update_time, - updater, + updater, carBian, carExpert, carCheck, @@ -92,9 +107,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{content}, #{money}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, #{carBian}, #{carExpert}, #{carCheck}, @@ -120,9 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content = #{content}, money = #{money}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, carsId = #{carsId}, carLong = #{carLong}, carRepair = #{carRepair}, diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCheckMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCheckMapper.xml index 8ac94fd1..15532c27 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCheckMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCheckMapper.xml @@ -18,9 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -31,15 +31,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -64,9 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content, money, create_time, - creator, + creator, update_time, - updater, + updater, checkTime, @@ -82,9 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{content}, #{money}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, #{checkTime}, @@ -104,9 +104,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content = #{content}, money = #{money}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, checkTime = #{checkTime}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCoachMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCoachMapper.xml index 2aa5bcb1..35ee190d 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCoachMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCoachMapper.xml @@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -40,18 +40,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -98,9 +117,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" drive_card_type, subject_type, create_time, - creator, + creator, update_time, - updater, + updater, indenty, carId, address, @@ -122,9 +141,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{driveCardType}, #{subjectType}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, #{indenty}, #{carId}, #{address}, @@ -149,9 +168,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" drive_card_type = #{driveCardType}, subject_type = #{subjectType}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, indenty = #{indenty}, carId = #{carId}, address = #{address}, diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolContractMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolContractMapper.xml index 564db42b..53fcb4df 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolContractMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolContractMapper.xml @@ -10,9 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -23,10 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and id = #{id} - and automatic = #{automatic} - and license = #{license} - and dept_id = #{deptId} - and type = #{type} - and name like concat('%', #{name}, '%') - and day_start = #{dayStart} - and day_end = #{dayEnd} - and price = #{price} - and reserve_money = #{reserveMoney} - and photo = #{photo} - and describ = #{describ} + and id = #{entity.id} + and automatic = #{entity.automatic} + and license = #{entity.license} + and dept_id = #{entity.deptId} + and type = #{entity.type} + and name like concat('%', #{entity.name}, '%') + and day_start = #{entity.dayStart} + and day_end = #{entity.dayEnd} + and price = #{entity.price} + and reserve_money = #{entity.reserveMoney} + and photo = #{entity.photo} + and describ = #{entity.describ} order by create_time desc @@ -50,15 +50,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -106,9 +122,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" photo, describ, create_time, - creator, + creator, update_time, - updater, + updater, favour, @@ -124,9 +140,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{photo}, #{describ}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, #{favour}, @@ -146,9 +162,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" photo = #{photo}, describ = #{describ}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, favour = #{favour}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCourseOrderMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCourseOrderMapper.xml index f4906d35..9c01720d 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCourseOrderMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCourseOrderMapper.xml @@ -20,9 +20,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -32,19 +32,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -70,9 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rest_money, payment_status, create_time, - creator, + creator, update_time, - updater, + updater, #{orderNo}, @@ -89,9 +89,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{restMoney}, #{paymentStatus}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -112,9 +112,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rest_money = #{restMoney}, payment_status = #{paymentStatus}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCredentialsMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCredentialsMapper.xml index de41eacc..0ddad220 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCredentialsMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCredentialsMapper.xml @@ -20,9 +20,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -35,19 +35,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -73,9 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" registration_certificate_issue_date, registration_certificate_expiry_date, create_time, - creator, + creator, update_time, - updater, + updater, filing_cover, business_icense_cover, dept_id, @@ -95,9 +95,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{registrationCertificateIssueDate}, #{registrationCertificateExpiryDate}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, #{filingCover}, #{businessLicenseCover}, #{deptId}, @@ -121,9 +121,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" registration_certificate_issue_date = #{registrationCertificateIssueDate}, registration_certificate_expiry_date = #{registrationCertificateExpiryDate}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, filing_cover = #{filingCover}, business_icense_cover = #{businessLicenseCover}, dept_id = #{deptId}, diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDailyManagementMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDailyManagementMapper.xml index 9e8fe1b0..840123f3 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDailyManagementMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDailyManagementMapper.xml @@ -14,9 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -28,15 +28,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -56,9 +56,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" instructor_log, permission_control, create_time, - creator, + creator, update_time, - updater, + updater, dept_id, log_type, @@ -71,9 +71,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{instructorLog}, #{permissionControl}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, #{deptId}, #{logType}, @@ -90,9 +90,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" instructor_log = #{instructorLog}, permission_control = #{permissionControl}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, dept_id = #{deptId}, log_type = #{logType}, diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDeductMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDeductMapper.xml index ef380778..cf8d1945 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDeductMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDeductMapper.xml @@ -10,9 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -22,9 +22,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -41,18 +51,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" deduct, course_subject, create_time, - creator, + creator, update_time, - updater, + updater, #{deptId}, #{deduct}, #{courseSubject}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -63,9 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" deduct = #{deduct}, course_subject = #{courseSubject}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDialMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDialMapper.xml index f0a4cccc..84d3ea95 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDialMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDialMapper.xml @@ -11,9 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -26,12 +26,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -49,9 +62,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content, photo, create_time, - creator, + creator, update_time, - updater, + updater, type, jlId, name, @@ -62,9 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{content}, #{photo}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, #{type}, #{jlId}, #{name}, @@ -79,9 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content = #{content}, photo = #{photo}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, type = #{type}, jlId = #{jlId}, type = #{name}, diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDynamicMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDynamicMapper.xml index 42d7f2a0..32b5d19d 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDynamicMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolDynamicMapper.xml @@ -10,9 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -23,10 +23,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -43,9 +54,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cover, title, content, - creator, + creator, create_time, - updater, + updater, update_time, @@ -53,9 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{cover}, #{title}, #{content}, - #{createBy}, + #{creator}, #{createTime}, - #{updateBy}, + #{updater}, #{updateTime}, @@ -67,9 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cover = #{cover}, title = #{title}, content = #{content}, - creator = #{createBy}, + creator = #{creator}, create_time = #{createTime}, - updater = #{updateBy}, + updater = #{updater}, update_time = #{updateTime}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolExamPassMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolExamPassMapper.xml index 0765846c..6809f4cc 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolExamPassMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolExamPassMapper.xml @@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -34,21 +34,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -76,9 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" orderNumber, photo, create_time, - creator, + creator, update_time, - updater, + updater, status, @@ -97,9 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{orderNumber}, #{photo}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, #{status}, @@ -122,9 +122,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" orderNumber = #{orderNumber}, photo = #{photo}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, status = #{status}, where id = #{id} @@ -158,10 +158,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" payState = 1 and status = 1 - and payd_time between #{payStartTimes} and #{payEndTimes} - and jlName like concat('%', #{jlName}, '%') - and jlId = #{jlId} - and jxId = #{jxId} + and payd_time between #{entity.payStartTimes} and #{entity.payEndTimes} + and jlName like concat('%', #{entity.jlName}, '%') + and jlId = #{entity.jlId} + and jxId = #{entity.jxId} group by jlId @@ -239,9 +239,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" orderNumber = #{orderNumber}, photo = #{photo}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, status = #{status}, where jlId = #{jlId} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFacilityMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFacilityMapper.xml index f04e28a4..d7e94603 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFacilityMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFacilityMapper.xml @@ -11,9 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -31,14 +31,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -55,9 +55,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" facility_number, facility_des, create_time, - creator, + creator, update_time, - updater, + updater, location, price, byinTime, @@ -73,9 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{facilityNumber}, #{facilityDes}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, #{location}, #{price}, #{byinTime}, @@ -95,9 +95,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" facility_number = #{facilityNumber}, facility_des = #{facilityDes}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, location = #{location}, price = #{price}, byinTime = #{byinTime}, diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFileMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFileMapper.xml index cc96c0cb..d635950c 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFileMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFileMapper.xml @@ -10,9 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -22,9 +22,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -41,18 +51,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, file_address, create_time, - creator, + creator, update_time, - updater, + updater, #{fileType}, #{deptId}, #{fileAddress}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -63,9 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id = #{deptId}, file_address = #{fileAddress}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml index c2e43627..4c12513e 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml @@ -18,9 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -37,9 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -51,16 +51,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and id = #{id} - and dept_id = #{deptId} - and school_name like concat('%', #{schoolName}, '%') - and leader_name like concat('%', #{leaderName}, '%') - and phone = #{phone} - and region = #{region} - and photo = #{photo} - and address = #{address} - and business_start_time = #{businessStartTime} - and business_end_time = #{businessEndTime} - and announcement = #{announcement} + and dept_id = #{entity.deptId} + and school_name like concat('%', #{entity.schoolName}, '%') + and leader_name like concat('%', #{entity.leaderName}, '%') + and phone = #{entity.phone} + and region = #{entity.region} + and photo = #{entity.photo} + and address = #{entity.address} + and business_start_time = #{entity.businessStartTime} + and business_end_time = #{entity.businessEndTime} + and announcement = #{entity.announcement} order by sort asc @@ -88,9 +88,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" business_end_time, sort, create_time, - creator, + creator, update_time, - updater, + updater, #{id}, @@ -108,9 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{businessEndTime}, #{sort}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -131,9 +131,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" business_end_time = #{businessEndTime}, sort = #{sort}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInsuranceMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInsuranceMapper.xml index 11353814..23cbc12d 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInsuranceMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInsuranceMapper.xml @@ -17,9 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -29,15 +29,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -61,9 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" money, insurance_time, create_time, - creator, + creator, update_time, - updater, + updater, #{deptId}, @@ -77,9 +77,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{money}, #{insuranceTime}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -97,9 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" money = #{money}, insurance_time = #{insuranceTime}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolNewsMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolNewsMapper.xml index 88a706ef..094bae20 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolNewsMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolNewsMapper.xml @@ -10,9 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -23,10 +23,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -43,9 +54,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cover, title, content, - creator, + creator, create_time, - updater, + updater, update_time, @@ -53,9 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{cover}, #{title}, #{content}, - #{createBy}, + #{creator}, #{createTime}, - #{updateBy}, + #{updater}, #{updateTime}, @@ -67,9 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cover = #{cover}, title = #{title}, content = #{content}, - creator = #{createBy}, + creator = #{creator}, create_time = #{createTime}, - updater = #{updateBy}, + updater = #{updater}, update_time = #{updateTime}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolNoticeMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolNoticeMapper.xml index 3bc146fb..c19f8d66 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolNoticeMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolNoticeMapper.xml @@ -10,9 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -22,9 +22,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -41,18 +51,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" title, content, create_time, - creator, + creator, update_time, - updater, + updater, #{deptId}, #{title}, #{content}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -63,9 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" title = #{title}, content = #{content}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolPayMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolPayMapper.xml index 90640321..9b33aa16 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolPayMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolPayMapper.xml @@ -49,20 +49,20 @@ @@ -102,21 +102,21 @@ inner join drive_school_exam_pass dsep on dcp.phone = dsep.phone identity IS NOT NULL - and dsep.course_subject = #{type} - and dcp.`name` like concat('%', #{name}, '%') - and dcp.phone like concat('%', #{phone}, '%') - and dcp.identity = #{identity} - and dcp.state = #{state} - and dcp.isSign = #{isSign} - and dcp.startPay = #{startPay} - and dcp.createTime = #{createTime} - and dcp.orderNumber like concat('%', #{orderNumber}, '%') - and dcp.afternoon = #{afternoon} - and dcp.jxId = #{jxId} - and dcp.jlId = #{jlId} - and dcp.userId = #{userId} - and dcp.payType = #{payType} - and dcp.isReturn = #{isReturn} + and course_subject = #{entity.type} + and `name` like concat('%', #{entity.name}, '%') + and phone like concat('%', #{entity.phone}, '%') + and identity = #{entity.identity} + and state = #{entity.state} + and isSign = #{entity.isSign} + and startPay = #{entity.startPay} + and createTime = #{entity.createTime} + and orderNumber like concat('%', #{entity.orderNumber}, '%') + and afternoon = #{entity.afternoon} + and jxId = #{entity.jxId} + and jlId = #{entity.jlId} + and userId = #{entity.userId} + and payType = #{entity.payType} + and isReturn = #{entity.isReturn} order by dcp.createTime desc @@ -129,21 +129,21 @@ inner join drive_school_exam_pass dsep on dcp.phone = dsep.phone identity IS NOT NULL - and dsep.course_subject = #{type} - and dcp.`name` like concat('%', #{name}, '%') - and dcp.phone like concat('%', #{phone}, '%') - and dcp.identity = #{identity} - and dcp.state = #{state} - and dcp.isSign = #{isSign} - and dcp.startPay = #{startPay} - and dcp.createTime = #{createTime} - and dcp.orderNumber like concat('%', #{orderNumber}, '%') - and dcp.afternoon = #{afternoon} - and dcp.jxId = #{jxId} - and dcp.jlId = #{jlId} - and dcp.userId = #{userId} - and dcp.payType = #{payType} - and dcp.isReturn = #{isReturn} + and course_subject = #{entity.type} + and `name` like concat('%', #{entity.name}, '%') + and phone like concat('%', #{entity.phone}, '%') + and identity = #{entity.identity} + and state = #{entity.state} + and isSign = #{entity.isSign} + and startPay = #{entity.startPay} + and createTime = #{entity.createTime} + and orderNumber like concat('%', #{entity.orderNumber}, '%') + and afternoon = #{entity.afternoon} + and jxId = #{entity.jxId} + and jlId = #{entity.jlId} + and userId = #{entity.userId} + and payType = #{entity.payType} + and isReturn = #{entity.isReturn} order by dcp.createTime desc @@ -291,20 +291,20 @@ left join drive_school_course dsc on dsp.courseId = dsc.id - and dsp.`name` like concat('%', #{name}, '%') - and dsp.phone like concat('%', #{phone}, '%') - and dsp.identity = #{identity} - and dsp.state = #{state} - and dsp.isSign = #{isSign} - and dsp.startPay = #{startPay} - and dsp.createTime = #{createTime} - and dsp.orderNumber like concat('%', #{orderNumber}, '%') - and dsp.afternoon = #{afternoon} - and dsp.jxId = #{jxId} - and dsp.jlId = #{jlId} - and dsp.userId = #{userId} - and dsp.payType = #{payType} - and dsp.isReturn = #{isReturn} + and dsp.`name` like concat('%', #{entity.name}, '%') + and dsp.phone like concat('%', #{entity.phone}, '%') + and dsp.identity = #{entity.identity} + and dsp.state = #{entity.state} + and dsp.isSign = #{entity.isSign} + and dsp.startPay = #{entity.startPay} + and dsp.createTime = #{entity.createTime} + and dsp.orderNumber like concat('%', #{entity.orderNumber}, '%') + and dsp.afternoon = #{entity.afternoon} + and dsp.jxId = #{entity.jxId} + and dsp.jlId = #{entity.jlId} + and dsp.userId = #{entity.userId} + and dsp.payType = #{entity.payType} + and dsp.isReturn = #{entity.isReturn} order by createTime desc @@ -317,7 +317,7 @@ drive_school_pay dsp left join drive_school_course dsc on dsp.courseId = dsc.id - and jxId = #{jxId} + and jxId = #{entity.jxId} order by createTime desc diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolPhoneMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolPhoneMapper.xml index 3533abe5..c97f3112 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolPhoneMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolPhoneMapper.xml @@ -11,9 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -23,10 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -44,9 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_name, phone, create_time, - creator, + creator, update_time, - updater, + updater, #{deptId}, @@ -54,9 +54,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{userName}, #{phone}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -68,9 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_name = #{userName}, phone = #{phone}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolReimbursementMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolReimbursementMapper.xml index 5d752f4b..c0dc8339 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolReimbursementMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolReimbursementMapper.xml @@ -12,9 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -24,11 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -48,9 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content, state, create_time, - creator, + creator, update_time, - updater, + updater, #{id}, @@ -60,9 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{content}, #{state}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -75,9 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content = #{content}, state = #{state}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolReservationCourseMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolReservationCourseMapper.xml index c76f39be..894a880c 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolReservationCourseMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolReservationCourseMapper.xml @@ -25,9 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -37,14 +37,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -77,9 +77,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" account_type, type, create_time, - creator, + creator, update_time, - updater, + updater, #{id}, @@ -93,9 +93,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{accountType}, #{type}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -121,9 +121,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" coach_name = #{coachName}, account_type = #{accountType}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, audit_status = #{auditStatus}, refuse_reason = #{refuseReason}, diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSeparateMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSeparateMapper.xml index 070dbde6..97ea6c16 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSeparateMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSeparateMapper.xml @@ -10,9 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -22,9 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -41,18 +41,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_name, money, create_time, - creator, + creator, update_time, - updater, + updater, #{deptId}, #{deptName}, #{money}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -63,9 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_name = #{deptName}, money = #{money}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml index ee009226..31c0ae78 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml @@ -11,9 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -47,9 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" swiper_picture, jump_url, list_order, - creator, + creator, create_time, - updater, + updater, update_time, @@ -59,9 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{swiperPicture}, #{jumpUrl}, #{listOrder}, - #{createBy}, + #{creator}, #{createTime}, - #{updateBy}, + #{updater}, #{updateTime}, @@ -74,9 +74,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" swiper_picture = #{swiperPicture}, jump_url = #{jumpUrl}, list_order = #{listOrder}, - creator = #{createBy}, + creator = #{creator}, create_time = #{createTime}, - updater = #{updateBy}, + updater = #{updater}, update_time = #{updateTime}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolTeachingJournalMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolTeachingJournalMapper.xml index d96f5395..cf1055ec 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolTeachingJournalMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolTeachingJournalMapper.xml @@ -45,9 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_name, content, create_time, - creator, + creator, update_time, - updater, + updater, #{deptId}, @@ -55,9 +55,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{userName}, #{content}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -69,9 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_name = #{userName}, content = #{content}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolTextMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolTextMapper.xml index 3ce06e84..c3ea20ec 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolTextMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolTextMapper.xml @@ -11,9 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -41,9 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cover, dept_id, create_time, - creator, + creator, update_time, - updater, + updater, #{content}, @@ -51,9 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{cover}, #{deptId}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -65,9 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cover = #{cover}, dept_id = #{deptId}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolUpkeepMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolUpkeepMapper.xml index da96544c..b05da091 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolUpkeepMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolUpkeepMapper.xml @@ -14,9 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -26,13 +26,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -52,9 +52,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" next_maintenance_date, next_maintenance_mileage, create_time, - creator, + creator, update_time, - updater, + updater, #{carId}, @@ -65,9 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{nextMaintenanceDate}, #{nextMaintenanceMileage}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, @@ -82,9 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" next_maintenance_date = #{nextMaintenanceDate}, next_maintenance_mileage = #{nextMaintenanceMileage}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, where id = #{id} diff --git a/dl-module-jx/src/main/resources/mapper/jx/SopeNessMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/SopeNessMapper.xml index d39e5283..17ea3dac 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/SopeNessMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/SopeNessMapper.xml @@ -8,9 +8,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -23,22 +23,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, dept_id, create_time, creator, update_time, updater, business_type, description, license_number, license_issue_date, license_expiry_date, price, duration, notes, license_cover from sope_ness + select * from sope_ness @@ -52,9 +52,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, create_time, - creator, + creator, update_time, - updater, + updater, business_type, description, license_number, @@ -68,9 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deptId}, #{createTime}, - #{createBy}, + #{creator}, #{updateTime}, - #{updateBy}, + #{updater}, #{businessType}, #{description}, #{licenseNumber}, @@ -88,9 +88,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id = #{deptId}, create_time = #{createTime}, - creator = #{createBy}, + creator = #{creator}, update_time = #{updateTime}, - updater = #{updateBy}, + updater = #{updater}, business_type = #{businessType}, description = #{description}, license_number = #{licenseNumber},