From e1b00b5ac6d9606bfeace2db066f3983828e2cc8 Mon Sep 17 00:00:00 2001 From: 13405411873 <1994398261@qq.com> Date: Fri, 11 Oct 2024 00:13:16 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectionEquInfoController.java | 15 ++++++----- .../controller/PartnerOwnController.java | 26 +++++++++---------- .../mapper/AppInspectionPartnerMapper.java | 4 +-- .../mapper/InspectionAppointmentMapper.java | 3 ++- .../mapper/InspectionEquInfoMapper.java | 5 +++- .../service/AppInspectionPartnerService.java | 6 ++--- .../IInspectionAppointmentService.java | 3 ++- .../service/IInspectionEquInfoService.java | 4 ++- .../impl/AppInspectionPartnerServiceImpl.java | 9 +++---- .../InspectionAppointmentServiceImpl.java | 3 ++- .../impl/InspectionEquInfoServiceImpl.java | 6 +++-- .../module/payment/entity/OrderInfo.java | 14 ++++------ .../service/impl/OrderInfoServiceImpl.java | 2 +- .../inspection/AppInspectionPartnerMapper.xml | 3 +-- .../inspection/InspectionEquInfoMapper.xml | 9 ++++--- yudao-dependencies/pom.xml | 2 +- .../service/auth/AdminAuthServiceImpl.java | 2 +- 17 files changed, 62 insertions(+), 54 deletions(-) diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java index a7a5b03b..e3d691e3 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java @@ -7,6 +7,8 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService; import cn.iocoder.yudao.module.shop.entity.ShopMallPartners; import cn.iocoder.yudao.util.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.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -39,11 +41,11 @@ public class InspectionEquInfoController extends BaseController * 查询equInfo列表 */ @GetMapping("/list") - public TableDataInfo list(InspectionEquInfo inspectionEquInfo) throws Exception { + public CommonResult list(Integer pageNum,Integer pageSize,InspectionEquInfo inspectionEquInfo) throws Exception { - startPage(); - List list = inspectionEquInfoService.selectInspectionEquInfoList(inspectionEquInfo); - return getDataTable(list); + Page page =new Page(pageNum,pageSize); + IPage list = inspectionEquInfoService.selectInspectionEquInfoList(page,inspectionEquInfo); + return success(list); } /** @@ -52,9 +54,10 @@ public class InspectionEquInfoController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, InspectionEquInfo inspectionEquInfo) { - List list = inspectionEquInfoService.selectInspectionEquInfoList(inspectionEquInfo); + Page page =new Page(1,100000); + IPage list = inspectionEquInfoService.selectInspectionEquInfoList(page,inspectionEquInfo); ExcelUtil util = new ExcelUtil(InspectionEquInfo.class); - util.exportExcel(response, list, "equInfo数据"); + util.exportExcel(response, list.getRecords(), "equInfo数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java index 7f852a34..ec92bbe3 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java @@ -347,14 +347,14 @@ public class PartnerOwnController extends BaseController { //获取检测的数据 @GetMapping("/inspectionList") - public TableDataInfo inspectionList(Long partnerId,String status,String carNum,Integer pageSize,Integer pageNum) throws Exception { + public CommonResult inspectionList(Long partnerId,String status,String carNum,Integer pageSize,Integer pageNum) throws Exception { ShopMallPartners partners = partnerList.shopInfo(); if (!partnerId.equals(partners.getPartnerId())){ return null; } Page page = new Page<>(pageNum,pageSize); - List inspectionInfos = partnerList.inspectionList(page,partnerId, status, carNum); - return getDataTable(inspectionInfos); + IPage inspectionInfos = partnerList.inspectionList(page,partnerId, status, carNum); + return success(inspectionInfos); } //获取检测的详细信息 @@ -365,7 +365,7 @@ public class PartnerOwnController extends BaseController { //获取检测的数据 @GetMapping("/workerInspectionList") - public TableDataInfo workerInspectionList(Long partnerId,String status,String searchValue,Integer pageSize,Integer pageNum) { + public CommonResult workerInspectionList(Long partnerId,String status,String searchValue,Integer pageSize,Integer pageNum) { LoginUser user = SecurityFrameworkUtils.getLoginUser(); LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); queryWrapper.eq(PartnerWorker::getUserId,user.getId()).eq(PartnerWorker::getPartnerId,partnerId); @@ -374,8 +374,8 @@ public class PartnerOwnController extends BaseController { return null; } Page page = new Page<>(pageNum,pageSize); - List inspectionInfos = partnerList.inspectionList(page,partnerId, status, searchValue); - return getDataTable(inspectionInfos); + IPage inspectionInfos = partnerList.inspectionList(page,partnerId, status, searchValue); + return success(inspectionInfos); } //增加检测步骤信息 @PostMapping("/addStepInfo") @@ -397,28 +397,28 @@ public class PartnerOwnController extends BaseController { } //获取到店预约的数据 @GetMapping("/getAppointmentList") - public TableDataInfo getAppointmentList(Long partnerId,String phoneNum,Integer pageSize,Integer pageNum) { + public CommonResult getAppointmentList(Long partnerId,String phoneNum,Integer pageSize,Integer pageNum) { LoginUser user = SecurityFrameworkUtils.getLoginUser(); ShopMallPartners partnersTmp = partnerList.getById(partnerId); if (!partnersTmp.getUserId().equals(user.getId())){ return null; } Page page = new Page<>(pageNum,pageSize); - List appointments = partnerList.getAppointmentList(page,partnerId,phoneNum); - return getDataTable(appointments); + IPage appointments = partnerList.getAppointmentList(page,partnerId,phoneNum); + return success(appointments); } //获取上门取车数据 @GetMapping("/getPickCarList") - public TableDataInfo getPickCarList(Long partnerId,String phoneNum,String pickStatus,Integer pageSize,Integer pageNum) { + public CommonResult getPickCarList(Long partnerId,String phoneNum,String pickStatus,Integer pageSize,Integer pageNum) { LoginUser user = SecurityFrameworkUtils.getLoginUser(); ShopMallPartners partnersTmp = partnerList.getById(partnerId); if (!partnersTmp.getUserId().equals(user.getId())){ return null; } - PageHelper.startPage(pageNum,pageSize); - List pickCarList = partnerList.getPickCarList(partnerId,phoneNum,pickStatus); - return getDataTable(pickCarList); + Page page = new Page<>(pageNum,pageSize); + IPage pickCarList = partnerList.getPickCarList(page,partnerId,phoneNum,pickStatus); + return success(pickCarList); } //获取上门取车详情页 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java index b0e09768..61e2716d 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java @@ -36,10 +36,10 @@ public interface AppInspectionPartnerMapper extends BaseMapper List orderList(@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum,@Param("title") String title); List getWorkList(@Param("partnerId")Long partnerId, @Param("postId") Long postId, @Param("workName") String workName, @Param("phoneNum")String phoneNum); IPage pageWorkList(@Param("partnerId")Long partnerId, @Param("postId") Long postId, @Param("workName") String workName, @Param("phoneNum")String phoneNum,Page page); - List inspectionList(Page page,@Param("partnerId")Long partnerId, @Param("status") String status, @Param("carNum")String carNum); + IPage inspectionList(Page page,@Param("partnerId")Long partnerId, @Param("status") String status, @Param("carNum")String carNum); List workerInspectionList(@Param("workerId")Long workerId,@Param("status") String status, @Param("searchValue")String searchValue); List validationList(@Param("partnerId") Long partnerId, @Param("searchValue") String searchValue); - List getPickCarList(@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum, @Param("pickStatus") String pickStatus); + IPage getPickCarList(Page page,@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum, @Param("pickStatus") String pickStatus); List getPickCarListOfWorker(@Param("workerId") Long workerId, @Param("phoneNum") String phoneNum); List chartInfoAmount(@Param("startTime") String startTime,@Param("endTime")String endTime,@Param("partnerId")Long partnerId); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionAppointmentMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionAppointmentMapper.java index d5af610f..ca85cfa0 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionAppointmentMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionAppointmentMapper.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.inspection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.inspection.entity.InspectionAppointment; +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; @@ -64,7 +65,7 @@ public interface InspectionAppointmentMapper extends BaseMapper getAppointmentList(Page page,@Param("partnerId") Long partnerId, @Param("phoneNum")String phoneNum); + IPage getAppointmentList(Page page, @Param("partnerId") Long partnerId, @Param("phoneNum")String phoneNum); List getAppointmentOwn(@Param("userId") Long userId); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionEquInfoMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionEquInfoMapper.java index ebfca915..ce5aac7b 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionEquInfoMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionEquInfoMapper.java @@ -4,7 +4,10 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.inspection.entity.InspectionEquInfo; +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; /** * equInfoMapper接口 @@ -29,6 +32,6 @@ public interface InspectionEquInfoMapper extends BaseMapper * @param inspectionEquInfo equInfo * @return equInfo集合 */ - public List selectInspectionEquInfoList(InspectionEquInfo inspectionEquInfo); + public IPage selectInspectionEquInfoList(Page page, @Param("inspectionEquInfo") InspectionEquInfo inspectionEquInfo); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java index 1a607599..d6efc30b 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java @@ -69,20 +69,20 @@ public interface AppInspectionPartnerService extends IService void delWorker(Long partnerId,Long workId); - List inspectionList(Page page,Long partnerId, String status, String carNum); + IPage inspectionList(Page page,Long partnerId, String status, String carNum); InspectionInfoVo inspectionDetail(Long inspectionInfoId); List workerInspectionList(Long partnerId,String status,String searchValue); void addStepInfo(InspectionStepInfo stepInfo); void stopInspection(InspectionInfo info) throws Exception; void makeCertOk(Long inspectionId); - List getAppointmentList(Page page,Long partnerId,String phoneNum); + IPage getAppointmentList(Page page,Long partnerId,String phoneNum); List validationList(Long partnerId,String searchValue); void sendCoupon(ShopCouponTemplate template) throws Exception; List listCoupon(Long partnerId,String searchValue); void delCoupon(Long partnerId,Long id); void designatePickCarWorker(Long pickCarId,Long workerId); - List getPickCarList(Long partnerId, String phoneNum,String pickStatus); + IPage getPickCarList(Page page,Long partnerId, String phoneNum,String pickStatus); InspectionPickCar getPickCarDetail(Long dataId); List getPickCarListOfWorker(Long workerId, String phoneNum); JSONObject vehicleLicenseOCR(String imagePath) throws Exception; diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionAppointmentService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionAppointmentService.java index 3ad5e154..88f040c9 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionAppointmentService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionAppointmentService.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.inspection.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.inspection.entity.InspectionAppointment; @@ -73,6 +74,6 @@ public interface IInspectionAppointmentService extends IService getAppointmentList(Page page,Long partnerId, String phoneNum); + public IPage getAppointmentList(Page page, Long partnerId, String phoneNum); List getAppointmentOwn(); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionEquInfoService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionEquInfoService.java index 971f1f6d..e8d157b7 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionEquInfoService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionEquInfoService.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.inspection.service; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.inspection.entity.InspectionEquInfo; @@ -27,7 +29,7 @@ public interface IInspectionEquInfoService extends IService * @param inspectionEquInfo equInfo * @return equInfo集合 */ - public List selectInspectionEquInfoList(InspectionEquInfo inspectionEquInfo); + public IPage selectInspectionEquInfoList(Page page,InspectionEquInfo inspectionEquInfo); /** * 新增equInfo diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java index f6721005..25f890c8 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java @@ -239,7 +239,6 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl inspectionList(Page page,Long partnerId, String status, String carNum) { + public IPage inspectionList(Page page,Long partnerId, String status, String carNum) { return baseMapper.inspectionList(page,partnerId,status,carNum); } @@ -1243,7 +1242,7 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl getAppointmentList(Page page,Long partnerId,String phoneNum) { + public IPage getAppointmentList(Page page,Long partnerId,String phoneNum) { return appointmentService.getAppointmentList(page,partnerId,phoneNum); } @@ -1311,9 +1310,9 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl getPickCarList(Long partnerId, String phoneNum,String pickStatus) { + public IPage getPickCarList(Page page,Long partnerId, String phoneNum,String pickStatus) { - return baseMapper.getPickCarList(partnerId,phoneNum,pickStatus); + return baseMapper.getPickCarList(page,partnerId,phoneNum,pickStatus); } @Override diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionAppointmentServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionAppointmentServiceImpl.java index aa52b592..eb41970f 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionAppointmentServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionAppointmentServiceImpl.java @@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.system.service.user.AdminUserService; import cn.iocoder.yudao.util.SendSmsUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.DateUtils; @@ -347,7 +348,7 @@ public class InspectionAppointmentServiceImpl extends ServiceImpl getAppointmentList(Page page,Long partnerId, String phoneNum) { + public IPage getAppointmentList(Page page, Long partnerId, String phoneNum) { return baseMapper.getAppointmentList(page,partnerId,phoneNum); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionEquInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionEquInfoServiceImpl.java index 54c7d741..664fc4d2 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionEquInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionEquInfoServiceImpl.java @@ -7,6 +7,8 @@ import java.util.List; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.DateUtils; import cn.iocoder.yudao.module.inspection.entity.WarnMessage; @@ -48,9 +50,9 @@ public class InspectionEquInfoServiceImpl extends ServiceImpl selectInspectionEquInfoList(InspectionEquInfo inspectionEquInfo) + public IPage selectInspectionEquInfoList(Page page,InspectionEquInfo inspectionEquInfo) { - return baseMapper.selectInspectionEquInfoList(inspectionEquInfo); + return baseMapper.selectInspectionEquInfoList(page,inspectionEquInfo); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/entity/OrderInfo.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/entity/OrderInfo.java index ddedb438..4392c762 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/entity/OrderInfo.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/entity/OrderInfo.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.payment.entity; +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -14,7 +15,7 @@ import java.util.Date; * @since 2023-07-24 18:30:28 */ @Data -public class OrderInfo { +public class OrderInfo extends TenantBaseDO { //订单id private Long id; private String transactionId; @@ -63,16 +64,11 @@ public class OrderInfo { private Integer commentStar; //订单类型 private String orderType; - //创建时间 - private Date createTime; - //创建人id - private Long creator; + + //创建人所在部门 private Long deptId; - //更新时间 - private Date updateTime; - //更新人id - private Integer updater; + //积分充值的金额 @TableField(exist = false) private Long balanceCz; diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java index 7133e0c3..c6c9208d 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java @@ -278,7 +278,7 @@ public class OrderInfoServiceImpl extends ServiceImpl select * from inspection_equ_info - and equ_name like concat('%', #{equName}, '%') - and equ_model like concat('%', #{equModel}, '%') - and equ_number like concat('%', #{equNumber}, '%') - and next_check_time between #{params.beginNextCheckTime} and #{params.endNextCheckTime} + and equ_name like concat('%', #{inspectionEquInfo.equName}, '%') + and equ_model like concat('%', #{inspectionEquInfo.equModel}, '%') + and equ_number like concat('%', #{inspectionEquInfo.equNumber}, '%') + + and next_check_time between #{inspectionEquInfo.params.beginNextCheckTime} and #{inspectionEquInfo.params.endNextCheckTime} diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 4f823ba4..096bfa19 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -26,7 +26,7 @@ 1.2.23 3.5.16 3.5.7 - 2.1.0 + 1.4.6 4.9 3.5.7 4.3.1 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java index c5e64611..abad719a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java @@ -375,7 +375,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { List jcyh = roleService.getRoleListByCodes(Collections.singletonList("jcyh")); Set ids = new HashSet<>(); ids.add(jcyh.get(0).getId()); - permissionService.assignUserRole(user.getId(),ids); + permissionService.assignUserRole(uid,ids); }else { //更新 user.setId(wxUser.getId()); From 5de07b49e6c948a83357aa82d9e6d2170232f482 Mon Sep 17 00:00:00 2001 From: Lihx Date: Fri, 11 Oct 2024 18:53:33 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9IPage=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppSwiperController.java | 23 ++++--- .../appBase/mapper/AppSwiperMapper.java | 5 +- .../appBase/service/IAppSwiperService.java | 4 +- .../service/impl/AppSwiperServiceImpl.java | 6 +- .../controller/ContractHistoryController.java | 22 +++--- .../InspectionContractController.java | 33 +++++---- .../mapper/ContractHistoryMapper.java | 7 +- .../mapper/InspectionContractMapper.java | 4 +- .../service/IContractHistoryService.java | 4 +- .../service/IInspectionContractService.java | 6 +- .../impl/ContractHistoryServiceImpl.java | 6 +- .../impl/InspectionContractServiceImpl.java | 11 +-- .../controller/AppHomeController.java | 20 ++++-- .../controller/AppNewsController.java | 47 +++++++------ .../controller/AppOrderController.java | 38 ++++++----- .../controller/AppPartnerController.java | 13 ++-- .../controller/AppUserOwnController.java | 14 ++-- .../DelInspectionInfoController.java | 31 ++++----- .../InspectionAppointmentController.java | 22 +++--- .../InspectionCategoryTemplateController.java | 32 ++++----- .../InspectionEquInfoController.java | 1 - .../controller/InspectionFileController.java | 29 ++++---- .../InspectionGoodsSkuController.java | 13 ++-- .../controller/InspectionInfoController.java | 22 +++--- .../InspectionMallPartnersController.java | 20 +++--- .../InspectionNewsAssociationController.java | 31 ++++----- .../InspectionNewsCommentController.java | 31 ++++----- .../controller/InspectionNewsController.java | 10 +-- .../InspectionPickCarController.java | 31 ++++----- .../controller/PartnerOwnController.java | 62 ++++++++++------- .../ShopInspectionCategoryController.java | 2 +- .../ShopInspectionGoodsController.java | 31 +++++---- .../controller/SiteInfoController.java | 17 +++-- .../mapper/AppInspectionGoodsMapper.java | 4 +- .../mapper/AppInspectionPartnerMapper.java | 10 +-- .../mapper/DelInspectionInfoMapper.java | 5 +- .../mapper/InspectionAppointmentMapper.java | 2 +- .../InspectionCategoryTemplateMapper.java | 5 +- .../mapper/InspectionFileMapper.java | 5 +- .../mapper/InspectionInfoMapper.java | 2 +- .../InspectionNewsAssociationMapper.java | 5 +- .../mapper/InspectionNewsCommentMapper.java | 5 +- .../mapper/InspectionNewsMapper.java | 8 ++- .../mapper/InspectionPickCarMapper.java | 5 +- .../mapper/ShopInspectionGoodsMapper.java | 7 +- .../inspection/mapper/SiteInfoMapper.java | 3 +- .../service/AppInspectionGoodsService.java | 4 +- .../service/AppInspectionOrderService.java | 6 +- .../service/AppInspectionPartnerService.java | 14 ++-- .../inspection/service/AppUserOwnService.java | 6 +- .../service/IDelInspectionInfoService.java | 4 +- .../IInspectionAppointmentService.java | 2 +- .../IInspectionCategoryTemplateService.java | 4 +- .../service/IInspectionFileService.java | 4 +- .../service/IInspectionInfoService.java | 2 +- .../IInspectionNewsAssociationService.java | 4 +- .../IInspectionNewsCommentService.java | 4 +- .../service/IInspectionNewsService.java | 8 ++- .../service/IInspectionPickCarService.java | 4 +- .../service/IShopInspectionGoodsService.java | 7 +- .../inspection/service/ISiteInfoService.java | 3 +- .../impl/AppInspectionGoodsServiceImpl.java | 8 ++- .../impl/AppInspectionOrderServiceImpl.java | 10 +-- .../impl/AppInspectionPartnerServiceImpl.java | 30 ++++---- .../service/impl/AppUserOwnServiceImpl.java | 10 ++- .../impl/DelInspectionInfoServiceImpl.java | 6 +- .../InspectionAppointmentServiceImpl.java | 4 +- ...InspectionCategoryTemplateServiceImpl.java | 6 +- .../impl/InspectionFileServiceImpl.java | 6 +- .../impl/InspectionInfoServiceImpl.java | 4 +- .../InspectionNewsAssociationServiceImpl.java | 6 +- .../InspectionNewsCommentServiceImpl.java | 6 +- .../impl/InspectionNewsServiceImpl.java | 18 ++--- .../impl/InspectionPickCarServiceImpl.java | 6 +- .../ShopInspectionCategoryServiceImpl.java | 1 - .../impl/ShopInspectionGoodsServiceImpl.java | 13 ++-- .../service/impl/SiteInfoServiceImpl.java | 7 +- .../PartnerCustomerInfoController.java | 1 - .../controller/FzRecordController.java | 20 +++--- .../payment/controller/OrderController.java | 60 +++++++++------- .../module/payment/mapper/FzRecordMapper.java | 3 +- .../payment/mapper/OrderInfoMapper.java | 18 ++--- .../payment/service/IFzRecordService.java | 3 +- .../payment/service/OrderInfoService.java | 14 ++-- .../service/impl/FzRecordServiceImpl.java | 3 +- .../service/impl/OrderInfoServiceImpl.java | 24 +++---- .../controller/PartnerDetailController.java | 21 +++--- .../shop/controller/ShopCouponController.java | 60 ++++++++++------ .../ShopCouponTemplateController.java | 20 +++--- .../controller/ShopUserCarController.java | 29 +++++--- .../shop/mapper/PartnerDetailMapper.java | 3 +- .../module/shop/mapper/ShopCouponMapper.java | 9 +-- .../shop/mapper/ShopCouponTemplateMapper.java | 5 +- .../shop/mapper/ShopMallPartnersMapper.java | 3 +- .../module/shop/mapper/ShopUserCarMapper.java | 3 +- .../shop/service/IPartnerDetailService.java | 4 +- .../shop/service/IShopCouponService.java | 10 +-- .../service/IShopCouponTemplateService.java | 5 +- .../service/IShopMallPartnersService.java | 3 +- .../shop/service/IShopUserCarService.java | 3 +- .../impl/PartnerDetailServiceImpl.java | 3 +- .../service/impl/ShopCouponServiceImpl.java | 15 ++-- .../impl/ShopCouponTemplateServiceImpl.java | 7 +- .../impl/ShopMallPartnersServiceImpl.java | 3 +- .../service/impl/ShopUserCarServiceImpl.java | 3 +- .../mapper/contract/ContractHistoryMapper.xml | 24 +++---- .../inspection/AppInspectionPartnerMapper.xml | 20 +++--- .../inspection/DelInspectionInfoMapper.xml | 68 +++++++++---------- .../InspectionAppointmentMapper.xml | 10 +-- .../InspectionCategoryTemplateMapper.xml | 6 +- .../inspection/InspectionFileMapper.xml | 10 +-- .../inspection/InspectionInfoMapper.xml | 22 +++--- .../InspectionNewsAssociationMapper.xml | 6 +- .../InspectionNewsCommentMapper.xml | 8 +-- .../inspection/InspectionPickCarMapper.xml | 24 +++---- .../inspection/ShopInspectionGoodsMapper.xml | 16 ++--- .../mapper/payment/OrderInfoMapper.xml | 54 +++++++-------- .../mapper/shop/ShopCouponMapper.xml | 52 +++++++------- .../controller/UniShopConfigController.java | 3 + .../app/mapper/UniShopConfigMapper.java | 5 +- .../app/service/UniShopConfigService.java | 3 + .../impl/UniShopConfigServiceImpl.java | 4 ++ .../admin/SysAnnouncementController.java | 1 - .../admin/RescueInfoController.java | 1 - .../admin/RescueCarSpendController.java | 1 - .../admin/RescueConfigController.java | 22 +++--- .../admin/RescueDriverPositionController.java | 36 ++++++---- .../controller/admin/RescueInfoSystem.java | 12 ++-- .../admin/RescueRefuelRecordController.java | 1 - .../controller/admin/SysConfigController.java | 22 +++--- .../rescue/mapper/RescueConfigMapper.java | 5 +- .../mapper/RescueDriverPositionMapper.java | 5 +- .../rescue/mapper/RescueSysConfigMapper.java | 5 +- .../rescue/service/IRescueConfigService.java | 4 +- .../service/IRescueDriverPositionService.java | 8 ++- .../rescue/service/IRescueInfoService.java | 2 +- .../rescue/service/ISysConfigService.java | 4 +- .../service/impl/RescueConfigServiceImpl.java | 6 +- .../impl/RescueDriverPositionServiceImpl.java | 37 ++++++---- .../service/impl/RescueInfoServiceImpl.java | 4 +- .../service/impl/SysConfigServiceImpl.java | 10 +-- .../mapper/rescue/RescueConfigMapper.xml | 8 +-- .../rescue/RescueDriverPositionMapper.xml | 10 +-- .../mapper/rescue/RescueSysConfigMapper.xml | 12 ++-- .../system/api/user/AdminUserApiImpl.java | 1 + .../dal/mysql/user/AdminUserMapper.java | 4 ++ .../system/service/user/AdminUserService.java | 3 + .../service/user/AdminUserServiceImpl.java | 6 ++ .../main/resources/mapper/SysUserMapper.xml | 19 ++++++ 149 files changed, 1099 insertions(+), 771 deletions(-) diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/controller/AppSwiperController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/controller/AppSwiperController.java index d91631b0..a771df4c 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/controller/AppSwiperController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/controller/AppSwiperController.java @@ -9,15 +9,17 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.appBase.entity.AppSwiper; import cn.iocoder.yudao.module.appBase.service.IAppSwiperService; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.infra.controller.app.file.vo.AppFileUploadReqVO; import cn.iocoder.yudao.module.infra.service.file.FileService; +import cn.iocoder.yudao.module.shop.entity.PartnerDetail; import cn.iocoder.yudao.module.shop.entity.ShopMallPartners; import cn.iocoder.yudao.module.shop.service.IShopMallPartnersService; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.user.AdminUserService; import cn.iocoder.yudao.util.ExcelUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -71,11 +73,13 @@ public class AppSwiperController extends BaseController */ @GetMapping("/system/appSwiper/list") - public TableDataInfo list(AppSwiper appSwiper) + public CommonResult list(AppSwiper appSwiper, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = appSwiperService.selectAppSwiperList(appSwiper); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = appSwiperService.selectAppSwiperList(page,appSwiper); + return success(list); } /** @@ -83,11 +87,14 @@ public class AppSwiperController extends BaseController */ @PostMapping("/system/appSwiper/export") - public void export(HttpServletResponse response, AppSwiper appSwiper) + public void export(HttpServletResponse response, AppSwiper appSwiper, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = appSwiperService.selectAppSwiperList(appSwiper); + Page page = new Page<>(pageNum, pageSize); + IPage list = appSwiperService.selectAppSwiperList(page,appSwiper); ExcelUtil util = new ExcelUtil(AppSwiper.class); - util.exportExcel(response, list, "【请填写功能名称】数据"); + util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/mapper/AppSwiperMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/mapper/AppSwiperMapper.java index c1e404bd..091807a0 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/mapper/AppSwiperMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/mapper/AppSwiperMapper.java @@ -1,8 +1,11 @@ package cn.iocoder.yudao.module.appBase.mapper; import cn.iocoder.yudao.module.appBase.entity.AppSwiper; +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 org.checkerframework.checker.units.qual.A; import java.util.List; @@ -30,7 +33,7 @@ public interface AppSwiperMapper * @param appSwiper 【请填写功能名称】 * @return 【请填写功能名称】集合 */ - public List selectAppSwiperList(@Param("vo") AppSwiper appSwiper); + public IPage selectAppSwiperList(Page page, @Param("vo") AppSwiper appSwiper); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/service/IAppSwiperService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/service/IAppSwiperService.java index 391ffeb7..f1f07a39 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/service/IAppSwiperService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/service/IAppSwiperService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.appBase.service; import cn.iocoder.yudao.module.appBase.entity.AppSwiper; +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 IAppSwiperService * @param appSwiper 【请填写功能名称】 * @return 【请填写功能名称】集合 */ - public List selectAppSwiperList(AppSwiper appSwiper); + public IPage selectAppSwiperList(Page page, AppSwiper appSwiper); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/service/impl/AppSwiperServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/service/impl/AppSwiperServiceImpl.java index 2bf9a6d7..38338c16 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/service/impl/AppSwiperServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/service/impl/AppSwiperServiceImpl.java @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.appBase.service.impl; import cn.iocoder.yudao.module.appBase.entity.AppSwiper; import cn.iocoder.yudao.module.appBase.service.IAppSwiperService; import cn.iocoder.yudao.module.appBase.mapper.AppSwiperMapper; +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 AppSwiperServiceImpl implements IAppSwiperService * @return 【请填写功能名称】 */ @Override - public List selectAppSwiperList(AppSwiper appSwiper) + public IPage selectAppSwiperList(Page page, AppSwiper appSwiper) { - return appSwiperMapper.selectAppSwiperList(appSwiper); + return appSwiperMapper.selectAppSwiperList(page,appSwiper); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/controller/ContractHistoryController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/controller/ContractHistoryController.java index f97164d8..c3372db0 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/controller/ContractHistoryController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/controller/ContractHistoryController.java @@ -12,13 +12,14 @@ import cn.iocoder.yudao.module.contract.entity.InspectionContract; import cn.iocoder.yudao.module.contract.service.IContractHistoryService; import cn.iocoder.yudao.module.contract.service.IInspectionContractService; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.infra.service.file.FileService; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.user.AdminUserService; import cn.iocoder.yudao.util.ExcelUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; import org.dom4j.DocumentException; import org.springframework.beans.factory.annotation.Autowired; @@ -58,11 +59,13 @@ public class ContractHistoryController extends BaseController */ // @PreAuthorize("@ss.hasPermi('system:history:list')") @GetMapping("/list") - public TableDataInfo list(ContractHistory contractHistory,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize) + public CommonResult list(ContractHistory contractHistory, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - PageHelper.startPage(pageNum,pageSize); - List list = contractHistoryService.selectContractHistoryList(contractHistory); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = contractHistoryService.selectContractHistoryList(page,contractHistory); + return success(list); } /** @@ -71,11 +74,14 @@ public class ContractHistoryController extends BaseController // @PreAuthorize("@ss.hasPermi('system:history:export')") @PostMapping("/export") - public void export(HttpServletResponse response, ContractHistory contractHistory) + public void export(HttpServletResponse response, ContractHistory contractHistory, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = contractHistoryService.selectContractHistoryList(contractHistory); + Page page = new Page<>(pageNum, pageSize); + IPage list = contractHistoryService.selectContractHistoryList(page,contractHistory); ExcelUtil util = new ExcelUtil(ContractHistory.class); - util.exportExcel(response, list, "签署历史数据"); + util.exportExcel(response, list.getRecords(), "签署历史数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/controller/InspectionContractController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/controller/InspectionContractController.java index d8eed842..c6ec7685 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/controller/InspectionContractController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/controller/InspectionContractController.java @@ -4,10 +4,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.contract.entity.InspectionContract; import cn.iocoder.yudao.module.contract.service.IInspectionContractService; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService; import cn.iocoder.yudao.module.shop.entity.ShopMallPartners; import cn.iocoder.yudao.util.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.*; @@ -34,11 +36,13 @@ public class InspectionContractController extends BaseController */ // @PreAuthorize("@ss.hasPermi('contract:inspectionContract:list')") @GetMapping("/list") - public TableDataInfo list(InspectionContract inspectionContract) + public CommonResult list(InspectionContract inspectionContract, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = inspectionContractService.selectInspectionContractList(inspectionContract); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionContractService.selectInspectionContractList(page,inspectionContract); + return success(list); } /** @@ -47,11 +51,14 @@ public class InspectionContractController extends BaseController // @PreAuthorize("@ss.hasPermi('contract:inspectionContract:export')") // @Log(title = "inspectionContract", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, InspectionContract inspectionContract) + public void export(HttpServletResponse response, InspectionContract inspectionContract, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = inspectionContractService.selectInspectionContractList(inspectionContract); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionContractService.selectInspectionContractList(page,inspectionContract); ExcelUtil util = new ExcelUtil(InspectionContract.class); - util.exportExcel(response, list, "inspectionContract数据"); + util.exportExcel(response, list.getRecords(), "inspectionContract数据"); } /** @@ -103,11 +110,13 @@ public class InspectionContractController extends BaseController */ @GetMapping("/partnerGetWtList") - public TableDataInfo partnerGetWtList(InspectionContract inspectionContract) throws Exception { + public CommonResult partnerGetWtList(InspectionContract inspectionContract, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) throws Exception { ShopMallPartners partners = partnerList.shopInfo(); inspectionContract.setPartnerId(partners.getPartnerId()); - startPage(); - List list = inspectionContractService.partnerGetWtList(inspectionContract); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionContractService.partnerGetWtList(page,inspectionContract); + return success(list); } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/mapper/ContractHistoryMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/mapper/ContractHistoryMapper.java index a9111d25..c41159bd 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/mapper/ContractHistoryMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/mapper/ContractHistoryMapper.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.contract.mapper; import cn.iocoder.yudao.module.contract.entity.ContractHistory; import cn.iocoder.yudao.module.contract.entity.InspectionContract; +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 ContractHistoryMapper * @param contractHistory 签署历史 * @return 签署历史集合 */ - public List selectContractHistoryList(ContractHistory contractHistory); + public IPage selectContractHistoryList(Page page, @Param("vo") ContractHistory contractHistory); /** * 新增签署历史 @@ -63,6 +66,6 @@ public interface ContractHistoryMapper */ public int deleteContractHistoryByIds(Long[] ids); - public List partnerGetWtList(InspectionContract contractHistory); + public IPage partnerGetWtList(Page page, @Param("vo") InspectionContract contractHistory); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/mapper/InspectionContractMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/mapper/InspectionContractMapper.java index cfbb071b..b0632ed6 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/mapper/InspectionContractMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/mapper/InspectionContractMapper.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.contract.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.contract.entity.InspectionContract; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -29,7 +31,7 @@ public interface InspectionContractMapper extends BaseMapper selectInspectionContractList(InspectionContract inspectionContract); + public IPage selectInspectionContractList(Page page, InspectionContract inspectionContract); /** * 新增inspectionContract diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/IContractHistoryService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/IContractHistoryService.java index c7930e01..2cecc610 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/IContractHistoryService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/IContractHistoryService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.contract.service; import cn.iocoder.yudao.module.contract.entity.ContractHistory; +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 IContractHistoryService * @param contractHistory 签署历史 * @return 签署历史集合 */ - public List selectContractHistoryList(ContractHistory contractHistory); + public IPage selectContractHistoryList(Page page, ContractHistory contractHistory); /** * 新增签署历史 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/IInspectionContractService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/IInspectionContractService.java index edd6cb92..8b45f9c8 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/IInspectionContractService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/IInspectionContractService.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.contract.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.contract.entity.InspectionContract; @@ -27,7 +29,7 @@ public interface IInspectionContractService extends IService selectInspectionContractList(InspectionContract inspectionContract); + public IPage selectInspectionContractList(Page page, InspectionContract inspectionContract); /** * 新增inspectionContract @@ -60,5 +62,5 @@ public interface IInspectionContractService extends IService partnerGetWtList(InspectionContract inspectionContract); + IPage partnerGetWtList(Page page, InspectionContract inspectionContract); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/impl/ContractHistoryServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/impl/ContractHistoryServiceImpl.java index b72443af..c15abc5a 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/impl/ContractHistoryServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/impl/ContractHistoryServiceImpl.java @@ -4,6 +4,8 @@ import cn.iocoder.yudao.util.DateUtils; import cn.iocoder.yudao.module.contract.entity.ContractHistory; import cn.iocoder.yudao.module.contract.mapper.ContractHistoryMapper; import cn.iocoder.yudao.module.contract.service.IContractHistoryService; +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 ContractHistoryServiceImpl implements IContractHistoryService * @return 签署历史 */ @Override - public List selectContractHistoryList(ContractHistory contractHistory) + public IPage selectContractHistoryList(Page page, ContractHistory contractHistory) { - return contractHistoryMapper.selectContractHistoryList(contractHistory); + return contractHistoryMapper.selectContractHistoryList(page,contractHistory); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/impl/InspectionContractServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/impl/InspectionContractServiceImpl.java index 512d608d..5bbd45da 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/impl/InspectionContractServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/impl/InspectionContractServiceImpl.java @@ -1,11 +1,14 @@ package cn.iocoder.yudao.module.contract.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.DateUtils; import cn.iocoder.yudao.module.contract.entity.InspectionContract; import cn.iocoder.yudao.module.contract.mapper.ContractHistoryMapper; import cn.iocoder.yudao.module.contract.mapper.InspectionContractMapper; import cn.iocoder.yudao.module.contract.service.IInspectionContractService; + import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -42,9 +45,9 @@ public class InspectionContractServiceImpl extends ServiceImpl selectInspectionContractList(InspectionContract inspectionContract) + public IPage selectInspectionContractList(Page page, InspectionContract inspectionContract) { - return baseMapper.selectInspectionContractList(inspectionContract); + return baseMapper.selectInspectionContractList(page,inspectionContract); } /** @@ -97,8 +100,8 @@ public class InspectionContractServiceImpl extends ServiceImpl partnerGetWtList(InspectionContract inspectionContract) { - return contractHistoryMapper.partnerGetWtList(inspectionContract); + public IPage partnerGetWtList(Page page,InspectionContract inspectionContract) { + return contractHistoryMapper.partnerGetWtList(page,inspectionContract); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppHomeController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppHomeController.java index c7c56497..5d6ae9ea 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppHomeController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppHomeController.java @@ -4,11 +4,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.appBase.entity.AppSwiper; import cn.iocoder.yudao.module.appBase.service.IAppSwiperService; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.inspection.entity.InspectionNews; import cn.iocoder.yudao.module.inspection.service.AppInspectionGoodsService; import cn.iocoder.yudao.module.inspection.service.IInspectionNewsService; import cn.iocoder.yudao.module.inspection.vo.PartnerListVo; +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.annotation.Resource; @@ -41,9 +42,12 @@ public class AppHomeController extends BaseController { */ @GetMapping("/listSwiper") @TenantIgnore - public CommonResult listSwiper(AppSwiper appSwiper) + public CommonResult listSwiper(AppSwiper appSwiper, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = appSwiperService.selectAppSwiperList(appSwiper); + Page page = new Page<>(pageNum, pageSize); + IPage list = appSwiperService.selectAppSwiperList(page,appSwiper); return success(list); } @@ -66,11 +70,13 @@ public class AppHomeController extends BaseController { */ @GetMapping("/homePartner") @TenantIgnore - public TableDataInfo homePartner(Double longitude, Double latitude) + public CommonResult homePartner(Double longitude, Double latitude, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = shopInspectionGoodsService.homePartner(longitude,latitude); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = shopInspectionGoodsService.homePartner(page,longitude,latitude); + return success(list); } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppNewsController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppNewsController.java index 09a5009e..e30ee4f1 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppNewsController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppNewsController.java @@ -16,10 +16,11 @@ import cn.iocoder.yudao.module.system.service.dict.DictDataService; import cn.iocoder.yudao.module.system.service.permission.RoleService; import cn.iocoder.yudao.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + import com.github.pagehelper.PageHelper; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.inspection.entity.InspectionNews; import cn.iocoder.yudao.module.inspection.entity.InspectionNewsComment; import cn.iocoder.yudao.module.inspection.service.IInspectionNewsCommentService; @@ -105,22 +106,24 @@ public class AppNewsController extends BaseController { return success(list); } @GetMapping("/list") - public TableDataInfo list(InspectionNews inspectionNews,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize) + public CommonResult list(InspectionNews inspectionNews, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - List list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews); - return getDataTable(list); + IPage list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews); + return success(list); } @GetMapping("/ownList") - public TableDataInfo ownList(InspectionNews inspectionNews,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize) + public CommonResult ownList(InspectionNews inspectionNews,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize) { //当前登录用户 LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); inspectionNews.setCreator(loginUser.getId().toString()); Page page = new Page<>(pageNum, pageSize); - List list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews); - return getDataTable(list); + IPage list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews); + return success(list); } @PostMapping("/add") public CommonResult add(@RequestBody InspectionNews inspectionNews) throws Exception { @@ -263,25 +266,29 @@ public class AppNewsController extends BaseController { * @return */ @GetMapping("/getCommentList") - public TableDataInfo getCommentList(Long newsId) + public CommonResult getCommentList(Long newsId, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); + Page page = new Page<>(pageNum, pageSize); LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); queryWrapper.eq(InspectionNewsComment::getNewsId,newsId).orderByDesc(TenantBaseDO::getCreateTime); - List commentList = commentService.list(queryWrapper); - return getDataTable(commentList); + IPage commentList = commentService.page(page,queryWrapper); + return success(commentList); } /** * 我的收藏 * @return */ @GetMapping("/collectionNews") - public TableDataInfo collectionNews(String newsName) + public CommonResult collectionNews(String newsName, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List newsList = inspectionNewsService.collectionNews(newsName); - return getDataTable(newsList); + Page page = new Page<>(pageNum, pageSize); + IPage newsList = inspectionNewsService.collectionNews(page,newsName); + return success(newsList); } /** @@ -299,11 +306,13 @@ public class AppNewsController extends BaseController { * @return */ @GetMapping("/msgList") - public TableDataInfo msgList(Long partnerId,Integer pageNum,Integer pageSize) + public CommonResult msgList(Long partnerId, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - PageHelper.startPage(pageNum,pageSize); - List news = inspectionNewsService.msgList(partnerId); - return getDataTable(news); + Page page = new Page<>(pageNum, pageSize); + IPage news = inspectionNewsService.msgList(page,partnerId); + return success(news); } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppOrderController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppOrderController.java index 18700520..1bd62053 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppOrderController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppOrderController.java @@ -4,16 +4,14 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.payment.entity.OrderInfo; import cn.iocoder.yudao.module.payment.service.OrderInfoService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.inspection.entity.InspectionInfo; import cn.iocoder.yudao.module.inspection.service.AppInspectionOrderService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -27,10 +25,12 @@ public class AppOrderController extends BaseController { @GetMapping("/orderList") @TenantIgnore - public TableDataInfo orderList(String status, String title, Integer pageNum, Integer pageSize) { - PageHelper.startPage(pageNum, pageSize); - List orderInfos = orderInfoService.orderListApp(status, title, "jc"); - return getDataTable(orderInfos); + public CommonResult orderList(String status, String title, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + IPage orderInfos = orderInfoService.orderListApp(page, status, title, "jc"); + return success(orderInfos); } @GetMapping("/orderDetail") public CommonResult orderDetail(Long orderId) { @@ -39,10 +39,12 @@ public class AppOrderController extends BaseController { //获取检测的数据 @GetMapping("/inspectionList") @TenantIgnore - public TableDataInfo inspectionList(String status,Integer pageNum,Integer pageSize) { - PageHelper.startPage(pageNum,pageSize); - List inspectionInfos = appInspectionOrderService.inspectionList(status); - return getDataTable(inspectionInfos); + public CommonResult inspectionList(String status, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + IPage inspectionInfos = appInspectionOrderService.inspectionList(page,status); + return success(inspectionInfos); } //获取检测的详细信息 @@ -87,10 +89,12 @@ public class AppOrderController extends BaseController { //政府部门获取检测的数据 @GetMapping("/governmentInspectionList") - public TableDataInfo governmentInspectionList(String carNum,String status,String partnerId,Integer pageNum,Integer pageSize) { - PageHelper.startPage(pageNum,pageSize); - List inspectionInfos = appInspectionOrderService.governmentInspectionList(carNum,status,partnerId); - return getDataTable(inspectionInfos); + public CommonResult governmentInspectionList(String carNum,String status,String partnerId, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + IPage inspectionInfos = appInspectionOrderService.governmentInspectionList(page,carNum,status,partnerId); + return success(inspectionInfos); } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppPartnerController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppPartnerController.java index 6c10a3d7..adf500ec 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppPartnerController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppPartnerController.java @@ -6,12 +6,13 @@ import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.inspection.query.PartnerListQuery; import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService; import cn.iocoder.yudao.module.inspection.vo.PartnerListVo; import cn.iocoder.yudao.module.shop.entity.PartnerDetail; import cn.iocoder.yudao.module.shop.service.IPartnerDetailService; +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; @@ -29,11 +30,13 @@ public class AppPartnerController extends BaseController { */ @GetMapping("/list") @TenantIgnore - public TableDataInfo partnerList(PartnerListQuery partnerListQuery) + public CommonResult partnerList(PartnerListQuery partnerListQuery, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = partnerList.partnerList(partnerListQuery); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = partnerList.partnerList(page,partnerListQuery); + return success(list); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppUserOwnController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppUserOwnController.java index 5501085a..7f1496f7 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppUserOwnController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppUserOwnController.java @@ -7,9 +7,11 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.permission.PermissionService; import cn.iocoder.yudao.module.system.service.permission.RoleService; 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.github.pagehelper.PageHelper; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.inspection.service.AppUserOwnService; import cn.iocoder.yudao.module.shop.entity.ShopUserCar; import cn.iocoder.yudao.module.shop.service.IShopUserCarService; @@ -54,11 +56,13 @@ public class AppUserOwnController extends BaseController { } @GetMapping("/getDbList") - public TableDataInfo getDbList(String searchValue, Integer pageSize, Integer pageNum) + public CommonResult getDbList(String searchValue, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - PageHelper.startPage(pageNum,pageSize); - List dbList = ownService.getDbList(searchValue); - return getDataTable(dbList); + Page page = new Page<>(pageNum, pageSize); + IPage dbList = ownService.getDbListTow(page,searchValue); + return success(dbList); } @GetMapping(value = "/getAppUserCar") diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/DelInspectionInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/DelInspectionInfoController.java index c7262f8c..178d3ad1 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/DelInspectionInfoController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/DelInspectionInfoController.java @@ -7,18 +7,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.inspection.entity.DelInspectionInfo; import cn.iocoder.yudao.module.inspection.service.IDelInspectionInfoService; import cn.iocoder.yudao.util.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; /** * 【请填写功能名称】Controller @@ -38,11 +32,13 @@ public class DelInspectionInfoController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:info:list')") @GetMapping("/list") - public TableDataInfo list(DelInspectionInfo delInspectionInfo) + public CommonResult list(DelInspectionInfo delInspectionInfo, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = delInspectionInfoService.selectDelInspectionInfoList(delInspectionInfo); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = delInspectionInfoService.selectDelInspectionInfoList(page,delInspectionInfo); + return success(list); } /** @@ -50,11 +46,14 @@ public class DelInspectionInfoController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:info:export')") @PostMapping("/export") - public void export(HttpServletResponse response, DelInspectionInfo delInspectionInfo) + public void export(HttpServletResponse response, DelInspectionInfo delInspectionInfo, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = delInspectionInfoService.selectDelInspectionInfoList(delInspectionInfo); + Page page = new Page<>(pageNum, pageSize); + IPage list = delInspectionInfoService.selectDelInspectionInfoList(page,delInspectionInfo); ExcelUtil util = new ExcelUtil(DelInspectionInfo.class); - util.exportExcel(response, list, "【请填写功能名称】数据"); + util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionAppointmentController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionAppointmentController.java index 671c7d2b..bc61cdcc 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionAppointmentController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionAppointmentController.java @@ -8,11 +8,12 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.inspection.entity.InspectionAppointment; import cn.iocoder.yudao.module.inspection.service.IInspectionAppointmentService; import cn.iocoder.yudao.util.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; /** * 【请填写功能名称】Controller @@ -32,11 +33,13 @@ public class InspectionAppointmentController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:appointment:list')") @GetMapping("/list") - public TableDataInfo list(InspectionAppointment inspectionAppointment) + public CommonResult list(InspectionAppointment inspectionAppointment, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = inspectionAppointmentService.selectInspectionAppointmentList(inspectionAppointment); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionAppointmentService.selectInspectionAppointmentList(page,inspectionAppointment); + return success(list); } /** @@ -44,11 +47,14 @@ public class InspectionAppointmentController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:appointment:export')") @PostMapping("/export") - public void export(HttpServletResponse response, InspectionAppointment inspectionAppointment) + public void export(HttpServletResponse response, InspectionAppointment inspectionAppointment, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = inspectionAppointmentService.selectInspectionAppointmentList(inspectionAppointment); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionAppointmentService.selectInspectionAppointmentList(page,inspectionAppointment); ExcelUtil util = new ExcelUtil(InspectionAppointment.class); - util.exportExcel(response, list, "【请填写功能名称】数据"); + util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionCategoryTemplateController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionCategoryTemplateController.java index d251bac4..746d4777 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionCategoryTemplateController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionCategoryTemplateController.java @@ -5,22 +5,15 @@ import javax.servlet.http.HttpServletResponse; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.util.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import cn.iocoder.yudao.module.core.controller.BaseController; import cn.iocoder.yudao.module.inspection.entity.InspectionCategoryTemplate; import cn.iocoder.yudao.module.inspection.service.IInspectionCategoryTemplateService; -import cn.iocoder.yudao.module.core.page.TableDataInfo; - /** * 分类模版Controller * @@ -39,11 +32,13 @@ public class InspectionCategoryTemplateController extends BaseController */ @PreAuthorize("@ss.hasPermi('inspection:template:list')") @GetMapping("/list") - public TableDataInfo list(InspectionCategoryTemplate inspectionCategoryTemplate) + public CommonResult list(InspectionCategoryTemplate inspectionCategoryTemplate, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = inspectionCategoryTemplateService.selectInspectionCategoryTemplateList(inspectionCategoryTemplate); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionCategoryTemplateService.selectInspectionCategoryTemplateList(page,inspectionCategoryTemplate); + return success(list); } /** @@ -51,11 +46,14 @@ public class InspectionCategoryTemplateController extends BaseController */ @PreAuthorize("@ss.hasPermi('inspection:template:export')") @PostMapping("/export") - public void export(HttpServletResponse response, InspectionCategoryTemplate inspectionCategoryTemplate) + public void export(HttpServletResponse response, InspectionCategoryTemplate inspectionCategoryTemplate, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = inspectionCategoryTemplateService.selectInspectionCategoryTemplateList(inspectionCategoryTemplate); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionCategoryTemplateService.selectInspectionCategoryTemplateList(page,inspectionCategoryTemplate); ExcelUtil util = new ExcelUtil(InspectionCategoryTemplate.class); - util.exportExcel(response, list, "分类模版数据"); + util.exportExcel(response, list.getRecords(), "分类模版数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java index e3d691e3..39bfe0fc 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController; import cn.iocoder.yudao.module.core.controller.BaseController; import cn.iocoder.yudao.module.inspection.entity.InspectionEquInfo; import cn.iocoder.yudao.module.inspection.service.IInspectionEquInfoService; -import cn.iocoder.yudao.module.core.page.TableDataInfo; /** * equInfoController diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java index 8f350480..9767d4c9 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java @@ -7,17 +7,13 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService; import cn.iocoder.yudao.module.shop.entity.ShopMallPartners; import cn.iocoder.yudao.util.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.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import cn.iocoder.yudao.module.core.controller.BaseController; import cn.iocoder.yudao.module.inspection.entity.InspectionFile; import cn.iocoder.yudao.module.inspection.service.IInspectionFileService; -import cn.iocoder.yudao.module.core.page.TableDataInfo; /** * inspectionFileController @@ -38,23 +34,28 @@ public class InspectionFileController extends BaseController * 查询inspectionFile列表 */ @GetMapping("/list") - public TableDataInfo list(InspectionFile inspectionFile) throws Exception { + public CommonResult list(InspectionFile inspectionFile, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) throws Exception { ShopMallPartners partners = partnerService.shopInfoByUserId(); inspectionFile.setPartnerId(partners.getPartnerId()); - startPage(); - List list = inspectionFileService.selectInspectionFileList(inspectionFile); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionFileService.selectInspectionFileList(page,inspectionFile); + return success(list); } /** * 导出inspectionFile列表 */ @PostMapping("/export") - public void export(HttpServletResponse response, InspectionFile inspectionFile) + public void export(HttpServletResponse response, InspectionFile inspectionFile, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = inspectionFileService.selectInspectionFileList(inspectionFile); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionFileService.selectInspectionFileList(page,inspectionFile); ExcelUtil util = new ExcelUtil(InspectionFile.class); - util.exportExcel(response, list, "inspectionFile数据"); + util.exportExcel(response, list.getRecords(), "inspectionFile数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionGoodsSkuController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionGoodsSkuController.java index 3780ca18..b6b8b7d0 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionGoodsSkuController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionGoodsSkuController.java @@ -3,9 +3,10 @@ package cn.iocoder.yudao.module.inspection.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.inspection.entity.InspectionGoodsSku; import cn.iocoder.yudao.module.inspection.service.InspectionGoodsSkuService; +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 java.util.List; @@ -32,10 +33,12 @@ public class InspectionGoodsSkuController extends BaseController { * @return 所有数据 */ @GetMapping("/list") - public TableDataInfo selectAll(InspectionGoodsSku inspectionGoodsSku) { - startPage(); - List resList = this.inspectionGoodsSkuService.list(new QueryWrapper<>(inspectionGoodsSku)); - return getDataTable(resList); + public CommonResult selectAll(InspectionGoodsSku inspectionGoodsSku, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + IPage resList = this.inspectionGoodsSkuService.page(page,new QueryWrapper<>(inspectionGoodsSku)); + return success(resList); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java index f9fe9000..5fdb1769 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java @@ -7,11 +7,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.inspection.entity.InspectionInfo; import cn.iocoder.yudao.module.inspection.service.IInspectionInfoService; import cn.iocoder.yudao.util.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; /** * 【请填写功能名称】Controller @@ -31,11 +32,13 @@ public class InspectionInfoController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:info:list')") @GetMapping("/list") - public TableDataInfo list(InspectionInfo inspectionInfo) + public CommonResult list(InspectionInfo inspectionInfo, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = inspectionInfoService.selectInspectionInfoList(inspectionInfo); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionInfoService.selectInspectionInfoList(page,inspectionInfo); + return success(list); } /** @@ -43,11 +46,14 @@ public class InspectionInfoController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:info:export')") @PostMapping("/export") - public void export(HttpServletResponse response, InspectionInfo inspectionInfo) + public void export(HttpServletResponse response, InspectionInfo inspectionInfo, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = inspectionInfoService.selectInspectionInfoList(inspectionInfo); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionInfoService.selectInspectionInfoList(page,inspectionInfo); ExcelUtil util = new ExcelUtil(InspectionInfo.class); - util.exportExcel(response, list, "【请填写功能名称】数据"); + util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java index d7aeea84..1b1b752b 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java @@ -26,7 +26,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.util.StringUtils; import cn.iocoder.yudao.module.inspection.entity.InspectionInfo; import cn.iocoder.yudao.module.partner.entity.PartnerWorker; @@ -62,12 +61,14 @@ public class InspectionMallPartnersController extends BaseController { * 查询合作商管理列表 */ @GetMapping("/list") - public TableDataInfo list(ShopMallPartners shopMallPartners,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize) + public CommonResult list(ShopMallPartners shopMallPartners, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { shopMallPartners.setType("jc"); Page page = new Page<>(pageNum, pageSize); - List list = shopMallPartnersService.selectShopMallPartnersList(page,shopMallPartners); - return getDataTable(list); + IPage list = shopMallPartnersService.selectShopMallPartnersList(page,shopMallPartners); + return success(list); } @@ -75,13 +76,16 @@ public class InspectionMallPartnersController extends BaseController { * 查询合作商管理列表 */ @GetMapping("/listComment") - public TableDataInfo listComment(Long partnerId,Integer pageSize,Integer pageNum) + public CommonResult listComment(Long partnerId, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); queryWrapper.select(OrderInfo::getGoodsTitle,OrderInfo::getCommentDesc,OrderInfo::getCommentTime,OrderInfo::getCommentStar,OrderInfo::getRealName,OrderInfo::getId).eq(OrderInfo::getPartnerId,partnerId).orderByDesc(OrderInfo::getCommentTime).isNotNull(OrderInfo::getCommentTime); - PageHelper.startPage(pageNum,pageSize); - List list = orderInfoService.list(queryWrapper); - return getDataTable(list); + + IPage list = orderInfoService.page(page,queryWrapper); + return success(list); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsAssociationController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsAssociationController.java index e7f80bc2..0c849edb 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsAssociationController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsAssociationController.java @@ -7,18 +7,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation; import cn.iocoder.yudao.module.inspection.service.IInspectionNewsAssociationService; import cn.iocoder.yudao.util.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; /** * 【请填写功能名称】Controller @@ -38,11 +32,13 @@ public class InspectionNewsAssociationController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:association:list')") @GetMapping("/list") - public TableDataInfo list(InspectionNewsAssociation inspectionNewsAssociation) + public CommonResult list(InspectionNewsAssociation inspectionNewsAssociation, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = inspectionNewsAssociationService.selectInspectionNewsAssociationList(inspectionNewsAssociation); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionNewsAssociationService.selectInspectionNewsAssociationList(page,inspectionNewsAssociation); + return success(list); } /** @@ -50,11 +46,14 @@ public class InspectionNewsAssociationController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:association:export')") @PostMapping("/export") - public void export(HttpServletResponse response, InspectionNewsAssociation inspectionNewsAssociation) + public void export(HttpServletResponse response, InspectionNewsAssociation inspectionNewsAssociation, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = inspectionNewsAssociationService.selectInspectionNewsAssociationList(inspectionNewsAssociation); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionNewsAssociationService.selectInspectionNewsAssociationList(page,inspectionNewsAssociation); ExcelUtil util = new ExcelUtil(InspectionNewsAssociation.class); - util.exportExcel(response, list, "【请填写功能名称】数据"); + util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsCommentController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsCommentController.java index ce920d09..0565627d 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsCommentController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsCommentController.java @@ -7,18 +7,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.inspection.entity.InspectionNewsComment; import cn.iocoder.yudao.module.inspection.service.IInspectionNewsCommentService; import cn.iocoder.yudao.util.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; /** * 【请填写功能名称】Controller @@ -38,11 +32,13 @@ public class InspectionNewsCommentController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:comment:list')") @GetMapping("/list") - public TableDataInfo list(InspectionNewsComment inspectionNewsComment) + public CommonResult list(InspectionNewsComment inspectionNewsComment, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = inspectionNewsCommentService.selectInspectionNewsCommentList(inspectionNewsComment); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionNewsCommentService.selectInspectionNewsCommentList(page,inspectionNewsComment); + return success(list); } /** @@ -50,11 +46,14 @@ public class InspectionNewsCommentController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:comment:export')") @PostMapping("/export") - public void export(HttpServletResponse response, InspectionNewsComment inspectionNewsComment) + public void export(HttpServletResponse response, InspectionNewsComment inspectionNewsComment, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = inspectionNewsCommentService.selectInspectionNewsCommentList(inspectionNewsComment); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionNewsCommentService.selectInspectionNewsCommentList(page,inspectionNewsComment); ExcelUtil util = new ExcelUtil(InspectionNewsComment.class); - util.exportExcel(response, list, "【请填写功能名称】数据"); + util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsController.java index d383bd02..3189f748 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsController.java @@ -6,12 +6,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.inspection.entity.InspectionNews; import cn.iocoder.yudao.module.inspection.service.IInspectionNewsService; import cn.iocoder.yudao.module.shop.entity.ShopMallPartners; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; /** * 【请填写功能名称】Controller @@ -31,11 +31,13 @@ public class InspectionNewsController extends BaseController */ // @PreAuthorize("@ss.hasPermi('system:news:list')") @GetMapping("/list") - public TableDataInfo list(InspectionNews inspectionNews,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize) + public CommonResult list(InspectionNews inspectionNews, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - List list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews); - return getDataTable(list); + IPage list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews); + return success(list); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionPickCarController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionPickCarController.java index d8641587..fdb6f246 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionPickCarController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionPickCarController.java @@ -5,20 +5,14 @@ import javax.servlet.http.HttpServletResponse; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.util.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import cn.iocoder.yudao.module.core.controller.BaseController; import cn.iocoder.yudao.module.inspection.entity.InspectionPickCar; import cn.iocoder.yudao.module.inspection.service.IInspectionPickCarService; -import cn.iocoder.yudao.module.core.page.TableDataInfo; /** * 上门取车服务Controller @@ -38,11 +32,13 @@ public class InspectionPickCarController extends BaseController */ @PreAuthorize("@ss.hasPermi('inspection:pickCar:list')") @GetMapping("/list") - public TableDataInfo list(InspectionPickCar inspectionPickCar) + public CommonResult list(InspectionPickCar inspectionPickCar, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = inspectionPickCarService.selectInspectionPickCarList(inspectionPickCar); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionPickCarService.selectInspectionPickCarList(page,inspectionPickCar); + return success(list); } /** @@ -50,11 +46,14 @@ public class InspectionPickCarController extends BaseController */ @PreAuthorize("@ss.hasPermi('inspection:pickCar:export')") @PostMapping("/export") - public void export(HttpServletResponse response, InspectionPickCar inspectionPickCar) + public void export(HttpServletResponse response, InspectionPickCar inspectionPickCar, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = inspectionPickCarService.selectInspectionPickCarList(inspectionPickCar); + Page page = new Page<>(pageNum, pageSize); + IPage list = inspectionPickCarService.selectInspectionPickCarList(page,inspectionPickCar); ExcelUtil util = new ExcelUtil(InspectionPickCar.class); - util.exportExcel(response, list, "上门取车服务数据"); + util.exportExcel(response, list.getRecords(), "上门取车服务数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java index ec92bbe3..dafcecf8 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java @@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.inspection.entity.*; import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService; import cn.iocoder.yudao.module.inspection.vo.GoodsVo; @@ -173,16 +172,18 @@ public class PartnerOwnController extends BaseController { * 商品管理列表 */ @GetMapping("/goodsList") - public TableDataInfo goodsList(Long partnerId,String isListing,String goodsTitle,Integer pageNum,Integer pageSize) + public CommonResult goodsList(Long partnerId,String isListing,String goodsTitle, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { LoginUser user = SecurityFrameworkUtils.getLoginUser(); ShopMallPartners partners = partnerList.getById(partnerId); if (!partners.getUserId().equals(user.getId())){ return null; } - PageHelper.startPage(pageNum, pageSize); - List list = partnerList.goodsList(partnerId, isListing, goodsTitle); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = partnerList.goodsList(page,partnerId, isListing, goodsTitle); + return success(list); } /** * 商品管理列表 @@ -267,25 +268,30 @@ public class PartnerOwnController extends BaseController { * 店铺账户信息 */ @GetMapping("/accountDetail") - public TableDataInfo accountDetail(Long partnerId, Integer pageNum, Integer pageSize) + public CommonResult accountDetail(Long partnerId, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List details = partnerList.accountDetail(partnerId,pageNum,pageSize); - return getDataTable(details); + Page page = new Page<>(pageNum, pageSize); + IPage details = partnerList.accountDetail(page,partnerId,pageNum,pageSize); + return success(details); } /** * 当前店铺的订单信息 */ @GetMapping("/orderList") - public TableDataInfo orderList(Long partnerId,String phoneNum, String title, Integer pageNum, Integer pageSize) + public CommonResult orderList(Long partnerId,String phoneNum, String title, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { LoginUser user = SecurityFrameworkUtils.getLoginUser(); ShopMallPartners partnersTmp = partnerList.getById(partnerId); if (!partnersTmp.getUserId().equals(user.getId())){ return null; } - PageHelper.startPage(pageNum, pageSize); - List orderInfos = partnerList.orderList(partnerId,phoneNum, title); - return getDataTable(orderInfos); + Page page = new Page<>(pageNum, pageSize); + IPage orderInfos = partnerList.orderList(page,partnerId,phoneNum, title); + return success(orderInfos); } /** * 通过核销码获取订单信息 @@ -430,15 +436,17 @@ public class PartnerOwnController extends BaseController { // 核销记录By核销人Id @GetMapping("/validationList") - public TableDataInfo validationList(Long partnerId,String searchValue,Integer pageNum,Integer pageSize) { + public CommonResult validationList(Long partnerId,String searchValue, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { LoginUser user = SecurityFrameworkUtils.getLoginUser(); ShopMallPartners partnersTmp = partnerList.getById(partnerId); if (!partnersTmp.getUserId().equals(user.getId())){ return null; } - PageHelper.startPage(pageNum,pageSize); - List orderInfos = partnerList.validationList(partnerId,searchValue); - return getDataTable(orderInfos); + Page page = new Page<>(pageNum, pageSize); + IPage orderInfos = partnerList.validationList(page,partnerId,searchValue); + return success(orderInfos); } //送券功能 @@ -450,15 +458,17 @@ public class PartnerOwnController extends BaseController { //优惠券列表 @GetMapping("/listCoupon") - public TableDataInfo listCoupon(Long partnerId,String searchValue,Integer pageNum,Integer pageSize){ + public CommonResult listCoupon(Long partnerId,String searchValue, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize){ LoginUser user = SecurityFrameworkUtils.getLoginUser(); ShopMallPartners partnersTmp = partnerList.getById(partnerId); if (!partnersTmp.getUserId().equals(user.getId())){ - return getDataTable(new ArrayList<>()); + return success(new ArrayList<>()); } - PageHelper.startPage(pageNum,pageSize); - List shopCouponTemplates = partnerList.listCoupon(partnerId, searchValue); - return getDataTable(shopCouponTemplates); + Page page = new Page<>(pageNum, pageSize); + IPage shopCouponTemplates = partnerList.listCoupon(page,partnerId, searchValue); + return success(shopCouponTemplates); } //删除优惠券 @PostMapping("/delCoupon") @@ -476,7 +486,9 @@ public class PartnerOwnController extends BaseController { //获取上门取车数据 @GetMapping("/getPickCarListOfWorker") - public TableDataInfo getPickCarListOfWorker(Long partnerId,String phoneNum,Integer pageSize,Integer pageNum) { + public CommonResult getPickCarListOfWorker(Long partnerId,String phoneNum, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { LoginUser user = SecurityFrameworkUtils.getLoginUser(); LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); queryWrapper.eq(PartnerWorker::getUserId,user.getId()).eq(PartnerWorker::getPartnerId,partnerId); @@ -484,9 +496,9 @@ public class PartnerOwnController extends BaseController { if (ObjectUtil.isEmpty(worker)){ return null; } - PageHelper.startPage(pageNum,pageSize); - List pickCarList = partnerList.getPickCarListOfWorker(worker.getId(),phoneNum); - return getDataTable(pickCarList); + Page page = new Page<>(pageNum, pageSize); + IPage pickCarList = partnerList.getPickCarListOfWorker(page,worker.getId(),phoneNum); + return success(pickCarList); } //获取客户来源 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionCategoryController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionCategoryController.java index ca1fbd34..ef0654b0 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionCategoryController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionCategoryController.java @@ -4,11 +4,11 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.inspection.entity.ShopInspectionCategory; import cn.iocoder.yudao.module.inspection.service.ShopInspectionCategoryService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.*; + import javax.annotation.Resource; import java.util.List; diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionGoodsController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionGoodsController.java index c8ff1d90..878063bd 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionGoodsController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionGoodsController.java @@ -23,7 +23,6 @@ import cn.iocoder.yudao.module.payment.entity.OrderInfo; import cn.iocoder.yudao.module.shop.entity.ShopMallPartners; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.ObjectUtils; import org.springframework.context.annotation.Lazy; import org.springframework.security.access.prepost.PreAuthorize; @@ -32,7 +31,7 @@ import org.springframework.web.bind.annotation.*; import cn.iocoder.yudao.module.core.controller.BaseController; import cn.iocoder.yudao.module.inspection.entity.ShopInspectionGoods; import cn.iocoder.yudao.module.inspection.service.IShopInspectionGoodsService; -import cn.iocoder.yudao.module.core.page.TableDataInfo; + /** * 检测商品Controller @@ -63,23 +62,27 @@ public class ShopInspectionGoodsController extends BaseController */ // @PreAuthorize("@ss.hasPermi('system:inspectionGoods:list')") @GetMapping("/listSystem") - public TableDataInfo listSystem(ShopInspectionGoods shopInspectionGoods,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize) + public CommonResult listSystem(ShopInspectionGoods shopInspectionGoods, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - List list = shopInspectionGoodsService.listSystem(page,shopInspectionGoods); - return getDataTable(list); + IPage list = shopInspectionGoodsService.listSystem(page,shopInspectionGoods); + return success(list); } /** * 查询检测商品列表 */ @GetMapping("/listPartnerGoods") - public TableDataInfo listPartnerGoods(ShopInspectionGoods shopInspectionGoods) throws Exception { + public CommonResult listPartnerGoods(ShopInspectionGoods shopInspectionGoods, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) throws Exception { ShopMallPartners one = appInspectionPartnerService.shopInfoByUserId(); shopInspectionGoods.setPartnerId(one.getPartnerId().intValue()); - startPage(); - List list = shopInspectionGoodsService.listPartnerGoods(shopInspectionGoods); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = shopInspectionGoodsService.listPartnerGoods(page,shopInspectionGoods); + return success(list); } /** @@ -256,11 +259,13 @@ public class ShopInspectionGoodsController extends BaseController } @GetMapping("/listWx") - public TableDataInfo listWx(ShopInspectionGoods shopInspectionGoods) + public CommonResult listWx(ShopInspectionGoods shopInspectionGoods, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = shopInspectionGoodsService.selectShopInspectionGoodsListWx(shopInspectionGoods); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = shopInspectionGoodsService.selectShopInspectionGoodsListWx(page,shopInspectionGoods); + return success(list); } /** * 获取检测商品详细信息 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/SiteInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/SiteInfoController.java index 38cae4b0..cea906c1 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/SiteInfoController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/SiteInfoController.java @@ -11,6 +11,7 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.inspection.entity.NweUsers; import cn.iocoder.yudao.util.ExcelUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.BeanUtils; import org.springframework.security.access.prepost.PreAuthorize; @@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.*; import cn.iocoder.yudao.module.core.controller.BaseController; import cn.iocoder.yudao.module.inspection.entity.SiteInfo; import cn.iocoder.yudao.module.inspection.service.ISiteInfoService; -import cn.iocoder.yudao.module.core.page.TableDataInfo; + /** * inspectionController @@ -39,11 +40,11 @@ public class SiteInfoController extends BaseController */ @GetMapping("/list") @TenantIgnore - public TableDataInfo list(SiteInfo siteInfo, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize) + public CommonResult list(SiteInfo siteInfo, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - List list = siteInfoService.selectSiteInfoList(page,siteInfo); - return getDataTable(list); + IPage list = siteInfoService.selectSiteInfoList(page,siteInfo); + return success(list); } /** @@ -51,12 +52,14 @@ public class SiteInfoController extends BaseController */ @PreAuthorize("@ss.hasPermi('inspection:info:export')") @PostMapping("/export") - public void export(HttpServletResponse response, SiteInfo siteInfo) + public void export(HttpServletResponse response, SiteInfo siteInfo, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { Page page = new Page<>(); - List list = siteInfoService.selectSiteInfoList(page,siteInfo); + IPage list = siteInfoService.selectSiteInfoList(page,siteInfo); ExcelUtil util = new ExcelUtil(SiteInfo.class); - util.exportExcel(response, list, "inspection数据"); + util.exportExcel(response, list.getRecords(), "inspection数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionGoodsMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionGoodsMapper.java index 46504532..b175b37d 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionGoodsMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionGoodsMapper.java @@ -6,6 +6,8 @@ import cn.iocoder.yudao.module.inspection.query.GoodsQuery; import cn.iocoder.yudao.module.inspection.vo.GoodsVo; import cn.iocoder.yudao.module.inspection.vo.HomeGoodsVo; import cn.iocoder.yudao.module.inspection.vo.PartnerListVo; +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; @@ -19,7 +21,7 @@ import java.util.List; */ @Mapper public interface AppInspectionGoodsMapper extends BaseMapper { - List homePartners(@Param("longitude") Double longitude, @Param("latitude")Double latitude); + IPage homePartners(Page page, @Param("longitude") Double longitude, @Param("latitude")Double latitude); List goodsList(GoodsQuery goodsQuery); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java index 61e2716d..a6b4266e 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java @@ -20,7 +20,7 @@ import java.util.Map; @Mapper public interface AppInspectionPartnerMapper extends BaseMapper { ShopMallPartners selectById(@Param("id") Long id); - List partnerList(PartnerListQuery partnerListQuery); + IPage partnerList(Page page, @Param("vo") PartnerListQuery partnerListQuery); PartnerListVo shopDetail(PartnerListQuery partnerListQuery); void addSalesNum(@Param("partnerId") Long partnerId); StatisticsInfo workNum(@Param("partnerId") Long partnerId,@Param("timeStr") String timeStr); @@ -32,15 +32,15 @@ public interface AppInspectionPartnerMapper extends BaseMapper Integer allAmount(@Param("partnerId") Long partnerId); Integer todayAmount(@Param("partnerId") Long partnerId,@Param("timeStr") String timeStr); List hotGoodsList(@Param("partnerId") Long partnerId,@Param("dateStr")String dateStr); - List manageGoodsList(@Param("partnerId") Long partnerId, @Param("isListing")String isListing,@Param("goodsTitle") String goodsTitle); - List orderList(@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum,@Param("title") String title); + IPage manageGoodsList(Page page,@Param("partnerId") Long partnerId, @Param("isListing")String isListing,@Param("goodsTitle") String goodsTitle); + IPage orderList(Page page,@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum,@Param("title") String title); List getWorkList(@Param("partnerId")Long partnerId, @Param("postId") Long postId, @Param("workName") String workName, @Param("phoneNum")String phoneNum); IPage pageWorkList(@Param("partnerId")Long partnerId, @Param("postId") Long postId, @Param("workName") String workName, @Param("phoneNum")String phoneNum,Page page); IPage inspectionList(Page page,@Param("partnerId")Long partnerId, @Param("status") String status, @Param("carNum")String carNum); List workerInspectionList(@Param("workerId")Long workerId,@Param("status") String status, @Param("searchValue")String searchValue); - List validationList(@Param("partnerId") Long partnerId, @Param("searchValue") String searchValue); + IPage validationList(Page page, @Param("partnerId") Long partnerId, @Param("searchValue") String searchValue); IPage getPickCarList(Page page,@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum, @Param("pickStatus") String pickStatus); - List getPickCarListOfWorker(@Param("workerId") Long workerId, @Param("phoneNum") String phoneNum); + IPage getPickCarListOfWorker(Page page,@Param("workerId") Long workerId, @Param("phoneNum") String phoneNum); List chartInfoAmount(@Param("startTime") String startTime,@Param("endTime")String endTime,@Param("partnerId")Long partnerId); List chartInfoNum(@Param("startTime") String startTime,@Param("endTime")String endTime,@Param("partnerId")Long partnerId); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/DelInspectionInfoMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/DelInspectionInfoMapper.java index 09dfed26..d839b03c 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/DelInspectionInfoMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/DelInspectionInfoMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.inspection.mapper; import cn.iocoder.yudao.module.inspection.entity.DelInspectionInfo; +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 DelInspectionInfoMapper * @param delInspectionInfo 【请填写功能名称】 * @return 【请填写功能名称】集合 */ - public List selectDelInspectionInfoList(DelInspectionInfo delInspectionInfo); + public IPage selectDelInspectionInfoList(Page page,@Param("vo") DelInspectionInfo delInspectionInfo); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionAppointmentMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionAppointmentMapper.java index ca85cfa0..d85ceae2 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionAppointmentMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionAppointmentMapper.java @@ -32,7 +32,7 @@ public interface InspectionAppointmentMapper extends BaseMapper selectInspectionAppointmentList(InspectionAppointment inspectionAppointment); + public IPage selectInspectionAppointmentList(Page page, @Param("vo") InspectionAppointment inspectionAppointment); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionCategoryTemplateMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionCategoryTemplateMapper.java index 9dbac8a8..ce722bc7 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionCategoryTemplateMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionCategoryTemplateMapper.java @@ -5,7 +5,10 @@ import java.util.List; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.inspection.entity.InspectionCategoryTemplate; +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; /** * 分类模版Mapper接口 @@ -30,7 +33,7 @@ public interface InspectionCategoryTemplateMapper extends BaseMapperX selectInspectionCategoryTemplateList(InspectionCategoryTemplate inspectionCategoryTemplate); + public IPage selectInspectionCategoryTemplateList(Page page, @Param("vo") InspectionCategoryTemplate inspectionCategoryTemplate); /** * 新增分类模版 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionFileMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionFileMapper.java index e009905b..5ab67b67 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionFileMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionFileMapper.java @@ -4,7 +4,10 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.inspection.entity.InspectionFile; +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; /** * inspectionFileMapper接口 @@ -29,6 +32,6 @@ public interface InspectionFileMapper extends BaseMapper * @param inspectionFile inspectionFile * @return inspectionFile集合 */ - public List selectInspectionFileList(InspectionFile inspectionFile); + public IPage selectInspectionFileList(Page page, @Param("vo") InspectionFile inspectionFile); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionInfoMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionInfoMapper.java index 2a24ff63..4bf9c11b 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionInfoMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionInfoMapper.java @@ -34,7 +34,7 @@ public interface InspectionInfoMapper extends BaseMapper * @param inspectionInfo 【请填写功能名称】 * @return 【请填写功能名称】集合 */ - public List selectInspectionInfoList(InspectionInfo inspectionInfo); + public IPage selectInspectionInfoList(Page page,@Param("vo") InspectionInfo inspectionInfo); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsAssociationMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsAssociationMapper.java index 14aaf238..33a16511 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsAssociationMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsAssociationMapper.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.inspection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation; +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 InspectionNewsAssociationMapper extends BaseMapper selectInspectionNewsAssociationList(InspectionNewsAssociation inspectionNewsAssociation); + public IPage selectInspectionNewsAssociationList(Page page, @Param("vo") InspectionNewsAssociation inspectionNewsAssociation); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsCommentMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsCommentMapper.java index 867e60ec..c8ae4a8d 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsCommentMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsCommentMapper.java @@ -5,7 +5,10 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation; import cn.iocoder.yudao.module.inspection.entity.InspectionNewsComment; +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; /** @@ -31,7 +34,7 @@ public interface InspectionNewsCommentMapper extends BaseMapper selectInspectionNewsCommentList(InspectionNewsComment inspectionNewsComment); + public IPage selectInspectionNewsCommentList(Page page, @Param("vo") InspectionNewsComment inspectionNewsComment); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsMapper.java index 9f3ba59d..f33bfb8a 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsMapper.java @@ -2,7 +2,9 @@ package cn.iocoder.yudao.module.inspection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.inspection.entity.InspectionNews; +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; @@ -31,7 +33,7 @@ public interface InspectionNewsMapper extends BaseMapper * @param inspectionNews 【请填写功能名称】 * @return 【请填写功能名称】集合 */ - public List selectInspectionNewsList(Page page, @Param("vo") InspectionNews inspectionNews); + public IPage selectInspectionNewsList(Page page, @Param("vo") InspectionNews inspectionNews); /** * 新增【请填写功能名称】 @@ -77,8 +79,8 @@ public interface InspectionNewsMapper extends BaseMapper //新增阅读数量 void addReadNum(Long id); - List collectionNews(@Param("userId") Long userId,@Param("newsName")String newsName); + IPage collectionNews(Page page, @Param("userId") Long userId,@Param("newsName")String newsName); Integer newMsgNum(@Param("partnerId") Long partnerId); - List msgList(@Param("partnerId") Long partnerId); + IPage msgList(Page page, @Param("partnerId") Long partnerId); List listGfClass(@Param("type") String type); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionPickCarMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionPickCarMapper.java index 80a84e23..97112f27 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionPickCarMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionPickCarMapper.java @@ -4,7 +4,10 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.inspection.entity.InspectionPickCar; +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; /** * 上门取车服务Mapper接口 @@ -29,7 +32,7 @@ public interface InspectionPickCarMapper extends BaseMapper * @param inspectionPickCar 上门取车服务 * @return 上门取车服务集合 */ - public List selectInspectionPickCarList(InspectionPickCar inspectionPickCar); + public IPage selectInspectionPickCarList(Page page, @Param("vo") InspectionPickCar inspectionPickCar); /** * 新增上门取车服务 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/ShopInspectionGoodsMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/ShopInspectionGoodsMapper.java index d6af7b5a..4f3ee1c3 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/ShopInspectionGoodsMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/ShopInspectionGoodsMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.inspection.entity.ShopInspectionGoods; +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; @@ -31,10 +32,10 @@ public interface ShopInspectionGoodsMapper extends BaseMapper selectShopInspectionGoodsListWx(ShopInspectionGoods shopInspectionGoods); + public IPage selectShopInspectionGoodsListWx(Page page,@Param("vo") ShopInspectionGoods shopInspectionGoods); - List listSystem(Page page,@Param("vo") ShopInspectionGoods shopInspectionGoods); - List listPartnerGoods(ShopInspectionGoods shopInspectionGoods); + IPage listSystem(Page page,@Param("vo") ShopInspectionGoods shopInspectionGoods); + IPage listPartnerGoods(Page page,@Param("vo") ShopInspectionGoods shopInspectionGoods); int deleteByList(List list); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/SiteInfoMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/SiteInfoMapper.java index 9d7b0e0b..553720af 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/SiteInfoMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/SiteInfoMapper.java @@ -5,6 +5,7 @@ import java.util.List; import cn.iocoder.yudao.module.inspection.entity.NweUsers; import cn.iocoder.yudao.module.inspection.entity.SiteInfo; import com.alibaba.fastjson.JSONObject; +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; @@ -32,7 +33,7 @@ public interface SiteInfoMapper * @param siteInfo inspection * @return inspection集合 */ - public List selectSiteInfoList(Page page,@Param("vo") SiteInfo siteInfo); + public IPage selectSiteInfoList(Page page, @Param("vo") SiteInfo siteInfo); /** * 新增inspection diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionGoodsService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionGoodsService.java index 85cf7cb6..a1a65ffa 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionGoodsService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionGoodsService.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.inspection.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.inspection.entity.InspectionGoodsSku; import cn.iocoder.yudao.module.inspection.entity.ShopInspectionCategory; @@ -17,7 +19,7 @@ import java.util.List; */ public interface AppInspectionGoodsService extends IService { - List homePartner(Double longitude, Double latitude); + IPage homePartner(Page page, Double longitude, Double latitude); List categoryList(); List goodsList(GoodsQuery goodsQuery); GoodsDetail goodsDetail(GoodsQuery goodsQuery); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionOrderService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionOrderService.java index b6fb40ee..794ccdac 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionOrderService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionOrderService.java @@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.inspection.vo.InspectionInfoVo; import cn.iocoder.yudao.module.inspection.vo.OrderAppDetail; import cn.iocoder.yudao.module.payment.entity.OrderInfo; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -15,7 +17,7 @@ import java.util.List; public interface AppInspectionOrderService extends IService { OrderAppDetail orderDetailApp(Long orderId); - List inspectionList(String status); + IPage inspectionList(Page page, String status); InspectionInfoVo inspectionDetail(Long inspectionInfoId); JSONObject statisticsTop(); List statisticsMid(); @@ -23,7 +25,7 @@ public interface AppInspectionOrderService extends IService { List statisticsOrder(); List getPartnerList(String partnerName); - List governmentInspectionList(String carNum,String status,String partnerId); + IPage governmentInspectionList(Page page, String carNum,String status,String partnerId); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java index d6efc30b..af262fe6 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java @@ -21,7 +21,7 @@ import java.util.Map; public interface AppInspectionPartnerService extends IService { - List partnerList(PartnerListQuery partnerListQuery); + IPage partnerList(Page page, PartnerListQuery partnerListQuery); List categoryList(Long partnerId); PartnerListVo shopDetail(PartnerListQuery partnerListQuery); void addSalesNum(Long partnerId); @@ -46,7 +46,7 @@ public interface AppInspectionPartnerService extends IService List orderInfo(Long partnerId); List hotGoodsList(Long partnerId); void addGoods(ShopInspectionGoods goods) throws Exception; - List goodsList(Long partnerId, String isListing, String goodsTitle); + IPage goodsList(Page page,Long partnerId, String isListing, String goodsTitle); List canUseGoods(Long partnerId); ShopInspectionGoods goodsDetail(Long goodsId); void editGoods(ShopInspectionGoods goods) throws Exception; @@ -57,8 +57,8 @@ public interface AppInspectionPartnerService extends IService void editPartnerInfo(ShopMallPartners partners); PartnerVo getPartnerInfo(Long partnerId); PartnerBalance accountInfo(Long partnerId); - List accountDetail(Long partnerId, Integer pageNum, Integer pageSize); - List orderList(Long partnerId,String phoneNum, String title); + IPage accountDetail(Page page,Long partnerId, Integer pageNum, Integer pageSize); + IPage orderList(Page page,Long partnerId,String phoneNum, String title); OrderAppDetail orderDetail(Long partnerId,Long orderId); Long orderDetailByCode(Long partnerId,String code) throws Exception; void takeOut(Long partnerId,Long orderId,Long workId,String carNum) throws Exception; @@ -77,14 +77,14 @@ public interface AppInspectionPartnerService extends IService void stopInspection(InspectionInfo info) throws Exception; void makeCertOk(Long inspectionId); IPage getAppointmentList(Page page,Long partnerId,String phoneNum); - List validationList(Long partnerId,String searchValue); + IPage validationList(Page page,Long partnerId,String searchValue); void sendCoupon(ShopCouponTemplate template) throws Exception; - List listCoupon(Long partnerId,String searchValue); + IPage listCoupon(Page page,Long partnerId,String searchValue); void delCoupon(Long partnerId,Long id); void designatePickCarWorker(Long pickCarId,Long workerId); IPage getPickCarList(Page page,Long partnerId, String phoneNum,String pickStatus); InspectionPickCar getPickCarDetail(Long dataId); - List getPickCarListOfWorker(Long workerId, String phoneNum); + IPage getPickCarListOfWorker(Page page,Long workerId, String phoneNum); JSONObject vehicleLicenseOCR(String imagePath) throws Exception; void offlineCharging(InspectionInfoVo infoVo); String workOrderView(Long inspectionId); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppUserOwnService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppUserOwnService.java index 4880c9de..24870ee3 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppUserOwnService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppUserOwnService.java @@ -2,13 +2,17 @@ package cn.iocoder.yudao.module.inspection.service; import cn.iocoder.yudao.module.shop.entity.ShopUserCar; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + import java.util.List; public interface AppUserOwnService { void updateRole(String roleCode); List getCars(); List getCanInspectionCars(); - List getDbList(String searchValue); + List getDbList(Page page, String searchValue); + IPage getDbListTow(Page page, String searchValue); List getAppUserCar(); void userCarWarn(); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IDelInspectionInfoService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IDelInspectionInfoService.java index 23eebbc9..02e3207c 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IDelInspectionInfoService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IDelInspectionInfoService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.inspection.service; import cn.iocoder.yudao.module.inspection.entity.DelInspectionInfo; +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 IDelInspectionInfoService * @param delInspectionInfo 【请填写功能名称】 * @return 【请填写功能名称】集合 */ - public List selectDelInspectionInfoList(DelInspectionInfo delInspectionInfo); + public IPage selectDelInspectionInfoList(Page page, DelInspectionInfo delInspectionInfo); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionAppointmentService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionAppointmentService.java index 88f040c9..3d851b80 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionAppointmentService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionAppointmentService.java @@ -31,7 +31,7 @@ public interface IInspectionAppointmentService extends IService selectInspectionAppointmentList(InspectionAppointment inspectionAppointment); + public IPage selectInspectionAppointmentList(Page page, InspectionAppointment inspectionAppointment); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionCategoryTemplateService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionCategoryTemplateService.java index c0936c06..4266aa12 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionCategoryTemplateService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionCategoryTemplateService.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.inspection.service; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.inspection.entity.InspectionCategoryTemplate; @@ -27,7 +29,7 @@ public interface IInspectionCategoryTemplateService extends IService selectInspectionCategoryTemplateList(InspectionCategoryTemplate inspectionCategoryTemplate); + public IPage selectInspectionCategoryTemplateList(Page page, InspectionCategoryTemplate inspectionCategoryTemplate); /** * 新增分类模版 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionFileService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionFileService.java index bc925106..5edcff69 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionFileService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionFileService.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.inspection.service; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.inspection.entity.InspectionFile; @@ -27,7 +29,7 @@ public interface IInspectionFileService extends IService * @param inspectionFile inspectionFile * @return inspectionFile集合 */ - public List selectInspectionFileList(InspectionFile inspectionFile); + public IPage selectInspectionFileList(Page page, InspectionFile inspectionFile); /** * 新增inspectionFile diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java index 335dd5b4..2f219ee3 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java @@ -30,7 +30,7 @@ public interface IInspectionInfoService extends IService * @param inspectionInfo 【请填写功能名称】 * @return 【请填写功能名称】集合 */ - public List selectInspectionInfoList(InspectionInfo inspectionInfo); + public IPage selectInspectionInfoList(Page page, InspectionInfo inspectionInfo); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsAssociationService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsAssociationService.java index c7b35678..a517bb66 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsAssociationService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsAssociationService.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.inspection.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.inspection.entity.InspectionNews; import cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation; @@ -29,7 +31,7 @@ public interface IInspectionNewsAssociationService extends IService selectInspectionNewsAssociationList(InspectionNewsAssociation inspectionNewsAssociation); + public IPage selectInspectionNewsAssociationList(Page page, InspectionNewsAssociation inspectionNewsAssociation); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsCommentService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsCommentService.java index 9930441a..25139adf 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsCommentService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsCommentService.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.inspection.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.inspection.entity.InspectionNewsComment; @@ -27,7 +29,7 @@ public interface IInspectionNewsCommentService extends IService selectInspectionNewsCommentList(InspectionNewsComment inspectionNewsComment); + public IPage selectInspectionNewsCommentList(Page page, InspectionNewsComment inspectionNewsComment); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsService.java index b0a5d48d..08520f12 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.inspection.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.inspection.entity.InspectionNews; import cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation; import cn.iocoder.yudao.module.inspection.entity.InspectionNewsComment; + import java.util.List; /** @@ -30,7 +32,7 @@ public interface IInspectionNewsService extends IService * @param inspectionNews 【请填写功能名称】 * @return 【请填写功能名称】集合 */ - public List selectInspectionNewsList(Page page,InspectionNews inspectionNews); + public IPage selectInspectionNewsList(Page page, InspectionNews inspectionNews); List appHomeNewsList(); List listGfClass(String type); @@ -84,8 +86,8 @@ public interface IInspectionNewsService extends IService void addReadNum(Long id,Long objectId); InspectionNews getDetail(Long newsId); - List collectionNews(String newsName); + IPage collectionNews(Page page, String newsName); Integer newMsgNum(Long partnerId); - List msgList(Long partnerId); + IPage msgList(Page page, Long partnerId); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionPickCarService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionPickCarService.java index 05c8c12d..025ff1e8 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionPickCarService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionPickCarService.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.inspection.service; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.inspection.entity.InspectionPickCar; @@ -27,7 +29,7 @@ public interface IInspectionPickCarService extends IService * @param inspectionPickCar 上门取车服务 * @return 上门取车服务集合 */ - public List selectInspectionPickCarList(InspectionPickCar inspectionPickCar); + public IPage selectInspectionPickCarList(Page page, InspectionPickCar inspectionPickCar); /** * 新增上门取车服务 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IShopInspectionGoodsService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IShopInspectionGoodsService.java index 4561d6c2..0478b584 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IShopInspectionGoodsService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IShopInspectionGoodsService.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.inspection.service; import java.util.List; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.inspection.entity.ShopInspectionCategory; @@ -38,7 +39,7 @@ public interface IShopInspectionGoodsService extends IService selectShopInspectionGoodsListWx(ShopInspectionGoods shopInspectionGoods); + public IPage selectShopInspectionGoodsListWx(Page page, ShopInspectionGoods shopInspectionGoods); /** * 新增检测商品 @@ -79,9 +80,9 @@ public interface IShopInspectionGoodsService extends IService listSystem(Page page,ShopInspectionGoods shopInspectionGoods); + public IPage listSystem(Page page,ShopInspectionGoods shopInspectionGoods); - public List listPartnerGoods(ShopInspectionGoods shopInspectionGoods) throws Exception; + public IPage listPartnerGoods(Page page,ShopInspectionGoods shopInspectionGoods) throws Exception; List categoryList() throws Exception; void partnerAddGoods(ShopInspectionGoods shopInspectionGoods) throws Exception; List partnerGoodsListTree(Long partnerId); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/ISiteInfoService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/ISiteInfoService.java index ac9533a9..76d72af5 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/ISiteInfoService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/ISiteInfoService.java @@ -5,6 +5,7 @@ import java.util.List; import cn.iocoder.yudao.module.inspection.entity.NweUsers; import cn.iocoder.yudao.module.inspection.entity.SiteInfo; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; /** @@ -29,7 +30,7 @@ public interface ISiteInfoService * @param siteInfo inspection * @return inspection集合 */ - public List selectSiteInfoList(Page page,SiteInfo siteInfo); + public IPage selectSiteInfoList(Page page, SiteInfo siteInfo); /** * 新增inspection diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionGoodsServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionGoodsServiceImpl.java index c1e1f1fc..0a81a597 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionGoodsServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionGoodsServiceImpl.java @@ -14,6 +14,8 @@ import cn.iocoder.yudao.module.system.service.permission.PermissionService; import cn.iocoder.yudao.module.system.service.permission.RoleService; import cn.iocoder.yudao.module.system.service.user.AdminUserService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.StringUtils; import cn.iocoder.yudao.module.inspection.entity.InspectionGoodsSku; @@ -69,9 +71,9 @@ public class AppInspectionGoodsServiceImpl extends ServiceImpl homePartner(Double longitude, Double latitude) { - List partnerListVos = baseMapper.homePartners(longitude,latitude); - partnerListVos.forEach(item->{ + public IPage homePartner(Page page, Double longitude, Double latitude) { + IPage partnerListVos = baseMapper.homePartners(page,longitude,latitude); + partnerListVos.getRecords().forEach(item->{ if (StringUtils.isNotEmpty(item.getAddress())){ item.setAddress(item.getAddress().substring(item.getAddress().indexOf("市")+1)); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionOrderServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionOrderServiceImpl.java index 9a76a916..cfaa3981 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionOrderServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionOrderServiceImpl.java @@ -21,6 +21,8 @@ import cn.iocoder.yudao.module.inspection.service.*; import cn.iocoder.yudao.module.inspection.vo.InspectionInfoVo; import cn.iocoder.yudao.module.inspection.vo.OrderAppDetail; import cn.iocoder.yudao.module.shop.entity.ShopMallPartners; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -88,9 +90,9 @@ public class AppInspectionOrderServiceImpl extends ServiceImpl inspectionList(String status) { + public IPage inspectionList(Page page, String status) { LoginUser user = SecurityFrameworkUtils.getLoginUser(); - return baseMapper.inspectionList(status,user.getId()); + return baseMapper.inspectionList(page,status,user.getId()); } @Override @@ -249,8 +251,8 @@ public class AppInspectionOrderServiceImpl extends ServiceImpl governmentInspectionList(String carNum, String status, String partnerId) { - return baseMapper.governmentInspectionList(carNum,status,partnerId); + public IPage governmentInspectionList(Page page,String carNum, String status, String partnerId) { + return baseMapper.governmentInspectionList(page,carNum,status,partnerId); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java index 25f890c8..8b477ba2 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java @@ -119,11 +119,11 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl partnerList(PartnerListQuery partnerListQuery) { + public IPage partnerList(Page page, PartnerListQuery partnerListQuery) { if (null!=partnerListQuery.getDistance()){ partnerListQuery.setDistance(partnerListQuery.getDistance()*1000); } - List partnerListVos = baseMapper.partnerList(partnerListQuery); + IPage partnerListVos = baseMapper.partnerList(page,partnerListQuery); return partnerListVos; } @@ -702,8 +702,8 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl goodsList(Long partnerId, String isListing, String goodsTitle) { - return baseMapper.manageGoodsList(partnerId,isListing,goodsTitle); + public IPage goodsList(Page page,Long partnerId, String isListing, String goodsTitle) { + return baseMapper.manageGoodsList(page,partnerId,isListing,goodsTitle); } @Override @@ -874,7 +874,7 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl accountDetail(Long partnerId, Integer pageNum, Integer pageSize) { + public IPage accountDetail(Page page,Long partnerId, Integer pageNum, Integer pageSize) { LoginUser user = SecurityFrameworkUtils.getLoginUser(); ShopMallPartners partnersTmp = baseMapper.selectById(partnerId); if (!partnersTmp.getUserId().equals(user.getId())){ @@ -883,15 +883,15 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl queryWrapper =new LambdaQueryWrapper<>(); queryWrapper.eq(PartnerBalance::getPartnerId,partnerId); PartnerBalance one = partnerBalanceService.getOne(queryWrapper); - PageHelper.startPage(pageNum, pageSize); + LambdaQueryWrapper queryWrapper1 =new LambdaQueryWrapper<>(); queryWrapper1.eq(PartnerBalanceDetail::getPartnerBalanceId,one.getId()).orderByDesc(PartnerBalanceDetail::getChangeTime); - return detailService.list(queryWrapper1); + return detailService.page(page,queryWrapper1); } @Override - public List orderList(Long partnerId,String phoneNum, String title) { - return baseMapper.orderList(partnerId,phoneNum,title); + public IPage orderList(Page page,Long partnerId,String phoneNum, String title) { + return baseMapper.orderList(page,partnerId,phoneNum,title); } @Override @@ -1247,9 +1247,9 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl validationList(Long partnerId,String searchValue) { + public IPage validationList(Page page, Long partnerId,String searchValue) { - return baseMapper.validationList(partnerId,searchValue); + return baseMapper.validationList(page,partnerId,searchValue); } @Override @@ -1285,12 +1285,12 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl listCoupon(Long partnerId, String searchValue) { + public IPage listCoupon(Page page,Long partnerId, String searchValue) { LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); queryWrapper.eq(ShopCouponTemplate::getPartnerId,partnerId).eq(ShopCouponTemplate::getBindMoudle,"检测项目现金券") .eq(StringUtils.isNotEmpty(searchValue),ShopCouponTemplate::getTitle,searchValue).orderByDesc(TenantBaseDO::getCreateTime); - return templateService.listCoupon(partnerId,searchValue); + return templateService.listCoupon(page,partnerId,searchValue); } @Override @@ -1330,8 +1330,8 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl getPickCarListOfWorker(Long workerId, String phoneNum) { - return baseMapper.getPickCarListOfWorker(workerId,phoneNum); + public IPage getPickCarListOfWorker(Page page,Long workerId, String phoneNum) { + return baseMapper.getPickCarListOfWorker(page,workerId,phoneNum); } @Override diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppUserOwnServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppUserOwnServiceImpl.java index 27fa0398..e37f8a25 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppUserOwnServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppUserOwnServiceImpl.java @@ -18,6 +18,8 @@ import cn.iocoder.yudao.util.StringUtils; import cn.iocoder.yudao.module.inspection.service.AppUserOwnService; import cn.iocoder.yudao.module.shop.entity.ShopUserCar; import cn.iocoder.yudao.module.shop.service.IShopUserCarService; +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 java.time.Instant; @@ -89,11 +91,15 @@ public class AppUserOwnServiceImpl implements AppUserOwnService { } @Override - public List getDbList(String searchValue) { + public List getDbList(Page page, String searchValue) { String roleCode = "jcdb"; return userService.getUsersByRoleRescue(roleCode,searchValue,null); } - + @Override + public IPage getDbListTow(Page page, String searchValue) { + String roleCode = "jcdb"; + return userService.getUsersByRoleRescueTow(page,roleCode,searchValue,null); + } @Override public List getAppUserCar() { //当前登录用户 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/DelInspectionInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/DelInspectionInfoServiceImpl.java index 56a385f2..d96298bf 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/DelInspectionInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/DelInspectionInfoServiceImpl.java @@ -5,6 +5,8 @@ import cn.iocoder.yudao.module.inspection.entity.DelInspectionInfo; import cn.iocoder.yudao.module.inspection.mapper.DelInspectionInfoMapper; import cn.iocoder.yudao.module.inspection.service.IDelInspectionInfoService; import cn.iocoder.yudao.util.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 DelInspectionInfoServiceImpl implements IDelInspectionInfoService * @return 【请填写功能名称】 */ @Override - public List selectDelInspectionInfoList(DelInspectionInfo delInspectionInfo) + public IPage selectDelInspectionInfoList(Page page, DelInspectionInfo delInspectionInfo) { - return delInspectionInfoMapper.selectDelInspectionInfoList(delInspectionInfo); + return delInspectionInfoMapper.selectDelInspectionInfoList(page,delInspectionInfo); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionAppointmentServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionAppointmentServiceImpl.java index eb41970f..17391004 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionAppointmentServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionAppointmentServiceImpl.java @@ -72,9 +72,9 @@ public class InspectionAppointmentServiceImpl extends ServiceImpl selectInspectionAppointmentList(InspectionAppointment inspectionAppointment) + public IPage selectInspectionAppointmentList(Page page, InspectionAppointment inspectionAppointment) { - return baseMapper.selectInspectionAppointmentList(inspectionAppointment); + return baseMapper.selectInspectionAppointmentList(page,inspectionAppointment); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionCategoryTemplateServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionCategoryTemplateServiceImpl.java index dfb6a5f9..bec70159 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionCategoryTemplateServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionCategoryTemplateServiceImpl.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.inspection.service.impl; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.DateUtils; import org.springframework.stereotype.Service; @@ -38,9 +40,9 @@ public class InspectionCategoryTemplateServiceImpl extends ServiceImpl selectInspectionCategoryTemplateList(InspectionCategoryTemplate inspectionCategoryTemplate) + public IPage selectInspectionCategoryTemplateList(Page page, InspectionCategoryTemplate inspectionCategoryTemplate) { - return baseMapper.selectInspectionCategoryTemplateList(inspectionCategoryTemplate); + return baseMapper.selectInspectionCategoryTemplateList(page,inspectionCategoryTemplate); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java index 48fd7672..ba0ed7e7 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java @@ -5,6 +5,8 @@ import java.util.List; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.DateUtils; import cn.iocoder.yudao.module.inspection.entity.WarnMessage; @@ -46,9 +48,9 @@ public class InspectionFileServiceImpl extends ServiceImpl selectInspectionFileList(InspectionFile inspectionFile) + public IPage selectInspectionFileList(Page page, InspectionFile inspectionFile) { - return baseMapper.selectInspectionFileList(inspectionFile); + return baseMapper.selectInspectionFileList(page,inspectionFile); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java index d915201b..36caf35a 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java @@ -88,9 +88,9 @@ public class InspectionInfoServiceImpl extends ServiceImpl selectInspectionInfoList(InspectionInfo inspectionInfo) + public IPage selectInspectionInfoList(Page page, InspectionInfo inspectionInfo) { - return baseMapper.selectInspectionInfoList(inspectionInfo); + return baseMapper.selectInspectionInfoList(page,inspectionInfo); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsAssociationServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsAssociationServiceImpl.java index 000d7971..4e8b3f2a 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsAssociationServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsAssociationServiceImpl.java @@ -4,6 +4,8 @@ import java.util.List; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.DateUtils; import cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation; @@ -41,9 +43,9 @@ public class InspectionNewsAssociationServiceImpl extends ServiceImpl selectInspectionNewsAssociationList(InspectionNewsAssociation inspectionNewsAssociation) + public IPage selectInspectionNewsAssociationList(Page page, InspectionNewsAssociation inspectionNewsAssociation) { - return baseMapper.selectInspectionNewsAssociationList(inspectionNewsAssociation); + return baseMapper.selectInspectionNewsAssociationList(page,inspectionNewsAssociation); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsCommentServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsCommentServiceImpl.java index 093c0575..4a54a092 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsCommentServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsCommentServiceImpl.java @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.inspection.service.impl; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.DateUtils; @@ -43,9 +45,9 @@ public class InspectionNewsCommentServiceImpl extends ServiceImpl selectInspectionNewsCommentList(InspectionNewsComment inspectionNewsComment) + public IPage selectInspectionNewsCommentList(Page page, InspectionNewsComment inspectionNewsComment) { - return baseMapper.selectInspectionNewsCommentList(inspectionNewsComment); + return baseMapper.selectInspectionNewsCommentList(page,inspectionNewsComment); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsServiceImpl.java index b9b63d48..ed75df0b 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsServiceImpl.java @@ -11,6 +11,7 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.user.AdminUserService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.DateUtils; @@ -23,6 +24,7 @@ import cn.iocoder.yudao.module.inspection.service.IInspectionNewsAssociationServ import cn.iocoder.yudao.module.inspection.service.IInspectionNewsCommentService; import cn.iocoder.yudao.module.inspection.service.IInspectionNewsService; import cn.iocoder.yudao.module.inspection.utils.HtmlFilter; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -62,14 +64,14 @@ public class InspectionNewsServiceImpl extends ServiceImpl selectInspectionNewsList(Page page, InspectionNews inspectionNews) + public IPage selectInspectionNewsList(Page page, InspectionNews inspectionNews) { if (null!=inspectionNews.getPublishUnit() && inspectionNews.getPublishUnit().equals("检测站公告")){ inspectionNews.setCategory("jczgg"); inspectionNews.setPublishUnit(null); } - List list = baseMapper.selectInspectionNewsList(page,inspectionNews); - list.forEach(it->{ + IPage list = baseMapper.selectInspectionNewsList(page,inspectionNews); + list.getRecords().forEach(it->{ it.setNewsContent(HtmlFilter.dealFunction(it.getNewsContent())); }); return list; @@ -252,10 +254,10 @@ public class InspectionNewsServiceImpl extends ServiceImpl collectionNews(String newsName) { + public IPage collectionNews(Page page,String newsName) { //获取用户名称 Long userId = SecurityFrameworkUtils.getLoginUserId(); - return baseMapper.collectionNews(userId,newsName); + return baseMapper.collectionNews(page,userId,newsName); } @Override @@ -265,9 +267,9 @@ public class InspectionNewsServiceImpl extends ServiceImpl msgList(Long partnerId) { - List news = baseMapper.msgList(partnerId); - news.forEach(it->{ + public IPage msgList(Page page, Long partnerId) { + IPage news = baseMapper.msgList(page, partnerId); + news.getRecords().forEach(it->{ it.setNewsContent(HtmlFilter.dealFunction(it.getNewsContent())); }); return news; diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionPickCarServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionPickCarServiceImpl.java index ca85cf19..964270ff 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionPickCarServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionPickCarServiceImpl.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.inspection.service.impl; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.DateUtils; import org.springframework.stereotype.Service; @@ -38,9 +40,9 @@ public class InspectionPickCarServiceImpl extends ServiceImpl selectInspectionPickCarList(InspectionPickCar inspectionPickCar) + public IPage selectInspectionPickCarList(Page page, InspectionPickCar inspectionPickCar) { - return baseMapper.selectInspectionPickCarList(inspectionPickCar); + return baseMapper.selectInspectionPickCarList(page,inspectionPickCar); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ShopInspectionCategoryServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ShopInspectionCategoryServiceImpl.java index 7db30031..943fcfbf 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ShopInspectionCategoryServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ShopInspectionCategoryServiceImpl.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.util.StringUtils; import cn.iocoder.yudao.module.inspection.entity.InspectionCategoryTemplate; import cn.iocoder.yudao.module.inspection.entity.ShopInspectionGoods; diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ShopInspectionGoodsServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ShopInspectionGoodsServiceImpl.java index 13edefc4..d12aeda4 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ShopInspectionGoodsServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ShopInspectionGoodsServiceImpl.java @@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.user.AdminUserService; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.StringUtils; @@ -128,15 +129,15 @@ public class ShopInspectionGoodsServiceImpl extends ServiceImpl selectShopInspectionGoodsListWx(ShopInspectionGoods shopInspectionGoods) + public IPage selectShopInspectionGoodsListWx(Page page,ShopInspectionGoods shopInspectionGoods) { //默认蓝安的id为888 ShopConfig shopConfig = configService.selectShopConfigById(1L); //获取最高会员的优惠折扣 BigDecimal inspectionPlatinum = shopConfig.getInspectionPlatinum(); Double ratio = inspectionPlatinum.divide(BigDecimal.valueOf(10)).doubleValue(); - List shopInspectionRes = baseMapper.selectShopInspectionGoodsListWx(shopInspectionGoods); - for (ShopInspectionGoods good : shopInspectionRes) { + IPage shopInspectionRes = baseMapper.selectShopInspectionGoodsListWx(page,shopInspectionGoods); + for (ShopInspectionGoods good : shopInspectionRes.getRecords()) { if (good.getIsSpecial().equals(0)){ //原价单位分 Long priceFen = good.getPrice(); @@ -230,15 +231,15 @@ public class ShopInspectionGoodsServiceImpl extends ServiceImpl listSystem(Page page,ShopInspectionGoods shopInspectionGoods) { + public IPage listSystem(Page page,ShopInspectionGoods shopInspectionGoods) { return baseMapper.listSystem(page,shopInspectionGoods); } @Override - public List listPartnerGoods(ShopInspectionGoods shopInspectionGoods) throws Exception { + public IPage listPartnerGoods(Page page,ShopInspectionGoods shopInspectionGoods) throws Exception { - return baseMapper.listPartnerGoods(shopInspectionGoods); + return baseMapper.listPartnerGoods(page,shopInspectionGoods); } @Override diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/SiteInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/SiteInfoServiceImpl.java index cc9aad2b..be175d5c 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/SiteInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/SiteInfoServiceImpl.java @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.inspection.entity.NweUsers; import cn.iocoder.yudao.util.DateUtils; import com.alibaba.fastjson.JSONObject; +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; @@ -44,10 +45,10 @@ public class SiteInfoServiceImpl implements ISiteInfoService * @return inspection */ @Override - public List selectSiteInfoList(Page page,SiteInfo siteInfo) + public IPage selectSiteInfoList(Page page, SiteInfo siteInfo) { - List siteInfos = siteInfoMapper.selectSiteInfoList(page,siteInfo); - for (SiteInfo info : siteInfos) { + IPage siteInfos = siteInfoMapper.selectSiteInfoList(page,siteInfo); + for (SiteInfo info : siteInfos.getRecords()) { if (null!=info.getSiteLongitude()&&null!=info.getSiteLatitude()){ info.setLongitude(info.getSiteLongitude().toString()); info.setLatitude(info.getSiteLatitude().toString()); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java index 330004e1..29c89a29 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.partner.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.core.text.Convert; import cn.iocoder.yudao.module.core.text.ServletUtils; import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService; diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/FzRecordController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/FzRecordController.java index beb4abea..76323a20 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/FzRecordController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/FzRecordController.java @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.payment.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.payment.entity.FzRecord; import cn.iocoder.yudao.module.payment.service.IFzRecordService; import cn.iocoder.yudao.util.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; @@ -31,11 +31,13 @@ public class FzRecordController extends BaseController */ // @PreAuthorize("@ss.hasPermi('fzRecord:fzRecord:list')") @GetMapping("/list") - public TableDataInfo list(FzRecord fzRecord,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize) + public CommonResult list(FzRecord fzRecord, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - List list = fzRecordService.selectFzRecordList(page,fzRecord); - return getDataTable(list); + IPage list = fzRecordService.selectFzRecordList(page,fzRecord); + return success(list); } /** @@ -43,12 +45,14 @@ public class FzRecordController extends BaseController */ // @PreAuthorize("@ss.hasPermi('fzRecord:fzRecord:export')") @PostMapping("/export") - public void export(HttpServletResponse response, FzRecord fzRecord) + public void export(HttpServletResponse response, FzRecord fzRecord, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - Page page = new Page<>(); - List list = fzRecordService.selectFzRecordList(page,fzRecord); + Page page = new Page<>(pageNum,pageSize); + IPage list = fzRecordService.selectFzRecordList(page,fzRecord); ExcelUtil util = new ExcelUtil(FzRecord.class); - util.exportExcel(response, list, "分账记录数据"); + util.exportExcel(response, list.getRecords(), "分账记录数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/OrderController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/OrderController.java index b0c5953a..2e8b9ce3 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/OrderController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/OrderController.java @@ -4,7 +4,6 @@ package cn.iocoder.yudao.module.payment.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.core.controller.BaseController; import cn.iocoder.yudao.module.core.page.PageDomain; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.core.page.TableSupport; import cn.iocoder.yudao.module.core.text.Convert; import cn.iocoder.yudao.module.core.text.ServletUtils; @@ -15,6 +14,7 @@ import cn.iocoder.yudao.module.payment.service.OrderInfoService; import cn.iocoder.yudao.module.shop.entity.ShopMallPartners; import cn.iocoder.yudao.module.shop.service.IShopMallPartnersService; import cn.iocoder.yudao.util.StringUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; @@ -61,10 +61,12 @@ public class OrderController extends BaseController { } @GetMapping("/orderList") - public TableDataInfo orderList(String status, String title) { - startPage(); - List orderInfos = orderInfoService.orderList(status, title); - return getDataTable(orderInfos); + public CommonResult orderList(String status, String title, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + IPage orderInfos = orderInfoService.orderList(page,status, title); + return success(orderInfos); } @@ -94,18 +96,20 @@ public class OrderController extends BaseController { // 核销记录By核销人Id 微信端 @GetMapping("/validationListWx") - public TableDataInfo validationListWx(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize) { + public CommonResult validationListWx(@RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - List list = orderInfoService.validationListWx(page); - return getDataTable(list); + IPage list = orderInfoService.validationListWx(page); + return success(list); } // 商城核销记录By核销人Id PC @GetMapping("/validationListPc") - public TableDataInfo validationListPc(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize) { + public CommonResult validationListPc(@RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - List list = orderInfoService.validationListPc(page); - return getDataTable(list); + IPage list = orderInfoService.validationListPc(page); + return success(list); } @@ -120,12 +124,12 @@ public class OrderController extends BaseController { * 查询检测订单列表 */ @GetMapping("/orderListSystem") - public TableDataInfo orderListSystem(OrderInfo shopInspectionOrder) { - int pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); - int pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); - startPage(); - List list = orderInfoService.orderListSystem(shopInspectionOrder); - return getDataTable(list); + public CommonResult orderListSystem(OrderInfo shopInspectionOrder, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + IPage list = orderInfoService.orderListSystem(page,shopInspectionOrder); + return success(list); } /** @@ -155,27 +159,31 @@ public class OrderController extends BaseController { */ @GetMapping("/getCommentOrderList") - public TableDataInfo getCommentOrderList(Long partnerId,Integer pageNum,Integer pageSize) { + public CommonResult getCommentOrderList(Long partnerId, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { //判断商家是否开启评论区 ShopMallPartners partners = partnerService.getById(partnerId); if (StringUtils.isEmpty(partners.getOpenComment())||partners.getOpenComment().equals("0")){ - return getDataTable(new ArrayList<>()); + return success(new ArrayList<>()); } - PageHelper.startPage(pageNum,pageSize); - List commentOrderList = orderInfoService.getCommentOrderList(partnerId); - return getDataTable(commentOrderList); + Page page = new Page<>(pageNum, pageSize); + IPage commentOrderList = orderInfoService.getCommentOrderList(page,partnerId); + return success(commentOrderList); } // pc端合作商订单列表 @GetMapping("/listPc") - public TableDataInfo listPc(OrderInfo orderInfo) { + public CommonResult listPc(OrderInfo orderInfo, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { // 当前合作商的商品 ShopMallPartners shopMallPartners = shopMallPartnersService.selectShopMallPartnersByUserId(getUserId(),"sc"); orderInfo.setPartnerId(shopMallPartners.getPartnerId()); PageDomain pageDomain = TableSupport.getPageDomain(); - PageHelper.startPage(pageDomain.getPageNum(), pageDomain.getPageSize(), pageDomain.getOrderBy()); - List list = orderInfoService.orderListPc(orderInfo); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = orderInfoService.orderListPc(page,orderInfo); + return success(list); } @GetMapping("/getOrderInfo/{id}") diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/FzRecordMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/FzRecordMapper.java index 0fe04bf7..3bcec72e 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/FzRecordMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/FzRecordMapper.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.payment.mapper; import cn.iocoder.yudao.module.payment.entity.FzRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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; @@ -31,6 +32,6 @@ public interface FzRecordMapper extends BaseMapper * @param fzRecord 分账记录 * @return 分账记录集合 */ - public List selectFzRecordList(Page page,@Param("vo") FzRecord fzRecord); + public IPage selectFzRecordList(Page page, @Param("vo") FzRecord fzRecord); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java index 51de851c..4dbf1d55 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java @@ -22,7 +22,7 @@ import java.util.List; */ @Mapper public interface OrderInfoMapper extends BaseMapper { - List orderListApp(@Param("userId") Long userId, @Param("status") String status, @Param("title") String title, @Param("type") String type); + IPage orderListApp(Page page, @Param("userId") Long userId, @Param("status") String status, @Param("title") String title, @Param("type") String type); Double avgPartnerScore(@Param("partnerId") Long partnerId); @@ -30,9 +30,9 @@ public interface OrderInfoMapper extends BaseMapper { List statisticsMid(); - List inspectionList(@Param("status") String status, @Param("userId") Long userId); + IPage inspectionList(Page page, @Param("status") String status, @Param("userId") Long userId); - List orderListSystem(OrderInfo orderInfo); + IPage orderListSystem(Page page,@Param("vo") OrderInfo orderInfo); /** * 分页查询订单 @@ -51,18 +51,18 @@ public interface OrderInfoMapper extends BaseMapper { List getPartnerList(@Param("partnerName") String partnerName); - List governmentInspectionList(@Param("carNum") String carNum, @Param("status") String status, @Param("partnerId") String partnerId); + IPage governmentInspectionList(Page page, @Param("carNum") String carNum, @Param("status") String status, @Param("partnerId") String partnerId); - List orderList(@Param("userId") Long userId, @Param("status") String status, @Param("title") String title); + IPage orderList(Page page,@Param("userId") Long userId, @Param("status") String status, @Param("title") String title); - List validationListWx(Page page, @Param("validationUserId") Long validationUserId); + IPage validationListWx(Page page, @Param("validationUserId") Long validationUserId); - List validationListPc(Page page, Long partnerId); + IPage validationListPc(Page page, Long partnerId); Integer getNoCommentOrder(@Param("userId") Long userId); - List getCommentOrderList(@Param("partnerId") Long partnerId); + IPage getCommentOrderList(Page page, @Param("partnerId") Long partnerId); - List orderListPc(OrderInfo orderInfo); + IPage orderListPc(Page page,@Param("vo") OrderInfo orderInfo); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/IFzRecordService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/IFzRecordService.java index 522523cb..8f29ef0f 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/IFzRecordService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/IFzRecordService.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.payment.service; import cn.iocoder.yudao.module.payment.entity.FzRecord; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -27,7 +28,7 @@ public interface IFzRecordService extends IService * @param fzRecord 分账记录 * @return 分账记录集合 */ - public List selectFzRecordList(Page page,FzRecord fzRecord); + public IPage selectFzRecordList(Page page, FzRecord fzRecord); /** * 新增分账记录 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/OrderInfoService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/OrderInfoService.java index d647a8d1..83adb39d 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/OrderInfoService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/OrderInfoService.java @@ -23,7 +23,7 @@ import java.util.Map; public interface OrderInfoService extends IService { void reviewOrder(String orderId, Integer starLevel, String reviewStr) throws Exception; - List orderListApp(String status, String title, String type); + IPage orderListApp(Page page, String status, String title, String type); List workOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime); @@ -35,7 +35,7 @@ public interface OrderInfoService extends IService { IPage pageDelworkOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime,Page page); - List orderListSystem(OrderInfo orderInfo); + IPage orderListSystem(Page page,OrderInfo orderInfo); /** * 分页查询订单 @@ -56,7 +56,7 @@ public interface OrderInfoService extends IService { void cancelPay(Long orderId); - List orderList(String status, String title); + IPage orderList(Page page,String status, String title); String validation(String accessCode); @@ -64,17 +64,17 @@ public interface OrderInfoService extends IService { String validationMall(String accessCode); - List validationListWx(Page page); + IPage validationListWx(Page page); - List validationListPc(Page page); + IPage validationListPc(Page page); Integer commentOrder(OrderInfo orderInfo); Integer getNoCommentOrder(); - List getCommentOrderList(Long partnerId); + IPage getCommentOrderList(Page page,Long partnerId); - List orderListPc(OrderInfo orderInfo); + IPage orderListPc(Page page,OrderInfo orderInfo); OrderInfo getOrderByOrderNo(String orderNo); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/FzRecordServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/FzRecordServiceImpl.java index 0d6db046..9c79a53a 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/FzRecordServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/FzRecordServiceImpl.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.payment.entity.FzRecord; import cn.iocoder.yudao.module.payment.mapper.FzRecordMapper; import cn.iocoder.yudao.module.payment.service.IFzRecordService; import cn.iocoder.yudao.util.DateUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -40,7 +41,7 @@ public class FzRecordServiceImpl extends ServiceImpl i * @return 分账记录 */ @Override - public List selectFzRecordList(Page page,FzRecord fzRecord) + public IPage selectFzRecordList(Page page, FzRecord fzRecord) { return baseMapper.selectFzRecordList(page,fzRecord); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java index c6c9208d..43ea7ee3 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java @@ -101,9 +101,9 @@ public class OrderInfoServiceImpl extends ServiceImpl orderListApp(String status, String title, String type) { + public IPage orderListApp(Page page,String status, String title, String type) { LoginUser user = SecurityFrameworkUtils.getLoginUser(); - return baseMapper.orderListApp(user.getId(), status, title, type); + return baseMapper.orderListApp(page,user.getId(), status, title, type); } @Override @@ -163,8 +163,8 @@ public class OrderInfoServiceImpl extends ServiceImpl orderListSystem(OrderInfo orderInfo) { - return baseMapper.orderListSystem(orderInfo); + public IPage orderListSystem(Page page,OrderInfo orderInfo) { + return baseMapper.orderListSystem(page,orderInfo); } /** @@ -711,10 +711,10 @@ public class OrderInfoServiceImpl extends ServiceImpl orderList(String status, String title) { + public IPage orderList(Page page,String status, String title) { LoginUser user = SecurityFrameworkUtils.getLoginUser(); - return baseMapper.orderList(user.getId(), status, title); + return baseMapper.orderList(page,user.getId(), status, title); } /** @@ -801,13 +801,13 @@ public class OrderInfoServiceImpl extends ServiceImpl validationListWx(Page page) { + public IPage validationListWx(Page page) { return baseMapper.validationListWx(page,SecurityFrameworkUtils.getLoginUserId()); } // pc端核销记录 商城 @Override - public List validationListPc(Page page) { + public IPage validationListPc(Page page) { ShopMallPartners shopMallPartners = shopMallPartnersService.selectShopMallPartnersByUserId(SecurityFrameworkUtils.getLoginUserId(),"sc"); Long partnerId = shopMallPartners.getPartnerId(); return baseMapper.validationListPc(page,partnerId); @@ -828,13 +828,13 @@ public class OrderInfoServiceImpl extends ServiceImpl getCommentOrderList(Long partnerId) { - return baseMapper.getCommentOrderList(partnerId); + public IPage getCommentOrderList(Page page, Long partnerId) { + return baseMapper.getCommentOrderList(page,partnerId); } @Override - public List orderListPc(OrderInfo orderInfo) { - return baseMapper.orderListPc(orderInfo); + public IPage orderListPc(Page page, OrderInfo orderInfo) { + return baseMapper.orderListPc(page,orderInfo); } @Override diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/PartnerDetailController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/PartnerDetailController.java index 729bed22..83eb73f5 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/PartnerDetailController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/PartnerDetailController.java @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.shop.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.shop.entity.PartnerDetail; import cn.iocoder.yudao.module.shop.service.IPartnerDetailService; import cn.iocoder.yudao.util.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; @@ -31,11 +31,13 @@ public class PartnerDetailController extends BaseController */ // @PreAuthorize("@ss.hasPermi('system:detail:list')") @GetMapping("/list") - public TableDataInfo list(PartnerDetail partnerDetail,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize) + public CommonResult list(PartnerDetail partnerDetail, + @RequestParam(value = "pageNum",required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value = "pageSize",required = false ,defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - List list = partnerDetailService.selectPartnerDetailList(page,partnerDetail); - return getDataTable(list); + IPage list = partnerDetailService.selectPartnerDetailList(page,partnerDetail); + return success(list); } /** @@ -43,12 +45,15 @@ public class PartnerDetailController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:detail:export')") @PostMapping("/export") - public void export(HttpServletResponse response, PartnerDetail partnerDetail) + public void export(HttpServletResponse response, PartnerDetail partnerDetail, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - Page page = new Page<>(); - List list = partnerDetailService.selectPartnerDetailList(page,partnerDetail); + Page page = new Page<>(pageNum, pageSize); + IPage list = partnerDetailService.selectPartnerDetailList(page,partnerDetail); ExcelUtil util = new ExcelUtil(PartnerDetail.class); - util.exportExcel(response, list, "【请填写功能名称】数据"); + + util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopCouponController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopCouponController.java index 3a8b87b3..c2858ade 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopCouponController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopCouponController.java @@ -3,14 +3,16 @@ package cn.iocoder.yudao.module.shop.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.core.controller.BaseController; import cn.iocoder.yudao.module.core.page.PageDomain; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.core.page.TableSupport; import cn.iocoder.yudao.module.shop.entity.ShopCoupon; import cn.iocoder.yudao.module.shop.service.IShopCouponService; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.util.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + import com.github.pagehelper.PageHelper; +import org.checkerframework.checker.units.qual.C; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -38,11 +40,13 @@ public class ShopCouponController extends BaseController */ // @PreAuthorize("@ss.hasPermi('system:ShopCoupon:list')") @GetMapping("/list") - public TableDataInfo list(ShopCoupon shopCoupon,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize) + public CommonResult list(ShopCoupon shopCoupon, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - List list = shopCouponService.selectShopCouponList(page,shopCoupon); - return getDataTable(list); + IPage list = shopCouponService.selectShopCouponList(page,shopCoupon); + return success(list); } /** @@ -50,12 +54,14 @@ public class ShopCouponController extends BaseController */ // @PreAuthorize("@ss.hasPermi('system:ShopCoupon:export')") @PostMapping("/export") - public void export(HttpServletResponse response, ShopCoupon shopCoupon) + public void export(HttpServletResponse response, ShopCoupon shopCoupon, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - Page page = new Page<>(); - List list = shopCouponService.selectShopCouponList(page,shopCoupon); + Page page = new Page<>(pageNum, pageSize); + IPage list = shopCouponService.selectShopCouponList(page,shopCoupon); ExcelUtil util = new ExcelUtil(ShopCoupon.class); - util.exportExcel(response, list, "优惠券数据"); + util.exportExcel(response, list.getRecords(), "优惠券数据"); } /** @@ -109,18 +115,24 @@ public class ShopCouponController extends BaseController } /* 我的优惠券 by userId */ @GetMapping(value = "/listByUserId") - public TableDataInfo listByUserId(ShopCoupon shopCoupon) + public CommonResult listByUserId(ShopCoupon shopCoupon, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { shopCoupon.setUserId(getUserId()); PageDomain pageDomain = TableSupport.getPageDomain(); - PageHelper.startPage(pageDomain.getPageNum(), pageDomain.getPageSize(), pageDomain.getOrderBy()); - List list = shopCouponService.selectShopCouponByUserId(shopCoupon); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = shopCouponService.selectShopCouponByUserId(page,shopCoupon); + return success(list); } /* 可用优惠券 by userId */ @GetMapping(value = "/availableCouponsListByUserId") - public TableDataInfo availableCouponsListByUserId(ShopCoupon shopCoupon, @RequestParam("type") String type, @RequestParam(value = "goodId",required = false) Long goodId) + public CommonResult availableCouponsListByUserId(ShopCoupon shopCoupon, + @RequestParam("type") String type, + @RequestParam(value = "goodId",required = false) Long goodId, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { shopCoupon.setUserId(getUserId()); if ("jc".equals(type)){ @@ -132,19 +144,23 @@ public class ShopCouponController extends BaseController shopCoupon.setBindMoudle("维修项目现金券"); }else { List list = shopCouponService.getQxCouponList(getUserId(),goodId); - return getDataTable(list); + return success(list); } } shopCoupon.setCouponStatus("0"); PageDomain pageDomain = TableSupport.getPageDomain(); - PageHelper.startPage(pageDomain.getPageNum(), pageDomain.getPageSize(), pageDomain.getOrderBy()); - List list = shopCouponService.availableCouponsListByUserId(shopCoupon); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = shopCouponService.availableCouponsListByUserId(page,shopCoupon); + return success(list); } /* 可用优惠券 by userId */ @GetMapping(value = "/unAvailableCouponsListByUserId") - public TableDataInfo unAvailableCouponsListByUserId(ShopCoupon shopCoupon, @RequestParam("type") String type, @RequestParam(value = "goodId",required = false) Long goodId) + public CommonResult unAvailableCouponsListByUserId(ShopCoupon shopCoupon, + @RequestParam("type") String type, + @RequestParam(value = "goodId",required = false) Long goodId, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { shopCoupon.setUserId(getUserId()); if ("jc".equals(type)){ @@ -156,16 +172,16 @@ public class ShopCouponController extends BaseController shopCoupon.setBindMoudle("维修项目现金券"); }else { List list = shopCouponService.unGetQxCouponList(getUserId(),goodId); - return getDataTable(list); + return success(list); } } shopCoupon.setCouponStatus("0"); PageDomain pageDomain = TableSupport.getPageDomain(); - PageHelper.startPage(pageDomain.getPageNum(), pageDomain.getPageSize(), pageDomain.getOrderBy()); + Page page = new Page<>(pageNum, pageSize); - List list = shopCouponService.unAvailableCouponsListByUserId(shopCoupon); - return getDataTable(list); + IPage list = shopCouponService.unAvailableCouponsListByUserId(page,shopCoupon); + return success(list); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopCouponTemplateController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopCouponTemplateController.java index 6af2a29d..539e899a 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopCouponTemplateController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopCouponTemplateController.java @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.shop.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate; import cn.iocoder.yudao.module.shop.service.IShopCouponTemplateService; import cn.iocoder.yudao.util.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; @@ -31,11 +31,13 @@ public class ShopCouponTemplateController extends BaseController */ // @PreAuthorize("@ss.hasPermi('shop:couponTemplate:list')") @GetMapping("/list") - public TableDataInfo list(ShopCouponTemplate shopCouponTemplate,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize) + public CommonResult list(ShopCouponTemplate shopCouponTemplate, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - List list = shopCouponTemplateService.selectShopCouponTemplateList(page,shopCouponTemplate); - return getDataTable(list); + IPage list = shopCouponTemplateService.selectShopCouponTemplateList(page,shopCouponTemplate); + return success(list); } /** @@ -43,12 +45,14 @@ public class ShopCouponTemplateController extends BaseController */ // @PreAuthorize("@ss.hasPermi('shop:couponTemplate:export')") @PostMapping("/export") - public void export(HttpServletResponse response, ShopCouponTemplate shopCouponTemplate) + public void export(HttpServletResponse response, ShopCouponTemplate shopCouponTemplate, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - Page page = new Page<>(); - List list = shopCouponTemplateService.selectShopCouponTemplateList(page,shopCouponTemplate); + Page page = new Page<>(pageNum, pageSize); + IPage list = shopCouponTemplateService.selectShopCouponTemplateList(page,shopCouponTemplate); ExcelUtil util = new ExcelUtil(ShopCouponTemplate.class); - util.exportExcel(response, list, "优惠券模板数据"); + util.exportExcel(response, list.getRecords(), "优惠券模板数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopUserCarController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopUserCarController.java index 15121a5e..36d536db 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopUserCarController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopUserCarController.java @@ -3,11 +3,12 @@ package cn.iocoder.yudao.module.shop.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.core.controller.BaseController; -import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.shop.entity.ShopUserCar; import cn.iocoder.yudao.module.shop.service.IShopUserCarService; import cn.iocoder.yudao.util.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.checkerframework.checker.units.qual.C; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -34,30 +35,36 @@ public class ShopUserCarController extends BaseController */ // @PreAuthorize("@ss.hasPermi('system:userCar:list')") @GetMapping("/list") - public TableDataInfo list(ShopUserCar shopUserCar,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize) + public CommonResult list(ShopUserCar shopUserCar, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - List list = shopUserCarService.selectShopUserCarList(page,shopUserCar); - return getDataTable(list); + IPage list = shopUserCarService.selectShopUserCarList(page,shopUserCar); + return success(list); } @GetMapping("/listOfPartner") - public TableDataInfo listOfPartner(ShopUserCar shopUserCar,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize) + public CommonResult listOfPartner(ShopUserCar shopUserCar, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - List list = shopUserCarService.selectShopUserCarList(page,shopUserCar); - return getDataTable(list); + IPage list = shopUserCarService.selectShopUserCarList(page,shopUserCar); + return success(list); } /** * 导出用户车辆列表 */ // @PreAuthorize("@ss.hasPermi('system:userCar:export')") @PostMapping("/export") - public void export(HttpServletResponse response, ShopUserCar shopUserCar) + public void export(HttpServletResponse response, ShopUserCar shopUserCar, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - Page page = new Page<>(); - List list = shopUserCarService.selectShopUserCarList(page,shopUserCar); + Page page = new Page<>(pageNum,pageSize); + IPage list = shopUserCarService.selectShopUserCarList(page,shopUserCar); ExcelUtil util = new ExcelUtil(ShopUserCar.class); - util.exportExcel(response, list, "用户车辆数据"); + util.exportExcel(response, list.getRecords(), "用户车辆数据"); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/PartnerDetailMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/PartnerDetailMapper.java index 7d3b2108..80029f45 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/PartnerDetailMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/PartnerDetailMapper.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.shop.mapper; import cn.iocoder.yudao.module.shop.entity.PartnerDetail; +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; @@ -32,7 +33,7 @@ public interface PartnerDetailMapper * @param partnerDetail 【请填写功能名称】 * @return 【请填写功能名称】集合 */ - public List selectPartnerDetailList(Page page,@Param("vo") PartnerDetail partnerDetail); + public IPage selectPartnerDetailList(Page page, @Param("vo") PartnerDetail partnerDetail); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopCouponMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopCouponMapper.java index 666e4ecc..abfa8ffd 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopCouponMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopCouponMapper.java @@ -5,6 +5,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.shop.entity.ShopCoupon; import cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate; +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; @@ -33,7 +34,7 @@ public interface ShopCouponMapper extends BaseMapper * @param shopCoupon 优惠券 * @return 优惠券集合 */ - public List selectShopCouponList(Page page,@Param("vo") ShopCoupon shopCoupon); + public IPage selectShopCouponList(Page page, @Param("vo") ShopCoupon shopCoupon); /** * 新增优惠券 @@ -68,11 +69,11 @@ public interface ShopCouponMapper extends BaseMapper */ public int deleteShopCouponByCouponIds(Long[] couponIds); - List selectShopCouponByUserId(ShopCoupon shopCoupon); + IPage selectShopCouponByUserId(Page page, @Param("vo") ShopCoupon shopCoupon); - List availableCouponsListByUserId(ShopCoupon shopCoupon); + IPage availableCouponsListByUserId(Page page, @Param("vo") ShopCoupon shopCoupon); - List unAvailableCouponsListByUserId(ShopCoupon shopCoupon); + IPage unAvailableCouponsListByUserId(Page page, @Param("vo") ShopCoupon shopCoupon); List canUseCoupon(@Param("userId") Long userId, @Param("partnerId")Integer partnerId,@Param("goodsIdStr") String goodsIdStr,@Param("bindMoudle") String bindMoudle); Integer canUseCouponCount(@Param("userId") Long userId, @Param("partnerId")Integer partnerId,@Param("goodsIdStr") String goodsIdStr,@Param("bindMoudle") String bindMoudle); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopCouponTemplateMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopCouponTemplateMapper.java index 65ff1c04..9d24012f 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopCouponTemplateMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopCouponTemplateMapper.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate; +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; @@ -31,7 +32,7 @@ public interface ShopCouponTemplateMapper extends BaseMapper * @param shopCouponTemplate 优惠券模板 * @return 优惠券模板集合 */ - public List selectShopCouponTemplateList(Page page,@Param("vo") ShopCouponTemplate shopCouponTemplate); + public IPage selectShopCouponTemplateList(Page page,@Param("vo") ShopCouponTemplate shopCouponTemplate); /** * 新增优惠券模板 @@ -64,5 +65,5 @@ public interface ShopCouponTemplateMapper extends BaseMapper * @return 结果 */ public int deleteShopCouponTemplateByIds(Long[] ids); - List listCoupon(@Param("partnerId") Long partnerId,@Param("searchValue") String searchValue); + IPage listCoupon(Page page, @Param("partnerId") Long partnerId, @Param("searchValue") String searchValue); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopMallPartnersMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopMallPartnersMapper.java index 029377fb..2bac0266 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopMallPartnersMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopMallPartnersMapper.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.shop.entity.ShopMallPartners; +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; @@ -31,7 +32,7 @@ public interface ShopMallPartnersMapper extends BaseMapper * @param shopMallPartners 合作商管理 * @return 合作商管理集合 */ - public List selectShopMallPartnersList(Page page, @Param("shop") ShopMallPartners shopMallPartners); + public IPage selectShopMallPartnersList(Page page, @Param("shop") ShopMallPartners shopMallPartners); /** * 新增合作商管理 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopUserCarMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopUserCarMapper.java index e095f32e..bf2976bb 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopUserCarMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopUserCarMapper.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.shop.entity.ShopUserCar; +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; @@ -33,7 +34,7 @@ public interface ShopUserCarMapper extends BaseMapper * @param shopUserCar 用户车辆 * @return 用户车辆集合 */ - public List selectShopUserCarList(Page page,@Param("vo") ShopUserCar shopUserCar); + public IPage selectShopUserCarList(Page page, @Param("vo") ShopUserCar shopUserCar); /** * 新增用户车辆 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IPartnerDetailService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IPartnerDetailService.java index c687e378..8a9cf513 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IPartnerDetailService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IPartnerDetailService.java @@ -1,7 +1,9 @@ package cn.iocoder.yudao.module.shop.service; import cn.iocoder.yudao.module.shop.entity.PartnerDetail; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +31,7 @@ public interface IPartnerDetailService * @param partnerDetail 【请填写功能名称】 * @return 【请填写功能名称】集合 */ - public List selectPartnerDetailList(Page page,PartnerDetail partnerDetail); + public IPage selectPartnerDetailList(Page page, PartnerDetail partnerDetail); /** * 新增【请填写功能名称】 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopCouponService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopCouponService.java index e14bcb61..e7576523 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopCouponService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopCouponService.java @@ -1,10 +1,12 @@ package cn.iocoder.yudao.module.shop.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.shop.entity.ShopCoupon; import cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate; + import java.util.List; /** @@ -29,7 +31,7 @@ public interface IShopCouponService extends IService * @param shopCoupon 优惠券 * @return 优惠券集合 */ - public List selectShopCouponList(Page page,ShopCoupon shopCoupon); + public IPage selectShopCouponList(Page page, ShopCoupon shopCoupon); /** * 新增优惠券 @@ -65,11 +67,11 @@ public interface IShopCouponService extends IService */ public int deleteShopCouponByCouponId(Long couponId); - public List selectShopCouponByUserId(ShopCoupon shopCoupon); + public IPage selectShopCouponByUserId(Page page, ShopCoupon shopCoupon); - public List availableCouponsListByUserId(ShopCoupon shopCoupon); + public IPage availableCouponsListByUserId(Page page, ShopCoupon shopCoupon); - public List unAvailableCouponsListByUserId(ShopCoupon shopCoupon); + public IPage unAvailableCouponsListByUserId(Page page,ShopCoupon shopCoupon); public int getOffsetCouponCount(Long userId, Long goodId); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopCouponTemplateService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopCouponTemplateService.java index c5dd7793..46a90ca6 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopCouponTemplateService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopCouponTemplateService.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.shop.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate; @@ -28,7 +29,7 @@ public interface IShopCouponTemplateService extends IService selectShopCouponTemplateList(Page page,ShopCouponTemplate shopCouponTemplate); + public IPage selectShopCouponTemplateList(Page page,ShopCouponTemplate shopCouponTemplate); /** * 新增优惠券模板 @@ -61,5 +62,5 @@ public interface IShopCouponTemplateService extends IService listCoupon(Long partnerId, String searchValue); + IPage listCoupon(Page page,Long partnerId, String searchValue); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopMallPartnersService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopMallPartnersService.java index 069d1c53..84c975f4 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopMallPartnersService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopMallPartnersService.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.shop.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.shop.entity.ShopMallPartners; @@ -28,7 +29,7 @@ public interface IShopMallPartnersService extends IService * @param shopMallPartners 合作商管理 * @return 合作商管理集合 */ - public List selectShopMallPartnersList(Page page, ShopMallPartners shopMallPartners); + public IPage selectShopMallPartnersList(Page page, ShopMallPartners shopMallPartners); /** * 新增合作商管理 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopUserCarService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopUserCarService.java index 5486d7f7..1489cd31 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopUserCarService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopUserCarService.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.shop.service; import java.util.List; import cn.iocoder.yudao.module.shop.entity.ShopUserCar; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.tencentcloudapi.common.exception.TencentCloudSDKException; @@ -29,7 +30,7 @@ public interface IShopUserCarService extends IService * @param shopUserCar 用户车辆 * @return 用户车辆集合 */ - public List selectShopUserCarList(Page page,ShopUserCar shopUserCar); + public IPage selectShopUserCarList(Page page, ShopUserCar shopUserCar); /** * 新增用户车辆 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/PartnerDetailServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/PartnerDetailServiceImpl.java index 51759909..b2418f08 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/PartnerDetailServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/PartnerDetailServiceImpl.java @@ -16,6 +16,7 @@ import cn.iocoder.yudao.module.shop.mapper.PartnerDetailMapper; import cn.iocoder.yudao.module.shop.service.IPartnerDetailService; import cn.iocoder.yudao.module.shop.service.IShopMallPartnersService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wechat.pay.java.core.Config; import com.wechat.pay.java.core.RSAAutoCertificateConfig; @@ -89,7 +90,7 @@ public class PartnerDetailServiceImpl implements IPartnerDetailService * @return 【请填写功能名称】 */ @Override - public List selectPartnerDetailList(Page page,PartnerDetail partnerDetail) + public IPage selectPartnerDetailList(Page page, PartnerDetail partnerDetail) { return partnerDetailMapper.selectPartnerDetailList(page,partnerDetail); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopCouponServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopCouponServiceImpl.java index a509406c..5fde5417 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopCouponServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopCouponServiceImpl.java @@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.system.service.permission.RoleService; import cn.iocoder.yudao.module.system.service.user.AdminUserService; import cn.iocoder.yudao.util.WechatPayConfig; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.DateUtils; @@ -83,7 +84,7 @@ public class ShopCouponServiceImpl extends ServiceImpl selectShopCouponList(Page page,ShopCoupon shopCoupon) + public IPage selectShopCouponList(Page page, ShopCoupon shopCoupon) { return baseMapper.selectShopCouponList(page,shopCoupon); } @@ -206,19 +207,19 @@ public class ShopCouponServiceImpl extends ServiceImpl selectShopCouponByUserId(ShopCoupon shopCoupon){ - return baseMapper.selectShopCouponByUserId(shopCoupon); + public IPage selectShopCouponByUserId(Page page, ShopCoupon shopCoupon){ + return baseMapper.selectShopCouponByUserId(page,shopCoupon); }; /* 可用优惠券 */ @Override - public List availableCouponsListByUserId(ShopCoupon shopCoupon){ - return baseMapper.availableCouponsListByUserId(shopCoupon); + public IPage availableCouponsListByUserId(Page page, ShopCoupon shopCoupon){ + return baseMapper.availableCouponsListByUserId(page,shopCoupon); }; /* 不可用优惠券 */ @Override - public List unAvailableCouponsListByUserId(ShopCoupon shopCoupon){ - return baseMapper.unAvailableCouponsListByUserId(shopCoupon); + public IPage unAvailableCouponsListByUserId(Page page, ShopCoupon shopCoupon){ + return baseMapper.unAvailableCouponsListByUserId(page,shopCoupon); }; @Override diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopCouponTemplateServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopCouponTemplateServiceImpl.java index 8fd74661..d58bbfc4 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopCouponTemplateServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopCouponTemplateServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.shop.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.DateUtils; @@ -40,7 +41,7 @@ public class ShopCouponTemplateServiceImpl extends ServiceImpl selectShopCouponTemplateList(Page page,ShopCouponTemplate shopCouponTemplate) + public IPage selectShopCouponTemplateList(Page page,ShopCouponTemplate shopCouponTemplate) { return baseMapper.selectShopCouponTemplateList(page,shopCouponTemplate); } @@ -95,7 +96,7 @@ public class ShopCouponTemplateServiceImpl extends ServiceImpl listCoupon(Long partnerId, String searchValue) { - return baseMapper.listCoupon(partnerId,searchValue); + public IPage listCoupon(Page page,Long partnerId, String searchValue) { + return baseMapper.listCoupon(page,partnerId,searchValue); } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopMallPartnersServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopMallPartnersServiceImpl.java index e258de78..29d509ff 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopMallPartnersServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopMallPartnersServiceImpl.java @@ -9,6 +9,7 @@ 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.service.user.AdminUserService; import cn.iocoder.yudao.util.StringUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.module.partner.entity.PartnerWorker; @@ -57,7 +58,7 @@ public class ShopMallPartnersServiceImpl extends ServiceImpl selectShopMallPartnersList(Page page, ShopMallPartners shopMallPartners) + public IPage selectShopMallPartnersList(Page page, ShopMallPartners shopMallPartners) { return baseMapper.selectShopMallPartnersList(page,shopMallPartners); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopUserCarServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopUserCarServiceImpl.java index d1b20ee9..58431949 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopUserCarServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopUserCarServiceImpl.java @@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.system.service.user.AdminUserService; import cn.iocoder.yudao.util.IDCardOCR; import cn.iocoder.yudao.util.VehicleLicenseOCR; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.util.StringUtils; @@ -64,7 +65,7 @@ public class ShopUserCarServiceImpl extends ServiceImpl selectShopUserCarList(Page page,ShopUserCar shopUserCar) + public IPage selectShopUserCarList(Page page, ShopUserCar shopUserCar) { return baseMapper.selectShopUserCarList(page,shopUserCar); } diff --git a/dl-module-inspection/src/main/resources/mapper/contract/ContractHistoryMapper.xml b/dl-module-inspection/src/main/resources/mapper/contract/ContractHistoryMapper.xml index a7e69f5a..a41b4a31 100644 --- a/dl-module-inspection/src/main/resources/mapper/contract/ContractHistoryMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/contract/ContractHistoryMapper.xml @@ -35,8 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" contract_history history LEFT JOIN sys_user su on su.user_id = history.user_id - and su.phonenumber like concat('%',#{phoneNum},'%') - and su.real_name = #{realName} + and su.phonenumber like concat('%',#{vo.phoneNum},'%') + and su.real_name = #{vo.realName} @@ -99,21 +99,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM `inspection_contract` WHERE 1=1 - - and bren like CONCAT('%',#{bren},'%') + + and bren like CONCAT('%',#{vo.bren},'%') - - and brphone like CONCAT('%',#{brphone},'%') + + and brphone like CONCAT('%',#{vo.brphone},'%') - - and wtr like CONCAT('%',#{wtr},'%') + + and wtr like CONCAT('%',#{vo.wtr},'%') - - and wtrphone like CONCAT('%',#{wtrphone},'%') + + and wtrphone like CONCAT('%',#{vo.wtrphone},'%') - - and carnum like CONCAT('%',#{carnum},'%') + + and carnum like CONCAT('%',#{vo.carnum},'%') diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml index 69e41869..c33c3bae 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml @@ -16,32 +16,32 @@ smp.work_time, smp.partner_name, smp.sales_num, - ROUND(ST_Distance_Sphere (POINT (#{longitude}, #{latitude}),POINT (smp.longitude, smp.latitude ))) AS distance, + ROUND(ST_Distance_Sphere (POINT (#{vo.longitude}, #{vo.latitude}),POINT (smp.longitude, smp.latitude ))) AS distance, COUNT(sig.id) goodsNum FROM shop_mall_partners smp Inner JOIN shop_inspection_goods sig ON smp.partner_id = sig.partner_id AND sig.is_listing='1' WHERE smp.type = 'jc' and smp.is_banned = '0' and smp.partner_logo is not null - - and ROUND(ST_Distance_Sphere (POINT (#{longitude}, #{latitude}),POINT (smp.longitude, smp.latitude ))) #{distance}*1000 + + and ROUND(ST_Distance_Sphere (POINT (#{vo.longitude}, #{vo.latitude}),POINT (smp.longitude, smp.latitude ))) #{vo.distance}*1000 - - and sig.goods_category_id = #{categoryId} + + and sig.goods_category_id = #{vo.categoryId} - - and (smp.partner_name like concat('%',#{searchValue},'%') or sig.title like concat('%',#{searchValue},'%') ) + + and (smp.partner_name like concat('%',#{vo.searchValue},'%') or sig.title like concat('%',#{vo.searchValue},'%') ) GROUP BY smp.partner_id - + order by distance asc,smp.order_num - + order by smp.average_score desc,smp.order_num - + order by smp.sales_num desc,smp.order_num diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/DelInspectionInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/DelInspectionInfoMapper.xml index 9d18963a..2923ba53 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/DelInspectionInfoMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/DelInspectionInfoMapper.xml @@ -54,40 +54,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionAppointmentMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionAppointmentMapper.xml index 2155dc9c..3cb46944 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionAppointmentMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionAppointmentMapper.xml @@ -24,11 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionCategoryTemplateMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionCategoryTemplateMapper.xml index 8dc59445..8f72d629 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionCategoryTemplateMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionCategoryTemplateMapper.xml @@ -22,9 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionFileMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionFileMapper.xml index cf01bb96..f02ef38f 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionFileMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionFileMapper.xml @@ -9,17 +9,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and inspection_order_id = #{inspectionOrderId} - and work_id = #{workId} - and worker_name like concat('%', #{workerName}, '%') - and worker_phone = #{workerPhone} - and is_pass = #{isPass} - and status = #{status} - and start_time = #{startTime} - and end_time = #{endTime} - and year = #{year} - and month = #{month} - and day = #{day} + and inspection_order_id = #{vo.inspectionOrderId} + and work_id = #{vo.workId} + and worker_name like concat('%', #{vo.workerName}, '%') + and worker_phone = #{vo.workerPhone} + and is_pass = #{vo.isPass} + and status = #{vo.status} + and start_time = #{vo.startTime} + and end_time = #{vo.endTime} + and year = #{vo.year} + and month = #{vo.month} + and day = #{vo.day} diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsAssociationMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsAssociationMapper.xml index a9b991ba..699a2f9f 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsAssociationMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsAssociationMapper.xml @@ -22,9 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsCommentMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsCommentMapper.xml index 07d3bbe4..5607cc85 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsCommentMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsCommentMapper.xml @@ -23,10 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionPickCarMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionPickCarMapper.xml index 7d346106..a6d40aaf 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionPickCarMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionPickCarMapper.xml @@ -31,18 +31,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/ShopInspectionGoodsMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/ShopInspectionGoodsMapper.xml index 55c735ba..d0b98301 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/ShopInspectionGoodsMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/ShopInspectionGoodsMapper.xml @@ -14,9 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select * from shop_inspection_goods and partner_id = 888 and id!=888 - and id = #{id} - and title like concat('%', #{title}, '%') - and is_special = #{isSpecial} + and id = #{vo.id} + and title like concat('%', #{vo.title}, '%') + and is_special = #{vo.isSpecial} order by order_num, id desc @@ -52,11 +52,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INNER JOIN shop_inspection_category sic ON sic.id = sig.goods_category_id - and sig.id = #{id} - and sig.title like concat('%', #{title}, '%') - and sig.goods_category_id = #{goodsCategoryId} - and smp.partner_name like concat('%',#{partnerName},'%') - and sig.partner_id = #{partnerId} + and sig.id = #{vo.id} + and sig.title like concat('%', #{vo.title}, '%') + and sig.goods_category_id = #{vo.goodsCategoryId} + and smp.partner_name like concat('%',#{vo.partnerName},'%') + and sig.partner_id = #{vo.partnerId} ORDER BY FIELD(sig.listing_status,1,2,3,0), create_time desc diff --git a/dl-module-inspection/src/main/resources/mapper/payment/OrderInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/payment/OrderInfoMapper.xml index 702f3690..479e6447 100644 --- a/dl-module-inspection/src/main/resources/mapper/payment/OrderInfoMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/payment/OrderInfoMapper.xml @@ -59,38 +59,38 @@ LEFT JOIN system_users su ON su.id = oi.user_id left join shop_user_car suc on suc.car_id = oi.user_car_id where 1=1 - - and oi.order_status = #{orderStatus} + + and oi.order_status = #{vo.orderStatus} - + and oi.validation_time is not null - - and oi.real_name like concat('%',#{realName},'%') + + and oi.real_name like concat('%',#{vo.realName},'%') - - and oi.order_no like concat('%',#{orderNo},'%') + + and oi.order_no like concat('%',#{vo.orderNo},'%') - - and oi.goods_title like concat('%',#{goodsTitle},'%') + + and oi.goods_title like concat('%',#{vo.goodsTitle},'%') - - and oi.validation_real_name like concat('%',#{validationRealName},'%') + + and oi.validation_real_name like concat('%',#{vo.validationRealName},'%') - - and su.mobile like concat('%',#{phonenumber},'%') + + and su.mobile like concat('%',#{vo.phonenumber},'%') - - and oi.pay_money =]]> #{realPayMoney} + + and oi.pay_money =]]> #{vo.realPayMoney} - - and oi.pay_time =]]> #{startTime} + + and oi.pay_time =]]> #{vo.startTime} - - and oi.pay_time #{endTime} + + and oi.pay_time #{vo.endTime} - - and oi.partner_id = #{partnerId} + + and oi.partner_id = #{vo.partnerId} order by order_time desc @@ -119,14 +119,14 @@ FROM `order_info` where partner_id =#{partnerId} and goods_type='sc' - - and order_status = #{orderStatus} + + and order_status = #{vo.orderStatus} - - and phonenumber like concat('%',#{phonenumber},'%') + + and phonenumber like concat('%',#{vo.phonenumber},'%') - - and goods_title like concat('%',#{goodsTitle},'%') + + and goods_title like concat('%',#{vo.goodsTitle},'%') order by order_time desc diff --git a/dl-module-inspection/src/main/resources/mapper/shop/ShopCouponMapper.xml b/dl-module-inspection/src/main/resources/mapper/shop/ShopCouponMapper.xml index 81b4870a..3abd7417 100644 --- a/dl-module-inspection/src/main/resources/mapper/shop/ShopCouponMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/shop/ShopCouponMapper.xml @@ -74,26 +74,26 @@ - and coupon_type = #{couponType} - and bind_moudle = #{bindMoudle} - and bind_goods_ids = #{bindGoodsIds} - and user_id = #{userId} - and coupon_status = #{couponStatus} - + and coupon_type = #{vo.couponType} + and bind_moudle = #{vo.bindMoudle} + and bind_goods_ids = #{vo.bindGoodsIds} + and user_id = #{vo.userId} + and coupon_status = #{vo.couponStatus} + and now() BETWEEN start_time AND expiration_time @@ -124,12 +124,12 @@ - and top_dept_id = #{topDeptId} - and rescue_tc_big = #{rescueTcBig} - and rescue_tc_mid = #{rescueTcMid} - and rescue_tc_small = #{rescueTcSmall} + and top_dept_id = #{vo.topDeptId} + and rescue_tc_big = #{vo.rescueTcBig} + and rescue_tc_mid = #{vo.rescueTcMid} + and rescue_tc_small = #{vo.rescueTcSmall} diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverPositionMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverPositionMapper.xml index e0309245..6293c7ce 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverPositionMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverPositionMapper.xml @@ -9,11 +9,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml index 6a6b1b68..6f265a4c 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml @@ -37,14 +37,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java index a7bf43c0..f56613e5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java @@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.dept.DeptService; import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java index 8108a7ed..c944b813 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java @@ -5,6 +5,8 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +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; @@ -49,6 +51,8 @@ public interface AdminUserMapper extends BaseMapperX { } List getUsersByRoleRescue(@Param("roleCode") String roleCode, @Param("searchValue") String searchValue, @Param("deptIds") List deptIds); + IPage getUsersByRoleRescueTwo(Page page,@Param("roleCode") String roleCode, @Param("searchValue") String searchValue, @Param("deptIds") List deptIds); + Integer getStudentNumberByUserId(Long jlId); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java index 73e370f8..f256e291 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java @@ -8,6 +8,8 @@ import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfi import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import javax.validation.Valid; import java.io.InputStream; @@ -212,6 +214,7 @@ public interface AdminUserService { boolean isPasswordMatch(String rawPassword, String encodedPassword); List getUsersByRoleRescue(String roleCode, String searchValue, List deptIds); + IPage getUsersByRoleRescueTow(Page page,String roleCode, String searchValue, List deptIds); Integer getStudentNumberByUserId(Long jlId); List getStudentNumber(Long id); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index 15ade9ba..1d814244 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -29,6 +29,8 @@ import cn.iocoder.yudao.module.system.service.dept.PostService; import cn.iocoder.yudao.module.system.service.permission.PermissionService; import cn.iocoder.yudao.module.system.service.tenant.TenantService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.annotations.VisibleForTesting; import com.mzt.logapi.context.LogRecordContext; import com.mzt.logapi.service.impl.DiffParseFunction; @@ -511,6 +513,10 @@ public class AdminUserServiceImpl implements AdminUserService { return userMapper.getUsersByRoleRescue(roleCode,searchValue,deptIds); } + @Override + public IPage getUsersByRoleRescueTow(Page page,String roleCode, String searchValue, List deptIds) { + return userMapper.getUsersByRoleRescueTwo(page,roleCode,searchValue,deptIds); + } @Override public Integer getStudentNumberByUserId(Long jlId) { return userMapper.getStudentNumberByUserId(jlId); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/SysUserMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/SysUserMapper.xml index 9bc0a9cb..6ea53f80 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/SysUserMapper.xml @@ -26,6 +26,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + From 73661d454ebac95e0cbbd84e3748844e7335da8a Mon Sep 17 00:00:00 2001 From: Vinjor Date: Sat, 12 Oct 2024 12:57:49 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rescue/mapper/RescueSysConfigMapper.java | 10 ++++- .../service/impl/SysConfigServiceImpl.java | 6 +-- .../rescue/utils/RedissonDelayQueue.java | 5 --- .../mapper/rescue/RescueSysConfigMapper.xml | 37 +++++++++++++------ 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueSysConfigMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueSysConfigMapper.java index b15e07c4..4540b8ee 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueSysConfigMapper.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueSysConfigMapper.java @@ -37,7 +37,15 @@ public interface RescueSysConfigMapper { * @param config 参数配置信息 * @return 参数配置集合 */ - public IPage selectConfigList(Page page, @Param("vo") SysConfig config); + public List selectConfigList(SysConfig config); + + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + public IPage selectConfigListIPage(Page page, @Param("vo") SysConfig config); /** * 根据键名查询参数配置信息 diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/SysConfigServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/SysConfigServiceImpl.java index 5f073972..6724d5f2 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/SysConfigServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/SysConfigServiceImpl.java @@ -102,7 +102,7 @@ public class SysConfigServiceImpl implements ISysConfigService { */ @Override public IPage selectConfigList(Page page, SysConfig config) { - return configMapper2.selectConfigList(page,config); + return configMapper2.selectConfigListIPage(page,config); } /** @@ -162,8 +162,8 @@ public class SysConfigServiceImpl implements ISysConfigService { */ @Override public void loadingConfigCache() { - IPage configsList = configMapper2.selectConfigList(null,new SysConfig()); - for (SysConfig config : configsList.getRecords()) { + List configsList = configMapper2.selectConfigList(new SysConfig()); + for (SysConfig config : configsList) { redisCache2.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); } } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java index 0f31807a..4cf692c9 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java @@ -1,18 +1,13 @@ package cn.iocoder.yudao.module.rescue.utils; -import cn.hutool.extra.spring.SpringUtil; import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; import cn.iocoder.yudao.module.appBase.domain.SysAnnouncement; import cn.iocoder.yudao.module.appBase.service.ISysAnnouncementService; import cn.iocoder.yudao.module.constant.UserConstants; import cn.iocoder.yudao.module.rescue.dto.TaskDto; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; -import cn.iocoder.yudao.module.system.api.permission.RoleApi; -import cn.iocoder.yudao.module.system.api.permission.dto.RoleReqDTO; import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.service.permission.PermissionService; import cn.iocoder.yudao.module.system.service.permission.RoleService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml index 6f265a4c..ecbe8e2b 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml @@ -33,20 +33,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + From bab7f9f22ef5615ada5a226c6fc6f098a1bf9e53 Mon Sep 17 00:00:00 2001 From: Vinjor Date: Sat, 12 Oct 2024 16:51:13 +0800 Subject: [PATCH 5/8] =?UTF-8?q?pagehelp=E7=89=88=E6=9C=AC=E5=8D=87?= =?UTF-8?q?=E5=9B=9E=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java | 2 +- yudao-dependencies/pom.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java index 4cf692c9..53b45165 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java @@ -112,7 +112,7 @@ public class RedissonDelayQueue { offerTask(task, UserConstants.RESCUE_TIME); } catch (Exception e) { // 记录并打印异常信息 - log.error("发生错误", e); +// log.error("发生错误", e); } } }); diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 096bfa19..885f048a 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -26,7 +26,8 @@ 1.2.23 3.5.16 3.5.7 - 1.4.6 + + 2.1.0 4.9 3.5.7 4.3.1 From af1be4cb264eb3f91d63e162d4a19cf3380fcf48 Mon Sep 17 00:00:00 2001 From: 13405411873 <1994398261@qq.com> Date: Tue, 15 Oct 2024 10:34:05 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/inspection/controller/PartnerOwnController.java | 4 ++-- .../service/impl/AppInspectionPartnerServiceImpl.java | 4 ---- .../mapper/inspection/AppInspectionPartnerMapper.xml | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java index dafcecf8..43d8e8a9 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java @@ -84,9 +84,9 @@ public class PartnerOwnController extends BaseController { * 首页 顶部数据统计 */ @GetMapping("/statisticsInfo") - public CommonResult statisticsInfo(Long partnerId) + public CommonResult statisticsInfo() { - return success(partnerList.statisticsInfo(partnerId)); + return success(partnerList.statisticsInfo(null)); } /** * 检测线图 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java index 8b477ba2..965bdadf 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java @@ -234,10 +234,6 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl + SELECT + COALESCE(sdd.label, '未知') AS name, + COUNT(bcm.id) AS vale + FROM + base_customer_main bcm + LEFT JOIN system_dict_data sdd ON bcm.data_from = sdd.value AND sdd.dict_type = 'cus_data_from' AND sdd.deleted = 0 + WHERE + bcm.deleted = 0 + GROUP BY + bcm.data_from + ORDER BY + bcm.create_time + + + + + + + + + + From c40a8f7017424a56195bdad6ee638153d8450e51 Mon Sep 17 00:00:00 2001 From: Vinjor Date: Mon, 21 Oct 2024 17:44:44 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/vo/RepairOrderInfoRespVO.java | 9 +- .../mapper/notice/DlBaseNoticeMapper.xml | 3 +- .../mapper/order/RepairOrderInfoMapper.xml | 20 ++++- .../rescue/utils/RedissonDelayQueue.java | 2 +- .../vo/template/NotifyTemplateSendReqVO.java | 1 - .../notify/ApiNotifyMessageController.java | 84 +++++++++++++++++++ .../dal/mysql/notify/NotifyMessageMapper.java | 14 +++- .../service/notify/NotifyMessageService.java | 32 +++++++ .../notify/NotifyMessageServiceImpl.java | 21 +++++ .../src/main/resources/application-local.yaml | 1 + 10 files changed, 178 insertions(+), 9 deletions(-) create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/notify/ApiNotifyMessageController.java diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoRespVO.java index 94280d00..50325bec 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoRespVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoRespVO.java @@ -1,6 +1,5 @@ package cn.iocoder.yudao.module.order.vo; -import cn.iocoder.yudao.module.company.entity.Company; import cn.iocoder.yudao.module.order.entity.RepairOrderInfo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import io.swagger.v3.oas.annotations.media.Schema; @@ -11,9 +10,15 @@ import lombok.Data; @ExcelIgnoreUnannotated public class RepairOrderInfoRespVO extends RepairOrderInfo { - /** 订单状态（工单的状态） */ + /** 订单状态（工单的维修子状态） */ private String status; + /** 订单状态（工单的主状态） */ + private String mainStatus; + //订单描述 private String description; + + /** 查询订单类型(null-所有 |working-维修中|waitingPay-待支付|waitingComment-待评价) */ + private String selectType; } diff --git a/dl-module-base/src/main/resources/mapper/notice/DlBaseNoticeMapper.xml b/dl-module-base/src/main/resources/mapper/notice/DlBaseNoticeMapper.xml index 02e19db8..39946bb0 100644 --- a/dl-module-base/src/main/resources/mapper/notice/DlBaseNoticeMapper.xml +++ b/dl-module-base/src/main/resources/mapper/notice/DlBaseNoticeMapper.xml @@ -21,7 +21,8 @@ type, status, parent_server, - server + server, + create_time from dl_base_notice dbn where dbn.deleted = '0' diff --git a/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml b/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml index 3872bffb..71a6d781 100644 --- a/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml +++ b/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml @@ -39,7 +39,9 @@