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'
</sql>
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 @@
</select>
<select id="getOrderPageByStatus" resultType="cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO">
- select roi.*,drt.tickets_work_status as status from repair_order_info roi left join dl_repair_tickets drt on
+ select roi.*,drt.tickets_work_status as status,drt.tickets_status as mainStatus
+ from repair_order_info roi
+ left join dl_repair_tickets drt on
roi.goods_id = drt.id
where roi.deleted = '0'
<if test="map.userId != null and map.userId != ''">
@@ -51,6 +53,22 @@
<if test="map.orderStatus != null and map.orderStatus != ''">
and roi.order_status = #{map.orderStatus}
</if>
+ <if test="map.selectType != null and map.selectType != ''">
+ <choose>
+ <when test="map.selectType == 'working'">
+ -- 维修中的订单 --
+ and (drt.tickets_status = '04' OR drt.tickets_status = '05' )
+ </when>
+ <when test="map.selectType == 'waitingPay'">
+ -- 待支付的订单 --
+ and (roi.pay_type is not null AND roi.order_status='0' )
+ </when>
+ <when test="map.selectType == 'waitingComment'">
+ -- 待评价的订单 --
+ and (roi.comment_star is null AND roi.order_status='1' )
+ </when>
+ </choose>
+ </if>
<if test="map.status != null and map.status != ''">
<choose>
<when test="map.status != '00'">
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<AppSwiper> list = appSwiperService.selectAppSwiperList(appSwiper);
- return getDataTable(list);
+ Page<AppSwiper> page = new Page<>(pageNum, pageSize);
+ IPage<AppSwiper> 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<AppSwiper> list = appSwiperService.selectAppSwiperList(appSwiper);
+ Page<AppSwiper> page = new Page<>(pageNum, pageSize);
+ IPage<AppSwiper> list = appSwiperService.selectAppSwiperList(page,appSwiper);
ExcelUtil<AppSwiper> util = new ExcelUtil<AppSwiper>(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<AppSwiper> selectAppSwiperList(@Param("vo") AppSwiper appSwiper);
+ public IPage<AppSwiper> selectAppSwiperList(Page<AppSwiper> 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<AppSwiper> selectAppSwiperList(AppSwiper appSwiper);
+ public IPage<AppSwiper> selectAppSwiperList(Page<AppSwiper> 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<AppSwiper> selectAppSwiperList(AppSwiper appSwiper)
+ public IPage<AppSwiper> selectAppSwiperList(Page<AppSwiper> 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<ContractHistory> list = contractHistoryService.selectContractHistoryList(contractHistory);
- return getDataTable(list);
+ Page<ContractHistory> page = new Page<>(pageNum, pageSize);
+ IPage<ContractHistory> 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<ContractHistory> list = contractHistoryService.selectContractHistoryList(contractHistory);
+ Page<ContractHistory> page = new Page<>(pageNum, pageSize);
+ IPage<ContractHistory> list = contractHistoryService.selectContractHistoryList(page,contractHistory);
ExcelUtil<ContractHistory> util = new ExcelUtil<ContractHistory>(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<InspectionContract> list = inspectionContractService.selectInspectionContractList(inspectionContract);
- return getDataTable(list);
+ Page<InspectionContract> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionContract> 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<InspectionContract> list = inspectionContractService.selectInspectionContractList(inspectionContract);
+ Page<InspectionContract> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionContract> list = inspectionContractService.selectInspectionContractList(page,inspectionContract);
ExcelUtil<InspectionContract> util = new ExcelUtil<InspectionContract>(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<InspectionContract> list = inspectionContractService.partnerGetWtList(inspectionContract);
- return getDataTable(list);
+ Page<InspectionContract> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionContract> 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<ContractHistory> selectContractHistoryList(ContractHistory contractHistory);
+ public IPage<ContractHistory> selectContractHistoryList(Page<ContractHistory> page, @Param("vo") ContractHistory contractHistory);
/**
* 新增签署历史
@@ -63,6 +66,6 @@ public interface ContractHistoryMapper
*/
public int deleteContractHistoryByIds(Long[] ids);
- public List<InspectionContract> partnerGetWtList(InspectionContract contractHistory);
+ public IPage<InspectionContract> partnerGetWtList(Page<InspectionContract> 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<InspectionContract
* @param inspectionContract inspectionContract
* @return inspectionContract集合
*/
- public List<InspectionContract> selectInspectionContractList(InspectionContract inspectionContract);
+ public IPage<InspectionContract> selectInspectionContractList(Page<InspectionContract> 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<ContractHistory> selectContractHistoryList(ContractHistory contractHistory);
+ public IPage<ContractHistory> selectContractHistoryList(Page<ContractHistory> 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<InspectionContract
* @param inspectionContract inspectionContract
* @return inspectionContract集合
*/
- public List<InspectionContract> selectInspectionContractList(InspectionContract inspectionContract);
+ public IPage<InspectionContract> selectInspectionContractList(Page<InspectionContract> page, InspectionContract inspectionContract);
/**
* 新增inspectionContract
@@ -60,5 +62,5 @@ public interface IInspectionContractService extends IService<InspectionContract
* @return 结果
*/
public int deleteInspectionContractById(Long id);
- List<InspectionContract> partnerGetWtList(InspectionContract inspectionContract);
+ IPage<InspectionContract> partnerGetWtList(Page<InspectionContract> 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<ContractHistory> selectContractHistoryList(ContractHistory contractHistory)
+ public IPage<ContractHistory> selectContractHistoryList(Page<ContractHistory> 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<InspectionContrac
* @return inspectionContract
*/
@Override
- public List<InspectionContract> selectInspectionContractList(InspectionContract inspectionContract)
+ public IPage<InspectionContract> selectInspectionContractList(Page<InspectionContract> page, InspectionContract inspectionContract)
{
- return baseMapper.selectInspectionContractList(inspectionContract);
+ return baseMapper.selectInspectionContractList(page,inspectionContract);
}
/**
@@ -97,8 +100,8 @@ public class InspectionContractServiceImpl extends ServiceImpl<InspectionContrac
}
@Override
- public List<InspectionContract> partnerGetWtList(InspectionContract inspectionContract) {
- return contractHistoryMapper.partnerGetWtList(inspectionContract);
+ public IPage<InspectionContract> partnerGetWtList(Page<InspectionContract> 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<AppSwiper> list = appSwiperService.selectAppSwiperList(appSwiper);
+ Page<AppSwiper> page = new Page<>(pageNum, pageSize);
+ IPage<AppSwiper> 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<PartnerListVo> list = shopInspectionGoodsService.homePartner(longitude,latitude);
- return getDataTable(list);
+ Page<PartnerListVo> page = new Page<>(pageNum, pageSize);
+ IPage<PartnerListVo> 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<InspectionNews> page = new Page<>(pageNum, pageSize);
- List<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews);
- return getDataTable(list);
+ IPage<InspectionNews> 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<InspectionNews> page = new Page<>(pageNum, pageSize);
- List<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews);
- return getDataTable(list);
+ IPage<InspectionNews> 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<InspectionNewsComment> page = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<InspectionNewsComment> queryWrapper =new LambdaQueryWrapper<>();
queryWrapper.eq(InspectionNewsComment::getNewsId,newsId).orderByDesc(TenantBaseDO::getCreateTime);
- List<InspectionNewsComment> commentList = commentService.list(queryWrapper);
- return getDataTable(commentList);
+ IPage<InspectionNewsComment> 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<InspectionNews> newsList = inspectionNewsService.collectionNews(newsName);
- return getDataTable(newsList);
+ Page<InspectionNews> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionNews> 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<InspectionNews> news = inspectionNewsService.msgList(partnerId);
- return getDataTable(news);
+ Page<InspectionNews> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionNews> 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<OrderInfo> 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<OrderInfo> page = new Page<>(pageNum, pageSize);
+ IPage<OrderInfo> 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<InspectionInfo> 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<InspectionInfo> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionInfo> 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<InspectionInfo> 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<InspectionInfo> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionInfo> 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<PartnerListVo> list = partnerList.partnerList(partnerListQuery);
- return getDataTable(list);
+ Page<PartnerListVo> page = new Page<>(pageNum, pageSize);
+ IPage<PartnerListVo> 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<AdminUserDO> dbList = ownService.getDbList(searchValue);
- return getDataTable(dbList);
+ Page<AdminUserDO> page = new Page<>(pageNum, pageSize);
+ IPage<AdminUserDO> 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<DelInspectionInfo> list = delInspectionInfoService.selectDelInspectionInfoList(delInspectionInfo);
- return getDataTable(list);
+ Page<DelInspectionInfo> page = new Page<>(pageNum, pageSize);
+ IPage<DelInspectionInfo> 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<DelInspectionInfo> list = delInspectionInfoService.selectDelInspectionInfoList(delInspectionInfo);
+ Page<DelInspectionInfo> page = new Page<>(pageNum, pageSize);
+ IPage<DelInspectionInfo> list = delInspectionInfoService.selectDelInspectionInfoList(page,delInspectionInfo);
ExcelUtil<DelInspectionInfo> util = new ExcelUtil<DelInspectionInfo>(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<InspectionAppointment> list = inspectionAppointmentService.selectInspectionAppointmentList(inspectionAppointment);
- return getDataTable(list);
+ Page<InspectionAppointment> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionAppointment> 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<InspectionAppointment> list = inspectionAppointmentService.selectInspectionAppointmentList(inspectionAppointment);
+ Page<InspectionAppointment> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionAppointment> list = inspectionAppointmentService.selectInspectionAppointmentList(page,inspectionAppointment);
ExcelUtil<InspectionAppointment> util = new ExcelUtil<InspectionAppointment>(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<InspectionCategoryTemplate> list = inspectionCategoryTemplateService.selectInspectionCategoryTemplateList(inspectionCategoryTemplate);
- return getDataTable(list);
+ Page<InspectionCategoryTemplate> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionCategoryTemplate> 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<InspectionCategoryTemplate> list = inspectionCategoryTemplateService.selectInspectionCategoryTemplateList(inspectionCategoryTemplate);
+ Page<InspectionCategoryTemplate> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionCategoryTemplate> list = inspectionCategoryTemplateService.selectInspectionCategoryTemplateList(page,inspectionCategoryTemplate);
ExcelUtil<InspectionCategoryTemplate> util = new ExcelUtil<InspectionCategoryTemplate>(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 a008ed6c..af3c0ae5 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
@@ -1,23 +1,18 @@
package cn.iocoder.yudao.module.inspection.controller;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
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 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 cn.iocoder.yudao.module.core.controller.BaseController;
import cn.iocoder.yudao.module.inspection.entity.InspectionFile;
+import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService;
import cn.iocoder.yudao.module.inspection.service.IInspectionFileService;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
+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.*;
+
+import javax.servlet.http.HttpServletResponse;
/**
* inspectionFileController
@@ -38,27 +33,32 @@ 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();
+ Page<InspectionFile> page = new Page<>(pageNum, pageSize);
// 使用MyBatis-Plus的分页查询，将结果转换为Page对象
- List<InspectionFile> list = inspectionFileService.selectInspectionFileList(inspectionFile);
+ IPage<InspectionFile> list = inspectionFileService.selectInspectionFileList(page,inspectionFile);
- return getDataTable(list);
+ 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<InspectionFile> list = inspectionFileService.selectInspectionFileList(inspectionFile);
+ Page<InspectionFile> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionFile> list = inspectionFileService.selectInspectionFileList(page,inspectionFile);
ExcelUtil<InspectionFile> util = new ExcelUtil<InspectionFile>(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<InspectionGoodsSku> 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<InspectionGoodsSku> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionGoodsSku> 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<InspectionInfo> list = inspectionInfoService.selectInspectionInfoList(inspectionInfo);
- return getDataTable(list);
+ Page<InspectionInfo> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionInfo> 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<InspectionInfo> list = inspectionInfoService.selectInspectionInfoList(inspectionInfo);
+ Page<InspectionInfo> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionInfo> list = inspectionInfoService.selectInspectionInfoList(page,inspectionInfo);
ExcelUtil<InspectionInfo> util = new ExcelUtil<InspectionInfo>(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 cecc8251..4d5d3018 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
@@ -28,7 +28,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;
@@ -66,12 +65,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<ShopMallPartners> page = new Page<>(pageNum, pageSize);
- List<ShopMallPartners> list = shopMallPartnersService.selectShopMallPartnersList(page,shopMallPartners);
- return getDataTable(list);
+ IPage<ShopMallPartners> list = shopMallPartnersService.selectShopMallPartnersList(page,shopMallPartners);
+ return success(list);
}
@@ -79,13 +80,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<OrderInfo> page = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<OrderInfo> 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<OrderInfo> list = orderInfoService.list(queryWrapper);
- return getDataTable(list);
+
+ IPage<OrderInfo> 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<InspectionNewsAssociation> list = inspectionNewsAssociationService.selectInspectionNewsAssociationList(inspectionNewsAssociation);
- return getDataTable(list);
+ Page<InspectionNewsAssociation> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionNewsAssociation> 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<InspectionNewsAssociation> list = inspectionNewsAssociationService.selectInspectionNewsAssociationList(inspectionNewsAssociation);
+ Page<InspectionNewsAssociation> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionNewsAssociation> list = inspectionNewsAssociationService.selectInspectionNewsAssociationList(page,inspectionNewsAssociation);
ExcelUtil<InspectionNewsAssociation> util = new ExcelUtil<InspectionNewsAssociation>(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<InspectionNewsComment> list = inspectionNewsCommentService.selectInspectionNewsCommentList(inspectionNewsComment);
- return getDataTable(list);
+ Page<InspectionNewsComment> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionNewsComment> 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<InspectionNewsComment> list = inspectionNewsCommentService.selectInspectionNewsCommentList(inspectionNewsComment);
+ Page<InspectionNewsComment> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionNewsComment> list = inspectionNewsCommentService.selectInspectionNewsCommentList(page,inspectionNewsComment);
ExcelUtil<InspectionNewsComment> util = new ExcelUtil<InspectionNewsComment>(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<InspectionNews> page = new Page<>(pageNum, pageSize);
- List<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews);
- return getDataTable(list);
+ IPage<InspectionNews> 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<InspectionPickCar> list = inspectionPickCarService.selectInspectionPickCarList(inspectionPickCar);
- return getDataTable(list);
+ Page<InspectionPickCar> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionPickCar> 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<InspectionPickCar> list = inspectionPickCarService.selectInspectionPickCarList(inspectionPickCar);
+ Page<InspectionPickCar> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionPickCar> list = inspectionPickCarService.selectInspectionPickCarList(page,inspectionPickCar);
ExcelUtil<InspectionPickCar> util = new ExcelUtil<InspectionPickCar>(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..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
@@ -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;
@@ -85,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));
}
/**
* 检测线图
@@ -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<GoodsVo> list = partnerList.goodsList(partnerId, isListing, goodsTitle);
- return getDataTable(list);
+ Page<GoodsVo> page = new Page<>(pageNum, pageSize);
+ IPage<GoodsVo> 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<PartnerBalanceDetail> details = partnerList.accountDetail(partnerId,pageNum,pageSize);
- return getDataTable(details);
+ Page<PartnerBalanceDetail> page = new Page<>(pageNum, pageSize);
+ IPage<PartnerBalanceDetail> 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<OrderAppDetail> orderInfos = partnerList.orderList(partnerId,phoneNum, title);
- return getDataTable(orderInfos);
+ Page<OrderAppDetail> page = new Page<>(pageNum, pageSize);
+ IPage<OrderAppDetail> 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<OrderInfo> orderInfos = partnerList.validationList(partnerId,searchValue);
- return getDataTable(orderInfos);
+ Page<OrderInfo> page = new Page<>(pageNum, pageSize);
+ IPage<OrderInfo> 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<ShopCouponTemplate> shopCouponTemplates = partnerList.listCoupon(partnerId, searchValue);
- return getDataTable(shopCouponTemplates);
+ Page<ShopCouponTemplate> page = new Page<>(pageNum, pageSize);
+ IPage<ShopCouponTemplate> 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<PartnerWorker> 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<InspectionPickCar> pickCarList = partnerList.getPickCarListOfWorker(worker.getId(),phoneNum);
- return getDataTable(pickCarList);
+ Page<InspectionPickCar> page = new Page<>(pageNum, pageSize);
+ IPage<InspectionPickCar> 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<ShopInspectionGoods> page = new Page<>(pageNum, pageSize);
- List<ShopInspectionGoods> list = shopInspectionGoodsService.listSystem(page,shopInspectionGoods);
- return getDataTable(list);
+ IPage<ShopInspectionGoods> 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<ShopInspectionGoods> list = shopInspectionGoodsService.listPartnerGoods(shopInspectionGoods);
- return getDataTable(list);
+ Page<ShopInspectionGoods> page = new Page<>(pageNum, pageSize);
+ IPage<ShopInspectionGoods> 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<ShopInspectionGoods> list = shopInspectionGoodsService.selectShopInspectionGoodsListWx(shopInspectionGoods);
- return getDataTable(list);
+ Page<ShopInspectionGoods> page = new Page<>(pageNum, pageSize);
+ IPage<ShopInspectionGoods> 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<SiteInfo> page = new Page<>(pageNum, pageSize);
- List<SiteInfo> list = siteInfoService.selectSiteInfoList(page,siteInfo);
- return getDataTable(list);
+ IPage<SiteInfo> 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<SiteInfo> page = new Page<>();
- List<SiteInfo> list = siteInfoService.selectSiteInfoList(page,siteInfo);
+ IPage<SiteInfo> list = siteInfoService.selectSiteInfoList(page,siteInfo);
ExcelUtil<SiteInfo> util = new ExcelUtil<SiteInfo>(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<ShopInspectionGoods> {
- List<PartnerListVo> homePartners(@Param("longitude") Double longitude, @Param("latitude")Double latitude);
+ IPage<PartnerListVo> homePartners(Page<PartnerListVo> page, @Param("longitude") Double longitude, @Param("latitude")Double latitude);
List<GoodsVo> 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> {
ShopMallPartners selectById(@Param("id") Long id);
- List<PartnerListVo> partnerList(PartnerListQuery partnerListQuery);
+ IPage<PartnerListVo> partnerList(Page<PartnerListVo> 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<ShopMallPartners>
Integer allAmount(@Param("partnerId") Long partnerId);
Integer todayAmount(@Param("partnerId") Long partnerId,@Param("timeStr") String timeStr);
List<HotGoodsVo> hotGoodsList(@Param("partnerId") Long partnerId,@Param("dateStr")String dateStr);
- List<GoodsVo> manageGoodsList(@Param("partnerId") Long partnerId, @Param("isListing")String isListing,@Param("goodsTitle") String goodsTitle);
- List<OrderAppDetail> orderList(@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum,@Param("title") String title);
+ IPage<GoodsVo> manageGoodsList(Page<GoodsVo> page,@Param("partnerId") Long partnerId, @Param("isListing")String isListing,@Param("goodsTitle") String goodsTitle);
+ IPage<OrderAppDetail> orderList(Page<OrderAppDetail> page,@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum,@Param("title") String title);
List<PartnerWorker> getWorkList(@Param("partnerId")Long partnerId, @Param("postId") Long postId, @Param("workName") String workName, @Param("phoneNum")String phoneNum);
IPage<PartnerWorker> pageWorkList(@Param("partnerId")Long partnerId, @Param("postId") Long postId, @Param("workName") String workName, @Param("phoneNum")String phoneNum,Page<LabelRespVO> page);
IPage<InspectionInfo> inspectionList(Page<InspectionInfo> page,@Param("partnerId")Long partnerId, @Param("status") String status, @Param("carNum")String carNum);
List<InspectionInfo> workerInspectionList(@Param("workerId")Long workerId,@Param("status") String status, @Param("searchValue")String searchValue);
- List<OrderInfo> validationList(@Param("partnerId") Long partnerId, @Param("searchValue") String searchValue);
+ IPage<OrderInfo> validationList(Page<OrderInfo> page, @Param("partnerId") Long partnerId, @Param("searchValue") String searchValue);
IPage<InspectionPickCar> getPickCarList(Page page,@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum, @Param("pickStatus") String pickStatus);
- List<InspectionPickCar> getPickCarListOfWorker(@Param("workerId") Long workerId, @Param("phoneNum") String phoneNum);
+ IPage<InspectionPickCar> getPickCarListOfWorker(Page<InspectionPickCar> page,@Param("workerId") Long workerId, @Param("phoneNum") String phoneNum);
List<OrderInfo> chartInfoAmount(@Param("startTime") String startTime,@Param("endTime")String endTime,@Param("partnerId")Long partnerId);
List<OrderInfo> 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<DelInspectionInfo> selectDelInspectionInfoList(DelInspectionInfo delInspectionInfo);
+ public IPage<DelInspectionInfo> selectDelInspectionInfoList(Page<DelInspectionInfo> 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<InspectionAppoin
* @param inspectionAppointment 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
- public List<InspectionAppointment> selectInspectionAppointmentList(InspectionAppointment inspectionAppointment);
+ public IPage<InspectionAppointment> selectInspectionAppointmentList(Page<InspectionAppointment> 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<Inspectio
* @param inspectionCategoryTemplate 分类模版
* @return 分类模版集合
*/
- public List<InspectionCategoryTemplate> selectInspectionCategoryTemplateList(InspectionCategoryTemplate inspectionCategoryTemplate);
+ public IPage<InspectionCategoryTemplate> selectInspectionCategoryTemplateList(Page<InspectionCategoryTemplate> 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<InspectionFile>
* @param inspectionFile inspectionFile
* @return inspectionFile集合
*/
- public List<InspectionFile> selectInspectionFileList(InspectionFile inspectionFile);
+ public IPage<InspectionFile> selectInspectionFileList(Page<InspectionFile> 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<InspectionInfo>
* @param inspectionInfo 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
- public List<InspectionInfo> selectInspectionInfoList(InspectionInfo inspectionInfo);
+ public IPage<InspectionInfo> selectInspectionInfoList(Page<InspectionInfo> 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<InspectionNe
* @param inspectionNewsAssociation 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
- public List<InspectionNewsAssociation> selectInspectionNewsAssociationList(InspectionNewsAssociation inspectionNewsAssociation);
+ public IPage<InspectionNewsAssociation> selectInspectionNewsAssociationList(Page<InspectionNewsAssociation> 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<InspectionNewsC
* @param inspectionNewsComment 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
- public List<InspectionNewsComment> selectInspectionNewsCommentList(InspectionNewsComment inspectionNewsComment);
+ public IPage<InspectionNewsComment> selectInspectionNewsCommentList(Page<InspectionNewsComment> 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<InspectionNews>
* @param inspectionNews 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
- public List<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page, @Param("vo") InspectionNews inspectionNews);
+ public IPage<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page, @Param("vo") InspectionNews inspectionNews);
/**
* 新增【请填写功能名称】
@@ -77,8 +79,8 @@ public interface InspectionNewsMapper extends BaseMapper<InspectionNews>
//新增阅读数量
void addReadNum(Long id);
- List<InspectionNews> collectionNews(@Param("userId") Long userId,@Param("newsName")String newsName);
+ IPage<InspectionNews> collectionNews(Page<InspectionNews> page, @Param("userId") Long userId,@Param("newsName")String newsName);
Integer newMsgNum(@Param("partnerId") Long partnerId);
- List<InspectionNews> msgList(@Param("partnerId") Long partnerId);
+ IPage<InspectionNews> msgList(Page<InspectionNews> page, @Param("partnerId") Long partnerId);
List<String> 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<InspectionPickCar>
* @param inspectionPickCar 上门取车服务
* @return 上门取车服务集合
*/
- public List<InspectionPickCar> selectInspectionPickCarList(InspectionPickCar inspectionPickCar);
+ public IPage<InspectionPickCar> selectInspectionPickCarList(Page<InspectionPickCar> 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<ShopInspectionGood
* @param shopInspectionGoods 检测商品
* @return 检测商品集合
*/
- public List<ShopInspectionGoods> selectShopInspectionGoodsListWx(ShopInspectionGoods shopInspectionGoods);
+ public IPage<ShopInspectionGoods> selectShopInspectionGoodsListWx(Page<ShopInspectionGoods> page,@Param("vo") ShopInspectionGoods shopInspectionGoods);
- List<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,@Param("vo") ShopInspectionGoods shopInspectionGoods);
- List<ShopInspectionGoods> listPartnerGoods(ShopInspectionGoods shopInspectionGoods);
+ IPage<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,@Param("vo") ShopInspectionGoods shopInspectionGoods);
+ IPage<ShopInspectionGoods> listPartnerGoods(Page<ShopInspectionGoods> page,@Param("vo") ShopInspectionGoods shopInspectionGoods);
int deleteByList(List<Long> 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<SiteInfo> selectSiteInfoList(Page<SiteInfo> page,@Param("vo") SiteInfo siteInfo);
+ public IPage<SiteInfo> selectSiteInfoList(Page<SiteInfo> 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<ShopInspectionGoods> {
- List<PartnerListVo> homePartner(Double longitude, Double latitude);
+ IPage<PartnerListVo> homePartner(Page<PartnerListVo> page, Double longitude, Double latitude);
List<ShopInspectionCategory> categoryList();
List<GoodsVo> 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<OrderInfo> {
OrderAppDetail orderDetailApp(Long orderId);
- List<InspectionInfo> inspectionList(String status);
+ IPage<InspectionInfo> inspectionList(Page<InspectionInfo> page, String status);
InspectionInfoVo inspectionDetail(Long inspectionInfoId);
JSONObject statisticsTop();
List<JSONObject> statisticsMid();
@@ -23,7 +25,7 @@ public interface AppInspectionOrderService extends IService<OrderInfo> {
List<JSONObject> statisticsOrder();
List<JSONObject> getPartnerList(String partnerName);
- List<InspectionInfo> governmentInspectionList(String carNum,String status,String partnerId);
+ IPage<InspectionInfo> governmentInspectionList(Page<InspectionInfo> 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<ShopMallPartners> {
- List<PartnerListVo> partnerList(PartnerListQuery partnerListQuery);
+ IPage<PartnerListVo> partnerList(Page<PartnerListVo> page, PartnerListQuery partnerListQuery);
List<ShopInspectionCategory> categoryList(Long partnerId);
PartnerListVo shopDetail(PartnerListQuery partnerListQuery);
void addSalesNum(Long partnerId);
@@ -46,7 +46,7 @@ public interface AppInspectionPartnerService extends IService<ShopMallPartners>
List<OrderInfo> orderInfo(Long partnerId);
List<HotGoodsVo> hotGoodsList(Long partnerId);
void addGoods(ShopInspectionGoods goods) throws Exception;
- List<GoodsVo> goodsList(Long partnerId, String isListing, String goodsTitle);
+ IPage<GoodsVo> goodsList(Page<GoodsVo> page,Long partnerId, String isListing, String goodsTitle);
List<JSONObject> canUseGoods(Long partnerId);
ShopInspectionGoods goodsDetail(Long goodsId);
void editGoods(ShopInspectionGoods goods) throws Exception;
@@ -57,8 +57,8 @@ public interface AppInspectionPartnerService extends IService<ShopMallPartners>
void editPartnerInfo(ShopMallPartners partners);
PartnerVo getPartnerInfo(Long partnerId);
PartnerBalance accountInfo(Long partnerId);
- List<PartnerBalanceDetail> accountDetail(Long partnerId, Integer pageNum, Integer pageSize);
- List<OrderAppDetail> orderList(Long partnerId,String phoneNum, String title);
+ IPage<PartnerBalanceDetail> accountDetail(Page<PartnerBalanceDetail> page,Long partnerId, Integer pageNum, Integer pageSize);
+ IPage<OrderAppDetail> orderList(Page<OrderAppDetail> 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<ShopMallPartners>
void stopInspection(InspectionInfo info) throws Exception;
void makeCertOk(Long inspectionId);
IPage<InspectionAppointment> getAppointmentList(Page<InspectionAppointment> page,Long partnerId,String phoneNum);
- List<OrderInfo> validationList(Long partnerId,String searchValue);
+ IPage<OrderInfo> validationList(Page<OrderInfo> page,Long partnerId,String searchValue);
void sendCoupon(ShopCouponTemplate template) throws Exception;
- List<ShopCouponTemplate> listCoupon(Long partnerId,String searchValue);
+ IPage<ShopCouponTemplate> listCoupon(Page<ShopCouponTemplate> page,Long partnerId,String searchValue);
void delCoupon(Long partnerId,Long id);
void designatePickCarWorker(Long pickCarId,Long workerId);
IPage<InspectionPickCar> getPickCarList(Page page,Long partnerId, String phoneNum,String pickStatus);
InspectionPickCar getPickCarDetail(Long dataId);
- List<InspectionPickCar> getPickCarListOfWorker(Long workerId, String phoneNum);
+ IPage<InspectionPickCar> getPickCarListOfWorker(Page<InspectionPickCar> 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<ShopUserCar> getCars();
List<ShopUserCar> getCanInspectionCars();
- List<AdminUserDO> getDbList(String searchValue);
+ List<AdminUserDO> getDbList(Page<AdminUserDO> page, String searchValue);
+ IPage<AdminUserDO> getDbListTow(Page<AdminUserDO> page, String searchValue);
List<ShopUserCar> 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<DelInspectionInfo> selectDelInspectionInfoList(DelInspectionInfo delInspectionInfo);
+ public IPage<DelInspectionInfo> selectDelInspectionInfoList(Page<DelInspectionInfo> 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<InspectionAppoi
* @param inspectionAppointment 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
- public List<InspectionAppointment> selectInspectionAppointmentList(InspectionAppointment inspectionAppointment);
+ public IPage<InspectionAppointment> selectInspectionAppointmentList(Page<InspectionAppointment> 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<Inspection
* @param inspectionCategoryTemplate 分类模版
* @return 分类模版集合
*/
- public List<InspectionCategoryTemplate> selectInspectionCategoryTemplateList(InspectionCategoryTemplate inspectionCategoryTemplate);
+ public IPage<InspectionCategoryTemplate> selectInspectionCategoryTemplateList(Page<InspectionCategoryTemplate> 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 a4feffc3..f97a3821 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
@@ -1,11 +1,9 @@
package cn.iocoder.yudao.module.inspection.service;
-import java.util.List;
-
+import cn.iocoder.yudao.module.inspection.entity.InspectionFile;
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;
/**
* inspectionFileService接口
@@ -23,13 +21,6 @@ public interface IInspectionFileService extends IService<InspectionFile>
*/
public InspectionFile selectInspectionFileById(Long id);
- /**
- * 查询inspectionFile列表
- *
- * @param inspectionFile inspectionFile
- * @return inspectionFile集合
- */
- public List<InspectionFile> selectInspectionFileList(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<InspectionInfo>
* @param inspectionInfo 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
- public List<InspectionInfo> selectInspectionInfoList(InspectionInfo inspectionInfo);
+ public IPage<InspectionInfo> selectInspectionInfoList(Page<InspectionInfo> 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<InspectionN
* @param inspectionNewsAssociation 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
- public List<InspectionNewsAssociation> selectInspectionNewsAssociationList(InspectionNewsAssociation inspectionNewsAssociation);
+ public IPage<InspectionNewsAssociation> selectInspectionNewsAssociationList(Page<InspectionNewsAssociation> 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<InspectionNewsCo
* @param inspectionNewsComment 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
- public List<InspectionNewsComment> selectInspectionNewsCommentList(InspectionNewsComment inspectionNewsComment);
+ public IPage<InspectionNewsComment> selectInspectionNewsCommentList(Page<InspectionNewsComment> 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<InspectionNews>
* @param inspectionNews 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
- public List<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page,InspectionNews inspectionNews);
+ public IPage<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page, InspectionNews inspectionNews);
List<InspectionNews> appHomeNewsList();
List<String> listGfClass(String type);
@@ -84,8 +86,8 @@ public interface IInspectionNewsService extends IService<InspectionNews>
void addReadNum(Long id,Long objectId);
InspectionNews getDetail(Long newsId);
- List<InspectionNews> collectionNews(String newsName);
+ IPage<InspectionNews> collectionNews(Page<InspectionNews> page, String newsName);
Integer newMsgNum(Long partnerId);
- List<InspectionNews> msgList(Long partnerId);
+ IPage<InspectionNews> msgList(Page<InspectionNews> 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<InspectionPickCar>
* @param inspectionPickCar 上门取车服务
* @return 上门取车服务集合
*/
- public List<InspectionPickCar> selectInspectionPickCarList(InspectionPickCar inspectionPickCar);
+ public IPage<InspectionPickCar> selectInspectionPickCarList(Page<InspectionPickCar> 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<ShopInspectionGood
* @param shopInspectionGoods 检测商品
* @return 检测商品集合
*/
- public List<ShopInspectionGoods> selectShopInspectionGoodsListWx(ShopInspectionGoods shopInspectionGoods);
+ public IPage<ShopInspectionGoods> selectShopInspectionGoodsListWx(Page<ShopInspectionGoods> page, ShopInspectionGoods shopInspectionGoods);
/**
* 新增检测商品
@@ -79,9 +80,9 @@ public interface IShopInspectionGoodsService extends IService<ShopInspectionGood
* @param shopInspectionGoods 检测商品
* @return 检测商品集合
*/
- public List<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods);
+ public IPage<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods);
- public List<ShopInspectionGoods> listPartnerGoods(ShopInspectionGoods shopInspectionGoods) throws Exception;
+ public IPage<ShopInspectionGoods> listPartnerGoods(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods) throws Exception;
List<ShopInspectionCategory> categoryList() throws Exception;
void partnerAddGoods(ShopInspectionGoods shopInspectionGoods) throws Exception;
List<ShopInspectionGoods> 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<SiteInfo> selectSiteInfoList(Page<SiteInfo> page,SiteInfo siteInfo);
+ public IPage<SiteInfo> selectSiteInfoList(Page<SiteInfo> 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<AppInspectionGood
@Override
- public List<PartnerListVo> homePartner(Double longitude, Double latitude) {
- List<PartnerListVo> partnerListVos = baseMapper.homePartners(longitude,latitude);
- partnerListVos.forEach(item->{
+ public IPage<PartnerListVo> homePartner(Page<PartnerListVo> page, Double longitude, Double latitude) {
+ IPage<PartnerListVo> 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<OrderInfoMapper,
}
@Override
- public List<InspectionInfo> inspectionList(String status) {
+ public IPage<InspectionInfo> inspectionList(Page<InspectionInfo> 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<OrderInfoMapper,
}
@Override
- public List<InspectionInfo> governmentInspectionList(String carNum, String status, String partnerId) {
- return baseMapper.governmentInspectionList(carNum,status,partnerId);
+ public IPage<InspectionInfo> governmentInspectionList(Page<InspectionInfo> 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..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
@@ -119,11 +119,11 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
private RoleService roleService;
@Override
- public List<PartnerListVo> partnerList(PartnerListQuery partnerListQuery) {
+ public IPage<PartnerListVo> partnerList(Page<PartnerListVo> page, PartnerListQuery partnerListQuery) {
if (null!=partnerListQuery.getDistance()){
partnerListQuery.setDistance(partnerListQuery.getDistance()*1000);
}
- List<PartnerListVo> partnerListVos = baseMapper.partnerList(partnerListQuery);
+ IPage<PartnerListVo> partnerListVos = baseMapper.partnerList(page,partnerListQuery);
return partnerListVos;
}
@@ -234,10 +234,6 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
@Override
public StatisticsInfo statisticsInfo(Long partnerId) {
LoginUser user = SecurityFrameworkUtils.getLoginUser();
- ShopMallPartners partners = baseMapper.selectById(partnerId);
- if (!partners.getUserId().equals(user.getId())){
- return null;
- }
StatisticsInfo statisticsInfo2 = baseMapper.orderNum(partnerId, DateUtil.format(new Date(),"yyyy-MM-dd"));
//合规且合格双燃料
Integer i = baseMapper.srlNum(partnerId, DateUtil.format(new Date(), "yyyy-MM-dd"));
@@ -702,8 +698,8 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
}
@Override
- public List<GoodsVo> goodsList(Long partnerId, String isListing, String goodsTitle) {
- return baseMapper.manageGoodsList(partnerId,isListing,goodsTitle);
+ public IPage<GoodsVo> goodsList(Page<GoodsVo> page,Long partnerId, String isListing, String goodsTitle) {
+ return baseMapper.manageGoodsList(page,partnerId,isListing,goodsTitle);
}
@Override
@@ -874,7 +870,7 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
}
@Override
- public List<PartnerBalanceDetail> accountDetail(Long partnerId, Integer pageNum, Integer pageSize) {
+ public IPage<PartnerBalanceDetail> accountDetail(Page<PartnerBalanceDetail> page,Long partnerId, Integer pageNum, Integer pageSize) {
LoginUser user = SecurityFrameworkUtils.getLoginUser();
ShopMallPartners partnersTmp = baseMapper.selectById(partnerId);
if (!partnersTmp.getUserId().equals(user.getId())){
@@ -883,15 +879,15 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
LambdaQueryWrapper<PartnerBalance> queryWrapper =new LambdaQueryWrapper<>();
queryWrapper.eq(PartnerBalance::getPartnerId,partnerId);
PartnerBalance one = partnerBalanceService.getOne(queryWrapper);
- PageHelper.startPage(pageNum, pageSize);
+
LambdaQueryWrapper<PartnerBalanceDetail> queryWrapper1 =new LambdaQueryWrapper<>();
queryWrapper1.eq(PartnerBalanceDetail::getPartnerBalanceId,one.getId()).orderByDesc(PartnerBalanceDetail::getChangeTime);
- return detailService.list(queryWrapper1);
+ return detailService.page(page,queryWrapper1);
}
@Override
- public List<OrderAppDetail> orderList(Long partnerId,String phoneNum, String title) {
- return baseMapper.orderList(partnerId,phoneNum,title);
+ public IPage<OrderAppDetail> orderList(Page<OrderAppDetail> page,Long partnerId,String phoneNum, String title) {
+ return baseMapper.orderList(page,partnerId,phoneNum,title);
}
@Override
@@ -1247,9 +1243,9 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
}
@Override
- public List<OrderInfo> validationList(Long partnerId,String searchValue) {
+ public IPage<OrderInfo> validationList(Page<OrderInfo> page, Long partnerId,String searchValue) {
- return baseMapper.validationList(partnerId,searchValue);
+ return baseMapper.validationList(page,partnerId,searchValue);
}
@Override
@@ -1285,12 +1281,12 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
}
@Override
- public List<ShopCouponTemplate> listCoupon(Long partnerId, String searchValue) {
+ public IPage<ShopCouponTemplate> listCoupon(Page<ShopCouponTemplate> page,Long partnerId, String searchValue) {
LambdaQueryWrapper<ShopCouponTemplate> 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 +1326,8 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
}
@Override
- public List<InspectionPickCar> getPickCarListOfWorker(Long workerId, String phoneNum) {
- return baseMapper.getPickCarListOfWorker(workerId,phoneNum);
+ public IPage<InspectionPickCar> getPickCarListOfWorker(Page<InspectionPickCar> 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<AdminUserDO> getDbList(String searchValue) {
+ public List<AdminUserDO> getDbList(Page<AdminUserDO> page, String searchValue) {
String roleCode = "jcdb";
return userService.getUsersByRoleRescue(roleCode,searchValue,null);
}
-
+ @Override
+ public IPage<AdminUserDO> getDbListTow(Page<AdminUserDO> page, String searchValue) {
+ String roleCode = "jcdb";
+ return userService.getUsersByRoleRescueTow(page,roleCode,searchValue,null);
+ }
@Override
public List<ShopUserCar> 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<DelInspectionInfo> selectDelInspectionInfoList(DelInspectionInfo delInspectionInfo)
+ public IPage<DelInspectionInfo> selectDelInspectionInfoList(Page<DelInspectionInfo> 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<InspectionAppo
* @return 【请填写功能名称】
*/
@Override
- public List<InspectionAppointment> selectInspectionAppointmentList(InspectionAppointment inspectionAppointment)
+ public IPage<InspectionAppointment> selectInspectionAppointmentList(Page<InspectionAppointment> 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<Inspectio
* @return 分类模版
*/
@Override
- public List<InspectionCategoryTemplate> selectInspectionCategoryTemplateList(InspectionCategoryTemplate inspectionCategoryTemplate)
+ public IPage<InspectionCategoryTemplate> selectInspectionCategoryTemplateList(Page<InspectionCategoryTemplate> 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 0200c521..986eb6a0 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
@@ -1,22 +1,21 @@
package cn.iocoder.yudao.module.inspection.service.impl;
-import java.util.Arrays;
-import java.util.List;
-
import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.module.inspection.entity.InspectionFile;
+import cn.iocoder.yudao.module.inspection.entity.WarnMessage;
+import cn.iocoder.yudao.module.inspection.mapper.InspectionFileMapper;
+import cn.iocoder.yudao.module.inspection.service.IInspectionFileService;
+import cn.iocoder.yudao.module.inspection.service.IWarnMessageService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
-import cn.iocoder.yudao.module.inspection.service.IWarnMessageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import cn.iocoder.yudao.module.inspection.mapper.InspectionFileMapper;
-import cn.iocoder.yudao.module.inspection.entity.InspectionFile;
-import cn.iocoder.yudao.module.inspection.service.IInspectionFileService;
+
+import java.util.Arrays;
+import java.util.List;
/**
* inspectionFileService业务层处理
@@ -42,17 +41,6 @@ public class InspectionFileServiceImpl extends ServiceImpl<InspectionFileMapper,
return baseMapper.selectInspectionFileById(id);
}
- /**
- * 查询inspectionFile列表
- *
- * @param inspectionFile inspectionFile
- * @return inspectionFile
- */
- @Override
- public List<InspectionFile> selectInspectionFileList(InspectionFile inspectionFile)
- {
- return baseMapper.selectInspectionFileList(inspectionFile);
- }
/**
* 新增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<InspectionInfoMapper,
* @return 【请填写功能名称】
*/
@Override
- public List<InspectionInfo> selectInspectionInfoList(InspectionInfo inspectionInfo)
+ public IPage<InspectionInfo> selectInspectionInfoList(Page<InspectionInfo> 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<Inspection
* @return 【请填写功能名称】
*/
@Override
- public List<InspectionNewsAssociation> selectInspectionNewsAssociationList(InspectionNewsAssociation inspectionNewsAssociation)
+ public IPage<InspectionNewsAssociation> selectInspectionNewsAssociationList(Page<InspectionNewsAssociation> 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<InspectionNews
* @return 【请填写功能名称】
*/
@Override
- public List<InspectionNewsComment> selectInspectionNewsCommentList(InspectionNewsComment inspectionNewsComment)
+ public IPage<InspectionNewsComment> selectInspectionNewsCommentList(Page<InspectionNewsComment> 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<InspectionNewsMapper,
* @return 【请填写功能名称】
*/
@Override
- public List<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page, InspectionNews inspectionNews)
+ public IPage<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page, InspectionNews inspectionNews)
{
if (null!=inspectionNews.getPublishUnit() && inspectionNews.getPublishUnit().equals("检测站公告")){
inspectionNews.setCategory("jczgg");
inspectionNews.setPublishUnit(null);
}
- List<InspectionNews> list = baseMapper.selectInspectionNewsList(page,inspectionNews);
- list.forEach(it->{
+ IPage<InspectionNews> 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<InspectionNewsMapper,
}
@Override
- public List<InspectionNews> collectionNews(String newsName) {
+ public IPage<InspectionNews> collectionNews(Page<InspectionNews> 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<InspectionNewsMapper,
@Override
@TenantIgnore
- public List<InspectionNews> msgList(Long partnerId) {
- List<InspectionNews> news = baseMapper.msgList(partnerId);
- news.forEach(it->{
+ public IPage<InspectionNews> msgList(Page<InspectionNews> page, Long partnerId) {
+ IPage<InspectionNews> 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<InspectionPickCarM
* @return 上门取车服务
*/
@Override
- public List<InspectionPickCar> selectInspectionPickCarList(InspectionPickCar inspectionPickCar)
+ public IPage<InspectionPickCar> selectInspectionPickCarList(Page<InspectionPickCar> 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<ShopInspectionGo
* @return 检测商品
*/
@Override
- public List<ShopInspectionGoods> selectShopInspectionGoodsListWx(ShopInspectionGoods shopInspectionGoods)
+ public IPage<ShopInspectionGoods> selectShopInspectionGoodsListWx(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods)
{
//默认蓝安的id为888
ShopConfig shopConfig = configService.selectShopConfigById(1L);
//获取最高会员的优惠折扣
BigDecimal inspectionPlatinum = shopConfig.getInspectionPlatinum();
Double ratio = inspectionPlatinum.divide(BigDecimal.valueOf(10)).doubleValue();
- List<ShopInspectionGoods> shopInspectionRes = baseMapper.selectShopInspectionGoodsListWx(shopInspectionGoods);
- for (ShopInspectionGoods good : shopInspectionRes) {
+ IPage<ShopInspectionGoods> 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<ShopInspectionGo
}
//后台管理的列表查询部分
@Override
- public List<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods) {
+ public IPage<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods) {
return baseMapper.listSystem(page,shopInspectionGoods);
}
@Override
- public List<ShopInspectionGoods> listPartnerGoods(ShopInspectionGoods shopInspectionGoods) throws Exception {
+ public IPage<ShopInspectionGoods> listPartnerGoods(Page<ShopInspectionGoods> 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<SiteInfo> selectSiteInfoList(Page<SiteInfo> page,SiteInfo siteInfo)
+ public IPage<SiteInfo> selectSiteInfoList(Page<SiteInfo> page, SiteInfo siteInfo)
{
- List<SiteInfo> siteInfos = siteInfoMapper.selectSiteInfoList(page,siteInfo);
- for (SiteInfo info : siteInfos) {
+ IPage<SiteInfo> 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 571e076d..f5e30b46 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,6 +2,8 @@ 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.text.Convert;
+import cn.iocoder.yudao.module.core.text.ServletUtils;
import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService;
import cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo;
import cn.iocoder.yudao.module.partner.service.IPartnerCustomerInfoService;
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<FzRecord> page = new Page<>(pageNum, pageSize);
- List<FzRecord> list = fzRecordService.selectFzRecordList(page,fzRecord);
- return getDataTable(list);
+ IPage<FzRecord> 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<FzRecord> page = new Page<>();
- List<FzRecord> list = fzRecordService.selectFzRecordList(page,fzRecord);
+ Page<FzRecord> page = new Page<>(pageNum,pageSize);
+ IPage<FzRecord> list = fzRecordService.selectFzRecordList(page,fzRecord);
ExcelUtil<FzRecord> util = new ExcelUtil<FzRecord>(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<OrderInfo> 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<OrderInfo> page = new Page<>(pageNum, pageSize);
+ IPage<OrderInfo> 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<OrderInfo> page = new Page<>(pageNum, pageSize);
- List<OrderInfo> list = orderInfoService.validationListWx(page);
- return getDataTable(list);
+ IPage<OrderInfo> 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<OrderInfo> page = new Page<>(pageNum, pageSize);
- List<OrderInfo> list = orderInfoService.validationListPc(page);
- return getDataTable(list);
+ IPage<OrderInfo> 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<OrderInfo> 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<OrderInfo> page = new Page<>(pageNum, pageSize);
+ IPage<OrderInfo> 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<commentVo> commentOrderList = orderInfoService.getCommentOrderList(partnerId);
- return getDataTable(commentOrderList);
+ Page<commentVo> page = new Page<>(pageNum, pageSize);
+ IPage<commentVo> 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<OrderInfo> list = orderInfoService.orderListPc(orderInfo);
- return getDataTable(list);
+ Page<OrderInfo> page = new Page<>(pageNum, pageSize);
+ IPage<OrderInfo> 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<FzRecord>
* @param fzRecord 分账记录
* @return 分账记录集合
*/
- public List<FzRecord> selectFzRecordList(Page<FzRecord> page,@Param("vo") FzRecord fzRecord);
+ public IPage<FzRecord> selectFzRecordList(Page<FzRecord> 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<OrderInfo> {
- List<OrderInfo> orderListApp(@Param("userId") Long userId, @Param("status") String status, @Param("title") String title, @Param("type") String type);
+ IPage<OrderInfo> orderListApp(Page<OrderInfo> 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<OrderInfo> {
List<JSONObject> statisticsMid();
- List<InspectionInfo> inspectionList(@Param("status") String status, @Param("userId") Long userId);
+ IPage<InspectionInfo> inspectionList(Page<InspectionInfo> page, @Param("status") String status, @Param("userId") Long userId);
- List<OrderInfo> orderListSystem(OrderInfo orderInfo);
+ IPage<OrderInfo> orderListSystem(Page<OrderInfo> page,@Param("vo") OrderInfo orderInfo);
/**
* 分页查询订单
@@ -51,18 +51,18 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
List<JSONObject> getPartnerList(@Param("partnerName") String partnerName);
- List<InspectionInfo> governmentInspectionList(@Param("carNum") String carNum, @Param("status") String status, @Param("partnerId") String partnerId);
+ IPage<InspectionInfo> governmentInspectionList(Page<InspectionInfo> page, @Param("carNum") String carNum, @Param("status") String status, @Param("partnerId") String partnerId);
- List<OrderInfo> orderList(@Param("userId") Long userId, @Param("status") String status, @Param("title") String title);
+ IPage<OrderInfo> orderList(Page<OrderInfo> page,@Param("userId") Long userId, @Param("status") String status, @Param("title") String title);
- List<OrderInfo> validationListWx(Page<OrderInfo> page, @Param("validationUserId") Long validationUserId);
+ IPage<OrderInfo> validationListWx(Page<OrderInfo> page, @Param("validationUserId") Long validationUserId);
- List<OrderInfo> validationListPc(Page<OrderInfo> page, Long partnerId);
+ IPage<OrderInfo> validationListPc(Page<OrderInfo> page, Long partnerId);
Integer getNoCommentOrder(@Param("userId") Long userId);
- List<commentVo> getCommentOrderList(@Param("partnerId") Long partnerId);
+ IPage<commentVo> getCommentOrderList(Page<commentVo> page, @Param("partnerId") Long partnerId);
- List<OrderInfo> orderListPc(OrderInfo orderInfo);
+ IPage<OrderInfo> orderListPc(Page<OrderInfo> 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<FzRecord>
* @param fzRecord 分账记录
* @return 分账记录集合
*/
- public List<FzRecord> selectFzRecordList(Page<FzRecord> page,FzRecord fzRecord);
+ public IPage<FzRecord> selectFzRecordList(Page<FzRecord> 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 ee2db49d..a1eb3ad7 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
@@ -24,7 +24,7 @@ import java.util.Map;
public interface OrderInfoService extends IService<OrderInfo> {
void reviewOrder(String orderId, Integer starLevel, String reviewStr) throws Exception;
- List<OrderInfo> orderListApp(String status, String title, String type);
+ IPage<OrderInfo> orderListApp(Page<OrderInfo> page, String status, String title, String type);
List<InspectionInfo> workOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime);
@@ -36,7 +36,7 @@ public interface OrderInfoService extends IService<OrderInfo> {
IPage<InspectionInfo> pageDelworkOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime,Page<InspectionInfo> page);
- List<OrderInfo> orderListSystem(OrderInfo orderInfo);
+ IPage<OrderInfo> orderListSystem(Page<OrderInfo> page,OrderInfo orderInfo);
/**
* 分页查询订单
@@ -60,7 +60,7 @@ public interface OrderInfoService extends IService<OrderInfo> {
void cancelPay(Long orderId);
- List<OrderInfo> orderList(String status, String title);
+ IPage<OrderInfo> orderList(Page<OrderInfo> page,String status, String title);
String validation(String accessCode);
@@ -68,17 +68,17 @@ public interface OrderInfoService extends IService<OrderInfo> {
String validationMall(String accessCode);
- List<OrderInfo> validationListWx(Page<OrderInfo> page);
+ IPage<OrderInfo> validationListWx(Page<OrderInfo> page);
- List<OrderInfo> validationListPc(Page<OrderInfo> page);
+ IPage<OrderInfo> validationListPc(Page<OrderInfo> page);
Integer commentOrder(OrderInfo orderInfo);
Integer getNoCommentOrder();
- List<commentVo> getCommentOrderList(Long partnerId);
+ IPage<commentVo> getCommentOrderList(Page<commentVo> page,Long partnerId);
- List<OrderInfo> orderListPc(OrderInfo orderInfo);
+ IPage<OrderInfo> orderListPc(Page<OrderInfo> 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<FzRecordMapper, FzRecord> i
* @return 分账记录
*/
@Override
- public List<FzRecord> selectFzRecordList(Page<FzRecord> page,FzRecord fzRecord)
+ public IPage<FzRecord> selectFzRecordList(Page<FzRecord> 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 bb9278b2..06fcf979 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<OrderInfoMapper, OrderInfo
}
}
@Override
- public List<OrderInfo> orderListApp(String status, String title, String type) {
+ public IPage<OrderInfo> orderListApp(Page<OrderInfo> 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<OrderInfoMapper, OrderInfo
}
@Override
- public List<OrderInfo> orderListSystem(OrderInfo orderInfo) {
- return baseMapper.orderListSystem(orderInfo);
+ public IPage<OrderInfo> orderListSystem(Page<OrderInfo> page,OrderInfo orderInfo) {
+ return baseMapper.orderListSystem(page,orderInfo);
}
/**
@@ -712,10 +712,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
}
@Override
- public List<OrderInfo> orderList(String status, String title) {
+ public IPage<OrderInfo> orderList(Page<OrderInfo> page,String status, String title) {
LoginUser user = SecurityFrameworkUtils.getLoginUser();
- return baseMapper.orderList(user.getId(), status, title);
+ return baseMapper.orderList(page,user.getId(), status, title);
}
/**
@@ -802,13 +802,13 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
}
@Override
- public List<OrderInfo> validationListWx(Page<OrderInfo> page) {
+ public IPage<OrderInfo> validationListWx(Page<OrderInfo> page) {
return baseMapper.validationListWx(page,SecurityFrameworkUtils.getLoginUserId());
}
// pc端核销记录 商城
@Override
- public List<OrderInfo> validationListPc(Page<OrderInfo> page) {
+ public IPage<OrderInfo> validationListPc(Page<OrderInfo> page) {
ShopMallPartners shopMallPartners = shopMallPartnersService.selectShopMallPartnersByUserId(SecurityFrameworkUtils.getLoginUserId(),"sc");
Long partnerId = shopMallPartners.getPartnerId();
return baseMapper.validationListPc(page,partnerId);
@@ -829,13 +829,13 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
}
@Override
- public List<commentVo> getCommentOrderList(Long partnerId) {
- return baseMapper.getCommentOrderList(partnerId);
+ public IPage<commentVo> getCommentOrderList(Page<commentVo> page, Long partnerId) {
+ return baseMapper.getCommentOrderList(page,partnerId);
}
@Override
- public List<OrderInfo> orderListPc(OrderInfo orderInfo) {
- return baseMapper.orderListPc(orderInfo);
+ public IPage<OrderInfo> orderListPc(Page<OrderInfo> 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<PartnerDetail> page = new Page<>(pageNum, pageSize);
- List<PartnerDetail> list = partnerDetailService.selectPartnerDetailList(page,partnerDetail);
- return getDataTable(list);
+ IPage<PartnerDetail> 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<PartnerDetail> page = new Page<>();
- List<PartnerDetail> list = partnerDetailService.selectPartnerDetailList(page,partnerDetail);
+ Page<PartnerDetail> page = new Page<>(pageNum, pageSize);
+ IPage<PartnerDetail> list = partnerDetailService.selectPartnerDetailList(page,partnerDetail);
ExcelUtil<PartnerDetail> util = new ExcelUtil<PartnerDetail>(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<ShopCoupon> page = new Page<>(pageNum, pageSize);
- List<ShopCoupon> list = shopCouponService.selectShopCouponList(page,shopCoupon);
- return getDataTable(list);
+ IPage<ShopCoupon> 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<ShopCoupon> page = new Page<>();
- List<ShopCoupon> list = shopCouponService.selectShopCouponList(page,shopCoupon);
+ Page<ShopCoupon> page = new Page<>(pageNum, pageSize);
+ IPage<ShopCoupon> list = shopCouponService.selectShopCouponList(page,shopCoupon);
ExcelUtil<ShopCoupon> util = new ExcelUtil<ShopCoupon>(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<ShopCoupon> list = shopCouponService.selectShopCouponByUserId(shopCoupon);
- return getDataTable(list);
+ Page<ShopCoupon> page = new Page<>(pageNum, pageSize);
+ IPage<ShopCoupon> 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<ShopCoupon> 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<ShopCoupon> list = shopCouponService.availableCouponsListByUserId(shopCoupon);
- return getDataTable(list);
+ Page<ShopCoupon> page = new Page<>(pageNum, pageSize);
+ IPage<ShopCoupon> 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<ShopCoupon> 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<ShopCoupon> page = new Page<>(pageNum, pageSize);
- List<ShopCoupon> list = shopCouponService.unAvailableCouponsListByUserId(shopCoupon);
- return getDataTable(list);
+ IPage<ShopCoupon> 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<ShopCouponTemplate> page = new Page<>(pageNum, pageSize);
- List<ShopCouponTemplate> list = shopCouponTemplateService.selectShopCouponTemplateList(page,shopCouponTemplate);
- return getDataTable(list);
+ IPage<ShopCouponTemplate> 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<ShopCouponTemplate> page = new Page<>();
- List<ShopCouponTemplate> list = shopCouponTemplateService.selectShopCouponTemplateList(page,shopCouponTemplate);
+ Page<ShopCouponTemplate> page = new Page<>(pageNum, pageSize);
+ IPage<ShopCouponTemplate> list = shopCouponTemplateService.selectShopCouponTemplateList(page,shopCouponTemplate);
ExcelUtil<ShopCouponTemplate> util = new ExcelUtil<ShopCouponTemplate>(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<ShopUserCar> page = new Page<>(pageNum, pageSize);
- List<ShopUserCar> list = shopUserCarService.selectShopUserCarList(page,shopUserCar);
- return getDataTable(list);
+ IPage<ShopUserCar> 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<ShopUserCar> page = new Page<>(pageNum, pageSize);
- List<ShopUserCar> list = shopUserCarService.selectShopUserCarList(page,shopUserCar);
- return getDataTable(list);
+ IPage<ShopUserCar> 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<ShopUserCar> page = new Page<>();
- List<ShopUserCar> list = shopUserCarService.selectShopUserCarList(page,shopUserCar);
+ Page<ShopUserCar> page = new Page<>(pageNum,pageSize);
+ IPage<ShopUserCar> list = shopUserCarService.selectShopUserCarList(page,shopUserCar);
ExcelUtil<ShopUserCar> util = new ExcelUtil<ShopUserCar>(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<PartnerDetail> selectPartnerDetailList(Page<PartnerDetail> page,@Param("vo") PartnerDetail partnerDetail);
+ public IPage<PartnerDetail> selectPartnerDetailList(Page<PartnerDetail> 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<ShopCoupon>
* @param shopCoupon 优惠券
* @return 优惠券集合
*/
- public List<ShopCoupon> selectShopCouponList(Page<ShopCoupon> page,@Param("vo") ShopCoupon shopCoupon);
+ public IPage<ShopCoupon> selectShopCouponList(Page<ShopCoupon> page, @Param("vo") ShopCoupon shopCoupon);
/**
* 新增优惠券
@@ -68,11 +69,11 @@ public interface ShopCouponMapper extends BaseMapper<ShopCoupon>
*/
public int deleteShopCouponByCouponIds(Long[] couponIds);
- List<ShopCoupon> selectShopCouponByUserId(ShopCoupon shopCoupon);
+ IPage<ShopCoupon> selectShopCouponByUserId(Page<ShopCoupon> page, @Param("vo") ShopCoupon shopCoupon);
- List<ShopCoupon> availableCouponsListByUserId(ShopCoupon shopCoupon);
+ IPage<ShopCoupon> availableCouponsListByUserId(Page<ShopCoupon> page, @Param("vo") ShopCoupon shopCoupon);
- List<ShopCoupon> unAvailableCouponsListByUserId(ShopCoupon shopCoupon);
+ IPage<ShopCoupon> unAvailableCouponsListByUserId(Page<ShopCoupon> page, @Param("vo") ShopCoupon shopCoupon);
List<ShopCoupon> 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<ShopCouponTemplate>
* @param shopCouponTemplate 优惠券模板
* @return 优惠券模板集合
*/
- public List<ShopCouponTemplate> selectShopCouponTemplateList(Page<ShopCouponTemplate> page,@Param("vo") ShopCouponTemplate shopCouponTemplate);
+ public IPage<ShopCouponTemplate> selectShopCouponTemplateList(Page<ShopCouponTemplate> page,@Param("vo") ShopCouponTemplate shopCouponTemplate);
/**
* 新增优惠券模板
@@ -64,5 +65,5 @@ public interface ShopCouponTemplateMapper extends BaseMapper<ShopCouponTemplate>
* @return 结果
*/
public int deleteShopCouponTemplateByIds(Long[] ids);
- List<ShopCouponTemplate> listCoupon(@Param("partnerId") Long partnerId,@Param("searchValue") String searchValue);
+ IPage<ShopCouponTemplate> listCoupon(Page<ShopCouponTemplate> 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<ShopMallPartners>
* @param shopMallPartners 合作商管理
* @return 合作商管理集合
*/
- public List<ShopMallPartners> selectShopMallPartnersList(Page<ShopMallPartners> page, @Param("shop") ShopMallPartners shopMallPartners);
+ public IPage<ShopMallPartners> selectShopMallPartnersList(Page<ShopMallPartners> 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<ShopUserCar>
* @param shopUserCar 用户车辆
* @return 用户车辆集合
*/
- public List<ShopUserCar> selectShopUserCarList(Page<ShopUserCar> page,@Param("vo") ShopUserCar shopUserCar);
+ public IPage<ShopUserCar> selectShopUserCarList(Page<ShopUserCar> 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<PartnerDetail> selectPartnerDetailList(Page<PartnerDetail> page,PartnerDetail partnerDetail);
+ public IPage<PartnerDetail> selectPartnerDetailList(Page<PartnerDetail> 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<ShopCoupon>
* @param shopCoupon 优惠券
* @return 优惠券集合
*/
- public List<ShopCoupon> selectShopCouponList(Page<ShopCoupon> page,ShopCoupon shopCoupon);
+ public IPage<ShopCoupon> selectShopCouponList(Page<ShopCoupon> page, ShopCoupon shopCoupon);
/**
* 新增优惠券
@@ -65,11 +67,11 @@ public interface IShopCouponService extends IService<ShopCoupon>
*/
public int deleteShopCouponByCouponId(Long couponId);
- public List<ShopCoupon> selectShopCouponByUserId(ShopCoupon shopCoupon);
+ public IPage<ShopCoupon> selectShopCouponByUserId(Page<ShopCoupon> page, ShopCoupon shopCoupon);
- public List<ShopCoupon> availableCouponsListByUserId(ShopCoupon shopCoupon);
+ public IPage<ShopCoupon> availableCouponsListByUserId(Page<ShopCoupon> page, ShopCoupon shopCoupon);
- public List<ShopCoupon> unAvailableCouponsListByUserId(ShopCoupon shopCoupon);
+ public IPage<ShopCoupon> unAvailableCouponsListByUserId(Page<ShopCoupon> 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<ShopCouponTemplate
* @param shopCouponTemplate 优惠券模板
* @return 优惠券模板集合
*/
- public List<ShopCouponTemplate> selectShopCouponTemplateList(Page<ShopCouponTemplate> page,ShopCouponTemplate shopCouponTemplate);
+ public IPage<ShopCouponTemplate> selectShopCouponTemplateList(Page<ShopCouponTemplate> page,ShopCouponTemplate shopCouponTemplate);
/**
* 新增优惠券模板
@@ -61,5 +62,5 @@ public interface IShopCouponTemplateService extends IService<ShopCouponTemplate
* @return 结果
*/
public int deleteShopCouponTemplateById(Long id);
- List<ShopCouponTemplate> listCoupon(Long partnerId, String searchValue);
+ IPage<ShopCouponTemplate> listCoupon(Page<ShopCouponTemplate> 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<ShopMallPartners>
* @param shopMallPartners 合作商管理
* @return 合作商管理集合
*/
- public List<ShopMallPartners> selectShopMallPartnersList(Page<ShopMallPartners> page, ShopMallPartners shopMallPartners);
+ public IPage<ShopMallPartners> selectShopMallPartnersList(Page<ShopMallPartners> 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<ShopUserCar>
* @param shopUserCar 用户车辆
* @return 用户车辆集合
*/
- public List<ShopUserCar> selectShopUserCarList(Page<ShopUserCar> page,ShopUserCar shopUserCar);
+ public IPage<ShopUserCar> selectShopUserCarList(Page<ShopUserCar> 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<PartnerDetail> selectPartnerDetailList(Page<PartnerDetail> page,PartnerDetail partnerDetail)
+ public IPage<PartnerDetail> selectPartnerDetailList(Page<PartnerDetail> 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<ShopCouponMapper,ShopCoup
* @return 优惠券
*/
@Override
- public List<ShopCoupon> selectShopCouponList(Page<ShopCoupon> page,ShopCoupon shopCoupon)
+ public IPage<ShopCoupon> selectShopCouponList(Page<ShopCoupon> page, ShopCoupon shopCoupon)
{
return baseMapper.selectShopCouponList(page,shopCoupon);
}
@@ -206,19 +207,19 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper,ShopCoup
}
/* 我的优惠券 */
@Override
- public List<ShopCoupon> selectShopCouponByUserId(ShopCoupon shopCoupon){
- return baseMapper.selectShopCouponByUserId(shopCoupon);
+ public IPage<ShopCoupon> selectShopCouponByUserId(Page<ShopCoupon> page, ShopCoupon shopCoupon){
+ return baseMapper.selectShopCouponByUserId(page,shopCoupon);
};
/* 可用优惠券 */
@Override
- public List<ShopCoupon> availableCouponsListByUserId(ShopCoupon shopCoupon){
- return baseMapper.availableCouponsListByUserId(shopCoupon);
+ public IPage<ShopCoupon> availableCouponsListByUserId(Page<ShopCoupon> page, ShopCoupon shopCoupon){
+ return baseMapper.availableCouponsListByUserId(page,shopCoupon);
};
/* 不可用优惠券 */
@Override
- public List<ShopCoupon> unAvailableCouponsListByUserId(ShopCoupon shopCoupon){
- return baseMapper.unAvailableCouponsListByUserId(shopCoupon);
+ public IPage<ShopCoupon> unAvailableCouponsListByUserId(Page<ShopCoupon> 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<ShopCouponTemplat
* @return 优惠券模板
*/
@Override
- public List<ShopCouponTemplate> selectShopCouponTemplateList(Page<ShopCouponTemplate> page,ShopCouponTemplate shopCouponTemplate)
+ public IPage<ShopCouponTemplate> selectShopCouponTemplateList(Page<ShopCouponTemplate> page,ShopCouponTemplate shopCouponTemplate)
{
return baseMapper.selectShopCouponTemplateList(page,shopCouponTemplate);
}
@@ -95,7 +96,7 @@ public class ShopCouponTemplateServiceImpl extends ServiceImpl<ShopCouponTemplat
}
@Override
- public List<ShopCouponTemplate> listCoupon(Long partnerId, String searchValue) {
- return baseMapper.listCoupon(partnerId,searchValue);
+ public IPage<ShopCouponTemplate> listCoupon(Page<ShopCouponTemplate> 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<ShopMallPartnersMap
* @return 合作商管理
*/
@Override
- public List<ShopMallPartners> selectShopMallPartnersList(Page<ShopMallPartners> page, ShopMallPartners shopMallPartners)
+ public IPage<ShopMallPartners> selectShopMallPartnersList(Page<ShopMallPartners> 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<ShopUserCarMapper,ShopUs
* @return 用户车辆
*/
@Override
- public List<ShopUserCar> selectShopUserCarList(Page<ShopUserCar> page,ShopUserCar shopUserCar)
+ public IPage<ShopUserCar> selectShopUserCarList(Page<ShopUserCar> 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
<where>
- <if test="phoneNum != null "> and su.phonenumber like concat('%',#{phoneNum},'%') </if>
- <if test="realName != null "> and su.real_name = #{realName}</if>
+ <if test="vo.phoneNum != null "> and su.phonenumber like concat('%',#{vo.phoneNum},'%') </if>
+ <if test="vo.realName != null "> and su.real_name = #{vo.realName}</if>
</where>
</select>
@@ -99,21 +99,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
`inspection_contract`
WHERE 1=1
- <if test="bren !=null and bren!=''">
- and bren like CONCAT('%',#{bren},'%')
+ <if test="vo.bren !=null and vo.bren!=''">
+ and bren like CONCAT('%',#{vo.bren},'%')
</if>
- <if test="brphone !=null and brphone!=''">
- and brphone like CONCAT('%',#{brphone},'%')
+ <if test="vo.brphone !=null and vo.brphone!=''">
+ and brphone like CONCAT('%',#{vo.brphone},'%')
</if>
- <if test="wtr !=null and wtr!=''">
- and wtr like CONCAT('%',#{wtr},'%')
+ <if test="vo.wtr !=null and vo.wtr!=''">
+ and wtr like CONCAT('%',#{vo.wtr},'%')
</if>
- <if test="wtrphone !=null and wtrphone!=''">
- and wtrphone like CONCAT('%',#{wtrphone},'%')
+ <if test="vo.wtrphone !=null and vo.wtrphone!=''">
+ and wtrphone like CONCAT('%',#{vo.wtrphone},'%')
</if>
- <if test="carnum !=null and carnum!=''">
- and carnum like CONCAT('%',#{carnum},'%')
+ <if test="vo.carnum !=null and vo.carnum!=''">
+ and carnum like CONCAT('%',#{vo.carnum},'%')
</if>
</select>
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..cf88c4c2 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
- <if test="distance!=null">
- and ROUND(ST_Distance_Sphere (POINT (#{longitude}, #{latitude}),POINT (smp.longitude, smp.latitude ))) <![CDATA[<=]]> #{distance}*1000
+ <if test="vo.distance!=null">
+ and ROUND(ST_Distance_Sphere (POINT (#{vo.longitude}, #{vo.latitude}),POINT (smp.longitude, smp.latitude ))) <![CDATA[<=]]> #{vo.distance}*1000
</if>
- <if test="categoryId!=null and categoryId!=''">
- and sig.goods_category_id = #{categoryId}
+ <if test="vo.categoryId!=null and vo.categoryId!=''">
+ and sig.goods_category_id = #{vo.categoryId}
</if>
- <if test="searchValue!=null and searchValue!=''">
- and (smp.partner_name like concat('%',#{searchValue},'%') or sig.title like concat('%',#{searchValue},'%') )
+ <if test="vo.searchValue!=null and vo.searchValue!=''">
+ and (smp.partner_name like concat('%',#{vo.searchValue},'%') or sig.title like concat('%',#{vo.searchValue},'%') )
</if>
GROUP BY
smp.partner_id
<choose>
- <when test="orderType!=null and orderType!='' and orderType == 'jl'">
+ <when test="vo.orderType!=null and vo.orderType!='' and vo.orderType == 'jl'">
order by distance asc,smp.order_num
</when>
- <when test="orderType!=null and orderType!='' and orderType == 'hp'">
+ <when test="vo.orderType!=null and vo.orderType!='' and vo.orderType == 'hp'">
order by smp.average_score desc,smp.order_num
</when>
- <when test="orderType!=null and orderType!='' and orderType == 'xl'">
+ <when test="vo.orderType!=null and vo.orderType!='' and vo.orderType == 'xl'">
order by smp.sales_num desc,smp.order_num
</when>
<otherwise>
@@ -91,7 +91,7 @@
FROM
inspection_info info
INNER JOIN order_info oi ON info.inspection_order_id = oi.id
- WHERE oi.partner_id = #{partnerId} and info.end_time like CONCAT(#{timeStr},'%')
+ WHERE info.end_time like CONCAT(#{timeStr},'%')
and info.is_pass ='1' and oi.goods_title like concat('%','双燃料','%')
</select>
<select id="hgNum" resultType="java.lang.Integer">
@@ -100,7 +100,7 @@
FROM
inspection_info info
INNER JOIN order_info oi ON info.inspection_order_id = oi.id
- WHERE oi.partner_id = #{partnerId} and info.end_time like CONCAT(#{timeStr},'%')
+ WHERE info.end_time like CONCAT(#{timeStr},'%')
and info.is_pass ='1'
</select>
<select id="orderNum" resultType="cn.iocoder.yudao.module.inspection.vo.StatisticsInfo">
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"
<select id="selectDelInspectionInfoList" parameterType="cn.iocoder.yudao.module.inspection.entity.DelInspectionInfo" resultMap="DelInspectionInfoResult">
<include refid="selectDelInspectionInfoVo"/>
<where>
- <if test="inspectionOrderId != null "> and inspection_order_id = #{inspectionOrderId}</if>
- <if test="userId != null "> and user_id = #{userId}</if>
- <if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
- <if test="buyName != null and buyName != ''"> and buy_name like concat('%', #{buyName}, '%')</if>
- <if test="buyPhone != null and buyPhone != ''"> and buy_phone = #{buyPhone}</if>
- <if test="userAddress != null and userAddress != ''"> and user_address = #{userAddress}</if>
- <if test="unitName != null and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
- <if test="partnerId != null "> and partner_id = #{partnerId}</if>
- <if test="workId != null "> and work_id = #{workId}</if>
- <if test="workerName != null and workerName != ''"> and worker_name like concat('%', #{workerName}, '%')</if>
- <if test="workerPhone != null and workerPhone != ''"> and worker_phone = #{workerPhone}</if>
- <if test="workerAvatar != null and workerAvatar != ''"> and worker_avatar = #{workerAvatar}</if>
- <if test="categoryId != null "> and category_id = #{categoryId}</if>
- <if test="carNum != null and carNum != ''"> and car_num = #{carNum}</if>
- <if test="carModel != null and carModel != ''"> and car_model = #{carModel}</if>
- <if test="carNature != null and carNature != ''"> and car_nature = #{carNature}</if>
- <if test="carStatus != null and carStatus != ''"> and car_status = #{carStatus}</if>
- <if test="carIdNo != null and carIdNo != ''"> and car_id_no = #{carIdNo}</if>
- <if test="isPass != null and isPass != ''"> and is_pass = #{isPass}</if>
- <if test="isRetrial != null and isRetrial != ''"> and is_retrial = #{isRetrial}</if>
- <if test="customerSource != null and customerSource != ''"> and customer_source = #{customerSource}</if>
- <if test="status != null and status != ''"> and status = #{status}</if>
- <if test="startTime != null "> and start_time = #{startTime}</if>
- <if test="endTime != null "> and end_time = #{endTime}</if>
- <if test="makeCert != null and makeCert != ''"> and make_cert = #{makeCert}</if>
- <if test="year != null and year != ''"> and year = #{year}</if>
- <if test="month != null and month != ''"> and month = #{month}</if>
- <if test="day != null and day != ''"> and day = #{day}</if>
- <if test="nextMaintenanceDate != null "> and next_maintenance_date = #{nextMaintenanceDate}</if>
- <if test="nextInspectionDate != null "> and next_inspection_date = #{nextInspectionDate}</if>
- <if test="otherPhone != null and otherPhone != ''"> and other_phone = #{otherPhone}</if>
- <if test="driverLicenesImg != null and driverLicenesImg != ''"> and driver_licenes_img = #{driverLicenesImg}</if>
- <if test="isPayOnline != null and isPayOnline != ''"> and is_pay_online = #{isPayOnline}</if>
- <if test="isPickCar != null and isPickCar != ''"> and is_pick_car = #{isPickCar}</if>
+ <if test="vo.inspectionOrderId != null "> and inspection_order_id = #{vo.inspectionOrderId}</if>
+ <if test="vo.userId != null "> and user_id = #{vo.userId}</if>
+ <if test="vo.userName != null and userName != ''"> and user_name like concat('%', #{vo.userName}, '%')</if>
+ <if test="vo.buyName != null and buyName != ''"> and buy_name like concat('%', #{vo.buyName}, '%')</if>
+ <if test="vo.buyPhone != null and buyPhone != ''"> and buy_phone = #{vo.buyPhone}</if>
+ <if test="vo.userAddress != null and userAddress != ''"> and user_address = #{vo.userAddress}</if>
+ <if test="vo.unitName != null and unitName != ''"> and unit_name like concat('%', #{vo.unitName}, '%')</if>
+ <if test="vo.partnerId != null "> and partner_id = #{vo.partnerId}</if>
+ <if test="vo.workId != null "> and work_id = #{vo.workId}</if>
+ <if test="vo.workerName != null and workerName != ''"> and worker_name like concat('%', #{vo.workerName}, '%')</if>
+ <if test="vo.workerPhone != null and workerPhone != ''"> and worker_phone = #{vo.workerPhone}</if>
+ <if test="vo.workerAvatar != null and workerAvatar != ''"> and worker_avatar = #{vo.workerAvatar}</if>
+ <if test="vo.categoryId != null "> and category_id = #{vo.categoryId}</if>
+ <if test="vo.carNum != null and carNum != ''"> and car_num = #{vo.carNum}</if>
+ <if test="vo.carModel != null and carModel != ''"> and car_model = #{vo.carModel}</if>
+ <if test="vo.carNature != null and carNature != ''"> and car_nature = #{vo.carNature}</if>
+ <if test="vo.carStatus != null and carStatus != ''"> and car_status = #{vo.carStatus}</if>
+ <if test="vo.carIdNo != null and carIdNo != ''"> and car_id_no = #{vo.carIdNo}</if>
+ <if test="vo.isPass != null and isPass != ''"> and is_pass = #{vo.isPass}</if>
+ <if test="vo.isRetrial != null and isRetrial != ''"> and is_retrial = #{vo.isRetrial}</if>
+ <if test="vo.customerSource != null and customerSource != ''"> and customer_source = #{vo.customerSource}</if>
+ <if test="vo.status != null and status != ''"> and status = #{vo.status}</if>
+ <if test="vo.startTime != null "> and start_time = #{vo.startTime}</if>
+ <if test="vo.endTime != null "> and end_time = #{vo.endTime}</if>
+ <if test="vo.makeCert != null and makeCert != ''"> and make_cert = #{vo.makeCert}</if>
+ <if test="vo.year != null and year != ''"> and year = #{vo.year}</if>
+ <if test="vo.month != null and month != ''"> and month = #{vo.month}</if>
+ <if test="vo.day != null and day != ''"> and day = #{vo.day}</if>
+ <if test="vo.nextMaintenanceDate != null "> and next_maintenance_date = #{vo.nextMaintenanceDate}</if>
+ <if test="vo.nextInspectionDate != null "> and next_inspection_date = #{vo.nextInspectionDate}</if>
+ <if test="vo.otherPhone != null and otherPhone != ''"> and other_phone = #{vo.otherPhone}</if>
+ <if test="vo.driverLicenesImg != null and driverLicenesImg != ''"> and driver_licenes_img = #{vo.driverLicenesImg}</if>
+ <if test="vo.isPayOnline != null and isPayOnline != ''"> and is_pay_online = #{vo.isPayOnline}</if>
+ <if test="vo.isPickCar != null and isPickCar != ''"> and is_pick_car = #{vo.isPickCar}</if>
</where>
</select>
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"
<select id="selectInspectionAppointmentList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionAppointment" resultMap="InspectionAppointmentResult">
<include refid="selectInspectionAppointmentVo"/>
<where>
- <if test="partnerId != null "> and partner_id = #{partnerId}</if>
- <if test="orderId != null "> and order_id = #{orderId}</if>
- <if test="goodsTitle != null and goodsTitle != ''"> and goods_title = #{goodsTitle}</if>
- <if test="appointmentDay != null "> and appointment_day = #{appointmentDay}</if>
- <if test="appointmentPeriod != null and appointmentPeriod != ''"> and appointment_period = #{appointmentPeriod}</if>
+ <if test="vo.partnerId != null "> and partner_id = #{vo.partnerId}</if>
+ <if test="vo.orderId != null "> and order_id = #{vo.orderId}</if>
+ <if test="vo.goodsTitle != null and vo.goodsTitle != ''"> and goods_title = #{vo.goodsTitle}</if>
+ <if test="vo.appointmentDay != null "> and appointment_day = #{vo.appointmentDay}</if>
+ <if test="vo.appointmentPeriod != null and vo.appointmentPeriod != ''"> and appointment_period = #{vo.appointmentPeriod}</if>
</where>
</select>
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"
<select id="selectInspectionCategoryTemplateList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionCategoryTemplate" resultMap="InspectionCategoryTemplateResult">
<include refid="selectInspectionCategoryTemplateVo"/>
<where>
- <if test="categoryId != null "> and category_id = #{categoryId}</if>
- <if test="skuName != null and skuName != ''"> and sku_name like concat('%', #{skuName}, '%')</if>
- <if test="skuPrice != null "> and sku_price = #{skuPrice}</if>
+ <if test="vo.categoryId != null "> and category_id = #{vo.categoryId}</if>
+ <if test="vo.skuName != null and vo.skuName != ''"> and sku_name like concat('%', #{vo.skuName}, '%')</if>
+ <if test="vo.skuPrice != null "> and sku_price = #{vo.skuPrice}</if>
</where>
</select>
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"
<select id="selectInspectionFileList" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionFile">
select * from inspection_file
<where>
- and partner_id = #{partnerId}
+ and partner_id = #{vo.partnerId}
<choose>
- <when test="fatherId != null and fatherId != ''">
- and father_id = #{fatherId}
+ <when test="vo.fatherId != null and vo.fatherId != ''">
+ and father_id = #{vo.fatherId}
</when>
<otherwise>
and father_id is null
</otherwise>
</choose>
- <if test="type != null and type != ''"> and type = #{type}</if>
- <if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
+ <if test="vo.type != null and vo.type != ''"> and type = #{vo.type}</if>
+ <if test="vo.fileName != null and vo.fileName != ''"> and file_name like concat('%', #{vo.fileName}, '%')</if>
<if test="params.beginWarnTime != null and params.beginWarnTime != '' and params.endWarnTime != null and params.endWarnTime != ''"> and warn_time between #{params.beginWarnTime} and #{params.endWarnTime}</if>
</where>
order by `type` ASC,create_time desc
diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml
index d7b2881c..95b8d5de 100644
--- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml
+++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml
@@ -30,17 +30,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInspectionInfoList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionInfo" resultMap="InspectionInfoResult">
<include refid="selectInspectionInfoVo"/>
<where>
- <if test="inspectionOrderId != null "> and inspection_order_id = #{inspectionOrderId}</if>
- <if test="workId != null "> and work_id = #{workId}</if>
- <if test="workerName != null and workerName != ''"> and worker_name like concat('%', #{workerName}, '%')</if>
- <if test="workerPhone != null and workerPhone != ''"> and worker_phone = #{workerPhone}</if>
- <if test="isPass != null and isPass != ''"> and is_pass = #{isPass}</if>
- <if test="status != null and status != ''"> and status = #{status}</if>
- <if test="startTime != null "> and start_time = #{startTime}</if>
- <if test="endTime != null "> and end_time = #{endTime}</if>
- <if test="year != null and year != ''"> and year = #{year}</if>
- <if test="month != null and month != ''"> and month = #{month}</if>
- <if test="day != null and day != ''"> and day = #{day}</if>
+ <if test="vo.inspectionOrderId != null "> and inspection_order_id = #{vo.inspectionOrderId}</if>
+ <if test="vo.workId != null "> and work_id = #{vo.workId}</if>
+ <if test="vo.workerName != null and vo.workerName != ''"> and worker_name like concat('%', #{vo.workerName}, '%')</if>
+ <if test="vo.workerPhone != null and vo.workerPhone != ''"> and worker_phone = #{vo.workerPhone}</if>
+ <if test="vo.isPass != null and vo.isPass != ''"> and is_pass = #{vo.isPass}</if>
+ <if test="vo.status != null and vo.status != ''"> and status = #{vo.status}</if>
+ <if test="vo.startTime != null "> and start_time = #{vo.startTime}</if>
+ <if test="vo.endTime != null "> and end_time = #{vo.endTime}</if>
+ <if test="vo.year != null and vo.year != ''"> and year = #{vo.year}</if>
+ <if test="vo.month != null and vo.month != ''"> and month = #{vo.month}</if>
+ <if test="vo.day != null and vo.day != ''"> and day = #{vo.day}</if>
</where>
</select>
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"
<select id="selectInspectionNewsAssociationList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation" resultMap="InspectionNewsAssociationResult">
<include refid="selectInspectionNewsAssociationVo"/>
<where>
- <if test="userId != null "> and user_id = #{userId}</if>
- <if test="newsId != null "> and news_id = #{newsId}</if>
- <if test="type != null and type != ''"> and type = #{type}</if>
+ <if test="vo.userId != null "> and user_id = #{vo.userId}</if>
+ <if test="vo.newsId != null "> and news_id = #{vo.newsId}</if>
+ <if test="vo.type != null and vo.type != ''"> and type = #{vo.type}</if>
</where>
</select>
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"
<select id="selectInspectionNewsCommentList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionNewsComment" resultMap="InspectionNewsCommentResult">
<include refid="selectInspectionNewsCommentVo"/>
<where>
- <if test="newsId != null "> and news_id = #{newsId}</if>
- <if test="context != null and context != ''"> and context = #{context}</if>
- <if test="realName != null and realName != ''"> and real_name like concat('%', #{realName}, '%')</if>
- <if test="userAvatar != null and userAvatar != ''"> and user_avatar = #{userAvatar}</if>
+ <if test="vo.newsId != null "> and news_id = #{vo.newsId}</if>
+ <if test="vo.context != null and vo.context != ''"> and context = #{vo.context}</if>
+ <if test="vo.realName != null and vo.realName != ''"> and real_name like concat('%', #{vo.realName}, '%')</if>
+ <if test="vo.userAvatar != null and vo.userAvatar != ''"> and user_avatar = #{vo.userAvatar}</if>
</where>
</select>
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"
<select id="selectInspectionPickCarList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionPickCar" resultMap="InspectionPickCarResult">
<include refid="selectInspectionPickCarVo"/>
<where>
- <if test="partnerId != null "> and partner_id = #{partnerId}</if>
- <if test="goodsTitle != null and goodsTitle != ''"> and goods_title = #{goodsTitle}</if>
- <if test="userId != null "> and user_id = #{userId}</if>
- <if test="orderId != null "> and order_id = #{orderId}</if>
- <if test="userPhone != null and userPhone != ''"> and user_phone = #{userPhone}</if>
- <if test="longitude != null "> and longitude = #{longitude}</if>
- <if test="latitude != null "> and latitude = #{latitude}</if>
- <if test="adressDetail != null and adressDetail != ''"> and adress_detail = #{adressDetail}</if>
- <if test="appointmentDay != null and appointmentDay != ''"> and appointment_day = #{appointmentDay}</if>
- <if test="appointmentTime != null and appointmentTime != ''"> and appointment_time = #{appointmentTime}</if>
- <if test="distance != null "> and distance = #{distance}</if>
- <if test="needPrice != null "> and need_price = #{needPrice}</if>
+ <if test="vo.partnerId != null "> and partner_id = #{vo.partnerId}</if>
+ <if test="vo.goodsTitle != null and vo.goodsTitle != ''"> and goods_title = #{vo.goodsTitle}</if>
+ <if test="vo.userId != null "> and user_id = #{vo.userId}</if>
+ <if test="vo.orderId != null "> and order_id = #{vo.orderId}</if>
+ <if test="vo.userPhone != null and vo.userPhone != ''"> and user_phone = #{vo.userPhone}</if>
+ <if test="vo.longitude != null "> and longitude = #{vo.longitude}</if>
+ <if test="vo.latitude != null "> and latitude = #{vo.latitude}</if>
+ <if test="vo.adressDetail != null and vo.adressDetail != ''"> and adress_detail = #{vo.adressDetail}</if>
+ <if test="vo.appointmentDay != null and vo.appointmentDay != ''"> and appointment_day = #{vo.appointmentDay}</if>
+ <if test="vo.appointmentTime != null and vo.appointmentTime != ''"> and appointment_time = #{vo.appointmentTime}</if>
+ <if test="vo.distance != null "> and distance = #{vo.distance}</if>
+ <if test="vo.needPrice != null "> and need_price = #{vo.needPrice}</if>
</where>
</select>
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
<where>
and partner_id = 888 and id!=888
- <if test="id != null "> and id = #{id}</if>
- <if test="title != null and title != ''"> and title like concat('%', #{title}, '%')</if>
- <if test="isSpecial != null "> and is_special = #{isSpecial}</if>
+ <if test="vo.id != null "> and id = #{vo.id}</if>
+ <if test="vo.title != null and title != ''"> and title like concat('%', #{vo.title}, '%')</if>
+ <if test="vo.isSpecial != null "> and is_special = #{vo.isSpecial}</if>
</where>
order by order_num, id desc
</select>
@@ -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
<where>
- <if test="id != null "> and sig.id = #{id}</if>
- <if test="title != null and title != ''"> and sig.title like concat('%', #{title}, '%')</if>
- <if test="goodsCategoryId!= null "> and sig.goods_category_id = #{goodsCategoryId}</if>
- <if test="partnerName!= null "> and smp.partner_name like concat('%',#{partnerName},'%')</if>
- <if test="partnerId!= null "> and sig.partner_id = #{partnerId}</if>
+ <if test="vo.id != null "> and sig.id = #{vo.id}</if>
+ <if test="vo.title != null and title != ''"> and sig.title like concat('%', #{vo.title}, '%')</if>
+ <if test="vo.goodsCategoryId!= null "> and sig.goods_category_id = #{vo.goodsCategoryId}</if>
+ <if test="vo.partnerName!= null "> and smp.partner_name like concat('%',#{vo.partnerName},'%')</if>
+ <if test="vo.partnerId!= null "> and sig.partner_id = #{vo.partnerId}</if>
</where>
ORDER BY FIELD(sig.listing_status,1,2,3,0), create_time desc
</select>
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
- <if test="orderStatus!=null and orderStatus!='' ">
- and oi.order_status = #{orderStatus}
+ <if test="vo.orderStatus!=null and vo.orderStatus!='' ">
+ and oi.order_status = #{vo.orderStatus}
</if>
- <if test="validationTime!=null">
+ <if test="vo.validationTime!=null">
and oi.validation_time is not null
</if>
- <if test="realName!=null and realName!='' ">
- and oi.real_name like concat('%',#{realName},'%')
+ <if test="vo.realName!=null and vo.realName!='' ">
+ and oi.real_name like concat('%',#{vo.realName},'%')
</if>
- <if test="orderNo!=null and orderNo!='' ">
- and oi.order_no like concat('%',#{orderNo},'%')
+ <if test="vo.orderNo!=null and vo.orderNo!='' ">
+ and oi.order_no like concat('%',#{vo.orderNo},'%')
</if>
- <if test="goodsTitle!=null and goodsTitle!='' ">
- and oi.goods_title like concat('%',#{goodsTitle},'%')
+ <if test="vo.goodsTitle!=null and vo.goodsTitle!='' ">
+ and oi.goods_title like concat('%',#{vo.goodsTitle},'%')
</if>
- <if test="validationRealName!=null and validationRealName!='' ">
- and oi.validation_real_name like concat('%',#{validationRealName},'%')
+ <if test="vo.validationRealName!=null and vo.validationRealName!='' ">
+ and oi.validation_real_name like concat('%',#{vo.validationRealName},'%')
</if>
- <if test="phonenumber!=null and phonenumber!='' ">
- and su.mobile like concat('%',#{phonenumber},'%')
+ <if test="vo.phonenumber!=null and vo.phonenumber!='' ">
+ and su.mobile like concat('%',#{vo.phonenumber},'%')
</if>
- <if test="realPayMoney!=null ">
- and oi.pay_money <![CDATA[>=]]> #{realPayMoney}
+ <if test="vo.realPayMoney!=null ">
+ and oi.pay_money <![CDATA[>=]]> #{vo.realPayMoney}
</if>
- <if test="startTime!=null ">
- and oi.pay_time <![CDATA[>=]]> #{startTime}
+ <if test="vo.startTime!=null ">
+ and oi.pay_time <![CDATA[>=]]> #{vo.startTime}
</if>
- <if test="endTime!=null ">
- and oi.pay_time <![CDATA[<=]]> #{endTime}
+ <if test="vo.endTime!=null ">
+ and oi.pay_time <![CDATA[<=]]> #{vo.endTime}
</if>
- <if test="partnerId!=null ">
- and oi.partner_id = #{partnerId}
+ <if test="vo.partnerId!=null ">
+ and oi.partner_id = #{vo.partnerId}
</if>
order by order_time desc
</select>
@@ -119,14 +119,14 @@
FROM
`order_info`
where partner_id =#{partnerId} and goods_type='sc'
- <if test="orderStatus!=null and orderStatus!='' ">
- and order_status = #{orderStatus}
+ <if test="vo.orderStatus!=null and vo.orderStatus!='' ">
+ and order_status = #{vo.orderStatus}
</if>
- <if test="phonenumber!=null and phonenumber!='' ">
- and phonenumber like concat('%',#{phonenumber},'%')
+ <if test="vo.phonenumber!=null and vo.phonenumber!='' ">
+ and phonenumber like concat('%',#{vo.phonenumber},'%')
</if>
- <if test="goodsTitle!=null and goodsTitle!='' ">
- and goods_title like concat('%',#{goodsTitle},'%')
+ <if test="vo.goodsTitle!=null and vo.goodsTitle!='' ">
+ and goods_title like concat('%',#{vo.goodsTitle},'%')
</if>
order by order_time desc
</select>
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 @@
<select id="selectShopCouponByUserId" parameterType="cn.iocoder.yudao.module.shop.entity.ShopCoupon" resultType="cn.iocoder.yudao.module.shop.entity.ShopCoupon">
<include refid="selectShopCouponVo"/>
<where>
- <if test="couponType != null and couponType != ''"> and coupon_type = #{couponType}</if>
- <if test="couponCode != null and couponCode != ''"> and coupon_code like concat('%', #{couponCode}, '%')</if>
- <if test="title != null and title != ''"> and title like concat('%', #{title}, '%')</if>
- <if test="bindMoudle != null and bindMoudle != ''"> and bind_moudle = #{bindMoudle}</if>
- <if test="bindGoodsIds != null and bindGoodsIds != ''"> and bind_goods_ids = #{bindGoodsIds}</if>
- <if test="userId != null "> and sys_user.id = #{userId}</if>
- <if test="orderId != null "> and order_id = #{orderId}</if>
- <if test="phonenumber != null and phonenumber != ''"> and phonenumber like concat('%', #{phonenumber}, '%')</if>
+ <if test="vo.couponType != null and vo.couponType != ''"> and coupon_type = #{vo.couponType}</if>
+ <if test="vo.couponCode != null and vo.couponCode != ''"> and coupon_code like concat('%', #{vo.couponCode}, '%')</if>
+ <if test="vo.title != null and vo.title != ''"> and title like concat('%', #{vo.title}, '%')</if>
+ <if test="vo.bindMoudle != null and vo.bindMoudle != ''"> and bind_moudle = #{vo.bindMoudle}</if>
+ <if test="vo.bindGoodsIds != null and vo.bindGoodsIds != ''"> and bind_goods_ids = #{vo.bindGoodsIds}</if>
+ <if test="vo.userId != null "> and sys_user.id = #{vo.userId}</if>
+ <if test="vo.orderId != null "> and order_id = #{vo.orderId}</if>
+ <if test="vo.phonenumber != null and vo.phonenumber != ''"> and phonenumber like concat('%', #{vo.phonenumber}, '%')</if>
<if test="params.beginStartTime != null and params.beginStartTime != '' and params.endStartTime != null and params.endStartTime != ''"> and start_time between #{params.beginStartTime} and #{params.endStartTime}</if>
<if test="params.beginExpirationTime != null and params.beginExpirationTime != '' and params.endExpirationTime != null and params.endExpirationTime != ''"> and expiration_time between #{params.beginExpirationTime} and #{params.endExpirationTime}</if>
<if test="params.beginUseTime != null and params.beginUseTime != '' and params.endUseTime != null and params.endUseTime != ''"> and use_time between #{params.beginUseTime} and #{params.endUseTime}</if>
- <if test="couponStatus != null and couponStatus != ''">
+ <if test="vo.couponStatus != null and vo.couponStatus != ''">
<choose>
- <when test="couponStatus=='0'.toString()">
- and now() BETWEEN start_time AND expiration_time and coupon_status = #{couponStatus}
+ <when test="vo.couponStatus=='0'.toString()">
+ and now() BETWEEN start_time AND expiration_time and coupon_status = #{vo.couponStatus}
</when>
- <when test="couponStatus=='1'.toString()">
- and coupon_status = #{couponStatus}
+ <when test="vo.couponStatus=='1'.toString()">
+ and coupon_status = #{vo.couponStatus}
</when>
- <when test="couponStatus=='2'.toString()">
+ <when test="vo.couponStatus=='2'.toString()">
and coupon_status = '0' and now() <![CDATA[>]]> expiration_time
</when>
</choose>
@@ -107,12 +107,12 @@
<select id="availableCouponsListByUserId" parameterType="cn.iocoder.yudao.module.shop.entity.ShopCoupon" resultMap="ShopCouponResult">
<include refid="selectShopCouponVo"/>
<where>
- <if test="couponType != null and couponType != ''"> and coupon_type = #{couponType}</if>
- <if test="bindMoudle != null and bindMoudle != ''"> and bind_moudle = #{bindMoudle}</if>
- <if test="bindGoodsIds != null and bindGoodsIds != ''"> and bind_goods_ids = #{bindGoodsIds}</if>
- <if test="userId != null "> and user_id = #{userId}</if>
- <if test="couponStatus != null and couponStatus != ''"> and coupon_status = #{couponStatus}</if>
- <if test="userId != null ">
+ <if test="vo.couponType != null and vo.couponType != ''"> and coupon_type = #{vo.couponType}</if>
+ <if test="vo.bindMoudle != null and vo.bindMoudle != ''"> and bind_moudle = #{vo.bindMoudle}</if>
+ <if test="vo.bindGoodsIds != null and vo.bindGoodsIds != ''"> and bind_goods_ids = #{vo.bindGoodsIds}</if>
+ <if test="vo.userId != null "> and user_id = #{vo.userId}</if>
+ <if test="vo.couponStatus != null and vo.couponStatus != ''"> and coupon_status = #{vo.couponStatus}</if>
+ <if test="vo.userId != null ">
and now() BETWEEN start_time AND expiration_time
</if>
</where>
@@ -124,12 +124,12 @@
<select id="unAvailableCouponsListByUserId" parameterType="cn.iocoder.yudao.module.shop.entity.ShopCoupon" resultMap="ShopCouponResult">
<include refid="selectShopCouponVo"/>
<where>
- <if test="couponType != null and couponType != ''"> and coupon_type = #{couponType}</if>
- <if test="bindMoudle != null and bindMoudle != ''"> or bind_moudle != #{bindMoudle}</if>
- <if test="bindGoodsIds != null and bindGoodsIds != ''"> and bind_goods_ids = #{bindGoodsIds}</if>
- <if test="userId != null "> and user_id = #{userId}</if>
- <if test="couponStatus != null and couponStatus != ''"> and coupon_status = #{couponStatus}</if>
- <if test="userId != null ">
+ <if test="vo.couponType != null and vo.couponType != ''"> and coupon_type = #{vo.couponType}</if>
+ <if test="vo.bindMoudle != null and vo.bindMoudle != ''"> or bind_moudle != #{vo.bindMoudle}</if>
+ <if test="vo.bindGoodsIds != null and vo.bindGoodsIds != ''"> and bind_goods_ids = #{vo.bindGoodsIds}</if>
+ <if test="vo.userId != null "> and user_id = #{vo.userId}</if>
+ <if test="vo.couponStatus != null and vo.couponStatus != ''"> and coupon_status = #{vo.couponStatus}</if>
+ <if test="vo.userId != null ">
or NOT (now() BETWEEN start_time AND expiration_time)
</if>
</where>
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/api/DriveSchoolPayController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/api/DriveSchoolPayController.java
index 05b9ca70..852ff148 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/api/DriveSchoolPayController.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/api/DriveSchoolPayController.java
@@ -18,14 +18,12 @@ import cn.iocoder.yudao.module.system.service.permission.PermissionService;
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.sun.javaws.IconUtil;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
-import java.util.Set;
/**
* 订单Controller
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/controller/UniShopConfigController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/controller/UniShopConfigController.java
index 26799651..77ac1ee7 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/controller/UniShopConfigController.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/controller/UniShopConfigController.java
@@ -14,6 +14,9 @@ public class UniShopConfigController {
@Autowired
UniShopConfigService uniShopConfigService;
+ /**
+ * 客服中心：获取客服手机号
+ */
@GetMapping("/getRepairTel")
public CommonResult<String> getRepairTel() {
return CommonResult.success(uniShopConfigService.getRepairTel());
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/mapper/UniShopConfigMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/mapper/UniShopConfigMapper.java
index 5092a40a..1f547e46 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/mapper/UniShopConfigMapper.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/mapper/UniShopConfigMapper.java
@@ -1,11 +1,12 @@
package cn.iocoder.yudao.module.app.mapper;
-import cn.iocoder.yudao.module.project.entity.RepairProject;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface UniShopConfigMapper {
+ /**
+ * 客服中心：获取手机号
+ */
public String getRepairTel();
}
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/UniShopConfigService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/UniShopConfigService.java
index 588b379e..4afe814f 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/UniShopConfigService.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/UniShopConfigService.java
@@ -2,5 +2,8 @@ package cn.iocoder.yudao.module.app.service;
public interface UniShopConfigService {
+ /**
+ * 客服中心：获取手机号
+ */
public String getRepairTel();
}
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/impl/UniShopConfigServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/impl/UniShopConfigServiceImpl.java
index a267d5fd..6e4fa156 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/impl/UniShopConfigServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/impl/UniShopConfigServiceImpl.java
@@ -11,6 +11,10 @@ public class UniShopConfigServiceImpl implements UniShopConfigService {
@Autowired
UniShopConfigMapper uniShopConfigMapper;
+
+ /**
+ * 客服中心：获取手机号
+ */
@Override
public String getRepairTel() {
return uniShopConfigMapper.getRepairTel();
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java
new file mode 100644
index 00000000..bedb10de
--- /dev/null
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java
@@ -0,0 +1,139 @@
+package cn.iocoder.yudao.module.base.controller.admin;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.base.service.RepairStatisticsService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Tag(name = "维修数据统计")
+@RestController
+@RequestMapping("/repair/statistics")
+@Validated
+public class RepairStatisticsController {
+ @Resource
+ private RepairStatisticsService statisticsService;
+
+ /**
+ * 客户来源分析饼图
+ *
+ * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
+ * @author PQZ
+ * @date 16:15 2024/10/21
+ **/
+ @GetMapping("/customerSource")
+ @Operation(summary = "客户来源分析饼图")
+ public CommonResult<?> customerSource() {
+ return CommonResult.success(statisticsService.customerSource());
+ }
+
+ /**
+ * 月工单金额走势折线图
+ *
+ * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
+ * @author PQZ
+ * @date 16:15 2024/10/21
+ **/
+ @GetMapping("/ticketMainAmount")
+ @Operation(summary = "月工单金额走势")
+ public CommonResult<?> ticketMainAmount() {
+ return CommonResult.success(statisticsService.ticketMain("amount"));
+ }
+
+ /**
+ * 月工单数量走势折线图
+ *
+ * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
+ * @author PQZ
+ * @date 16:15 2024/10/21
+ **/
+ @GetMapping("/ticketMainCount")
+ @Operation(summary = "月工单数量走势")
+ public CommonResult<?> ticketMainCount() {
+ return CommonResult.success(statisticsService.ticketMain("count"));
+ }
+
+ /**
+ * 支付渠道统计柱状图
+ *
+ * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
+ * @author PQZ
+ * @date 16:15 2024/10/21
+ **/
+ @GetMapping("/ticketMainPayWay")
+ @Operation(summary = "支付渠道统计")
+ public CommonResult<?> ticketMainPayWay() {
+ return CommonResult.success(statisticsService.ticketMain("payWay"));
+ }
+
+ /**
+ * 维修类型相关统计分析饼图
+ *
+ * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
+ * @author PQZ
+ * @date 16:15 2024/10/21
+ **/
+ @GetMapping("/repairTypeStatistics")
+ @Operation(summary = "维修类型相关统计分析饼图")
+ public CommonResult<?> repairTypeStatistics() {
+ return CommonResult.success(statisticsService.repairTypeStatistics());
+ }
+
+ /**
+ * 工单总数、今日工单、工单总金额、今日工单金额
+ *
+ * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
+ * @author PQZ
+ * @date 16:15 2024/10/21
+ **/
+ @GetMapping("/ticketStatistics")
+ @Operation(summary = "工单总数、今日工单、工单总金额、今日工单金额")
+ public CommonResult<?> ticketStatistics() {
+ return CommonResult.success(statisticsService.ticketStatistics());
+ }
+
+ /**
+ * 工单状态数量统计
+ *
+ * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
+ * @author PQZ
+ * @date 16:15 2024/10/21
+ **/
+ @GetMapping("/ticketStatusCount")
+ @Operation(summary = "工单状态数量统计")
+ public CommonResult<?> ticketStatusCount() {
+ return CommonResult.success(statisticsService.ticketStatusCount());
+ }
+
+ /**
+ * 今日工单
+ *
+ * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
+ * @author PQZ
+ * @date 16:15 2024/10/21
+ **/
+ @GetMapping("/listTicketToday")
+ @Operation(summary = "今日工单")
+ public CommonResult<?> listTicketToday() {
+ return CommonResult.success(statisticsService.listTicketToday());
+ }
+
+ /**
+ * 维修工人排行
+ *
+ * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
+ * @author PQZ
+ * @date 16:15 2024/10/21
+ **/
+ @GetMapping("/listWorks")
+ @Operation(summary = "维修工人排行")
+ public CommonResult<?> listWorks() {
+ return CommonResult.success(statisticsService.listWorks());
+ }
+
+}
\ No newline at end of file
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairStatisticsMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairStatisticsMapper.java
new file mode 100644
index 00000000..bd4e7cbb
--- /dev/null
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairStatisticsMapper.java
@@ -0,0 +1,99 @@
+package cn.iocoder.yudao.module.base.mapper;
+
+import cn.iocoder.yudao.module.base.vo.RepairStatisticsVO;
+import cn.iocoder.yudao.module.base.vo.RepairTicketStatisticsVO;
+import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 维修数据统计
+ *
+ * @author pqz
+ */
+@Mapper
+public interface RepairStatisticsMapper {
+
+ /**
+ * 客户来源统计
+ *
+ * @return java.util.List<cn.iocoder.yudao.module.base.vo.RepairStatisticsVO>
+ * @author PQZ
+ * @date 13:57 2024/10/21
+ **/
+ List<RepairStatisticsVO> customerSource();
+
+ /**
+ * 月工单数量走势
+ *
+ * @return java.util.List<cn.iocoder.yudao.module.base.vo.RepairStatisticsVO>
+ * @author PQZ
+ * @date 14:25 2024/10/21
+ **/
+ List<RepairStatisticsVO> ticketCountTrend();
+
+ /**
+ * 月工单金额走势
+ *
+ * @return java.util.List<cn.iocoder.yudao.module.base.vo.RepairStatisticsVO>
+ * @author PQZ
+ * @date 14:31 2024/10/21
+ **/
+ List<RepairStatisticsVO> ticketAmountTrend();
+
+ /**
+ * 按照支付方式统计
+ *
+ * @return java.util.List<cn.iocoder.yudao.module.base.vo.RepairStatisticsVO>
+ * @author PQZ
+ * @date 14:41 2024/10/21
+ **/
+ List<RepairStatisticsVO> paymentWay();
+
+ /**
+ * 维修方式统计饼图
+ *
+ * @return java.util.List<cn.iocoder.yudao.module.base.vo.RepairStatisticsVO>
+ * @author PQZ
+ * @date 14:52 2024/10/21
+ **/
+ List<RepairStatisticsVO> repairTypeStatistics();
+
+ /**
+ * 工单总数、今日工单、工单总金额、今日工单金额
+ *
+ * @return cn.iocoder.yudao.module.base.vo.RepairTicketStatisticsVO
+ * @author PQZ
+ * @date 15:31 2024/10/21
+ **/
+ RepairTicketStatisticsVO ticketStatistics();
+
+ /**
+ * 工单状态数量统计
+ *
+ * @return java.util.List<cn.iocoder.yudao.module.base.vo.RepairStatisticsVO>
+ * @author PQZ
+ * @date 15:44 2024/10/21
+ **/
+ List<RepairStatisticsVO> ticketStatusCount();
+
+ /**
+ * 今日工单
+ *
+ * @return java.util.List<cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO>
+ * @author PQZ
+ * @date 15:50 2024/10/21
+ **/
+ List<DlRepairTicketsRespVO> listTicketToday();
+
+
+ /**
+ * 维修工人排行
+ * @author PQZ
+ * @date 16:13 2024/10/21
+ * @return java.util.List<cn.iocoder.yudao.module.base.vo.RepairStatisticsVO>
+ **/
+ List<RepairStatisticsVO> listWorks();
+
+}
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java
new file mode 100644
index 00000000..dde50d36
--- /dev/null
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java
@@ -0,0 +1,85 @@
+package cn.iocoder.yudao.module.base.service;
+
+import cn.iocoder.yudao.module.base.vo.RepairStatisticsVO;
+import cn.iocoder.yudao.module.base.vo.RepairTicketStatisticsVO;
+import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 维修数据统计
+ *
+ * @author pqz
+ */
+public interface RepairStatisticsService {
+
+ /**
+ * 客户来源分析饼图
+ *
+ * @return java.util.List<cn.iocoder.yudao.module.base.vo.RepairStatisticsVO>
+ * @author PQZ
+ * @date 14:01 2024/10/21
+ **/
+ List<RepairStatisticsVO> customerSource();
+
+ /**
+ * 月工单数量、金额走势、支付渠道统计
+ * @author PQZ
+ * @date 14:32 2024/10/21
+ * @param type 'amount:金额，count：数量'，payWay：支付渠道
+ * @return java.util.Map<java.lang.String,java.lang.Object>
+ **/
+ Map<String, Object> ticketMain(String type);
+
+ /**
+ * 维修类型相关统计分析饼图
+ *
+ * @return java.util.Map<java.lang.String, java.lang.String>
+ * @author PQZ
+ * @date 13:25 2024/10/21
+ **/
+ List<RepairStatisticsVO> repairTypeStatistics();
+
+
+ /**
+ * 工单总数、今日工单、工单总金额、今日工单金额
+ *
+ * @return java.util.Map<java.lang.String, java.lang.String>
+ * @author PQZ
+ * @date 13:23 2024/10/21
+ **/
+ RepairTicketStatisticsVO ticketStatistics();
+
+ /**
+ * 工单状态数量统计
+ *
+ * @return java.util.Map<java.lang.String, java.lang.String>
+ * @author PQZ
+ * @date 13:28 2024/10/21
+ **/
+ List<RepairStatisticsVO> ticketStatusCount();
+
+
+ /**
+ * 今日工单
+ *
+ * @return java.util.List<com.alibaba.fastjson.JSONObject>
+ * @author PQZ
+ * @date 13:25 2024/10/21
+ **/
+ List<DlRepairTicketsRespVO> listTicketToday();
+
+
+
+ /**
+ * 维修工人排行
+ *
+ * @return java.util.List<com.alibaba.fastjson.JSONObject>
+ * @author PQZ
+ * @date 13:26 2024/10/21
+ **/
+ List<RepairStatisticsVO> listWorks();
+
+
+}
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java
new file mode 100644
index 00000000..816ecd96
--- /dev/null
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java
@@ -0,0 +1,131 @@
+package cn.iocoder.yudao.module.base.service.impl;
+
+import cn.iocoder.yudao.module.base.mapper.RepairStatisticsMapper;
+import cn.iocoder.yudao.module.base.service.RepairStatisticsService;
+import cn.iocoder.yudao.module.base.vo.RepairStatisticsVO;
+import cn.iocoder.yudao.module.base.vo.RepairTicketStatisticsVO;
+import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 维修数据统计
+ *
+ * @author pqz
+ */
+@Service
+@Validated
+public class RepairStatisticsServiceImpl implements RepairStatisticsService {
+
+ @Resource
+ private RepairStatisticsMapper statisticsMapper;
+
+ /**
+ * 客户来源分析饼图
+ *
+ * @return java.util.List<cn.iocoder.yudao.module.base.vo.RepairStatisticsVO>
+ * @author PQZ
+ * @date 14:01 2024/10/21
+ **/
+ @Override
+ public List<RepairStatisticsVO> customerSource() {
+ return statisticsMapper.customerSource();
+ }
+
+ /**
+ * 月工单数量、金额走势、支付渠道统计
+ *
+ * @return java.util.Map<java.lang.String, java.lang.Object>
+ * @author PQZ
+ * @date 13:20 2024/10/21
+ **/
+ @Override
+ public Map<String, Object> ticketMain(String type) {
+ Map<String, Object> result = new HashMap<>();
+ List<RepairStatisticsVO> tickets;
+ if ("count".equals(type)) {
+ //月工单数量走势折线图
+ tickets = statisticsMapper.ticketCountTrend();
+ } else if ("amount".equals(type)) {
+ //月工单金额走势折线图
+ tickets = statisticsMapper.ticketAmountTrend();
+ } else {
+ //支付渠道柱状图
+ tickets = statisticsMapper.paymentWay();
+ }
+ //取出数值
+ List<Integer> data = tickets.stream().map(RepairStatisticsVO::getValue).collect(Collectors.toList());
+ //x轴值
+ List<String> xData = tickets.stream().map(RepairStatisticsVO::getName).collect(Collectors.toList());
+ result.put("data", data);
+ result.put("xData", xData);
+ return result;
+ }
+
+ /**
+ * 维修类型相关统计分析饼图
+ *
+ * @return java.util.Map<java.lang.String, java.lang.String>
+ * @author PQZ
+ * @date 13:25 2024/10/21
+ **/
+ @Override
+ public List<RepairStatisticsVO> repairTypeStatistics() {
+ return statisticsMapper.repairTypeStatistics();
+ }
+
+
+ /**
+ * 工单总数、今日工单、工单总金额、今日工单金额
+ *
+ * @return java.util.Map<java.lang.String, java.lang.String>
+ * @author PQZ
+ * @date 13:23 2024/10/21
+ **/
+ @Override
+ public RepairTicketStatisticsVO ticketStatistics() {
+ return statisticsMapper.ticketStatistics();
+ }
+
+ /**
+ * 工单状态数量统计
+ *
+ * @return java.util.Map<java.lang.String, java.lang.String>
+ * @author PQZ
+ * @date 13:28 2024/10/21
+ **/
+ @Override
+ public List<RepairStatisticsVO> ticketStatusCount() {
+ return statisticsMapper.ticketStatusCount();
+ }
+
+ /**
+ * 今日工单
+ *
+ * @return java.util.List<com.alibaba.fastjson.JSONObject>
+ * @author PQZ
+ * @date 13:25 2024/10/21
+ **/
+ @Override
+ public List<DlRepairTicketsRespVO> listTicketToday() {
+ return statisticsMapper.listTicketToday();
+ }
+
+ /**
+ * 维修工人排行
+ *
+ * @return java.util.List<com.alibaba.fastjson.JSONObject>
+ * @author PQZ
+ * @date 13:26 2024/10/21
+ **/
+ @Override
+ public List<RepairStatisticsVO> listWorks() {
+ return statisticsMapper.listWorks();
+ }
+}
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairStatisticsVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairStatisticsVO.java
new file mode 100644
index 00000000..0cbc2575
--- /dev/null
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairStatisticsVO.java
@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.module.base.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.ToString;
+
+@Schema(description = "数据统计VO")
+@Data
+@ToString(callSuper = true)
+public class RepairStatisticsVO {
+ String name;
+ Integer value;
+}
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairTicketStatisticsVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairTicketStatisticsVO.java
new file mode 100644
index 00000000..bf6d22e0
--- /dev/null
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairTicketStatisticsVO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.base.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.ToString;
+
+@Schema(description = "数据统计VO")
+@Data
+@ToString(callSuper = true)
+public class RepairTicketStatisticsVO {
+ /**工单总数量*/
+ Integer totalCount;
+ /**工单总金额*/
+ Double totalAmount;
+ /**工单今日数量*/
+ Integer todayCount;
+ /**工单今日金额*/
+ Double todayAmount;
+
+}
diff --git a/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml b/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml
new file mode 100644
index 00000000..3f526343
--- /dev/null
+++ b/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.base.mapper.RepairStatisticsMapper">
+
+ <!--
+ 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+ 无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+ -->
+ <select id="customerSource" resultType="cn.iocoder.yudao.module.base.vo.RepairStatisticsVO">
+ 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
+ </select>
+ <select id="ticketCountTrend" resultType="cn.iocoder.yudao.module.base.vo.RepairStatisticsVO">
+ SELECT
+ DATE_FORMAT(create_time, '%Y-%m') AS name,
+ COUNT(*) AS value
+ FROM
+ dl_repair_tickets
+ WHERE
+ create_time >= DATE_SUB(CURDATE(), INTERVAL 12 MONTH)
+ GROUP BY
+ name
+ ORDER BY
+ name
+ </select>
+ <select id="ticketAmountTrend" resultType="cn.iocoder.yudao.module.base.vo.RepairStatisticsVO">
+ SELECT
+ DATE_FORMAT(create_time, '%Y-%m') AS name,
+ SUM(total_price) AS value
+ FROM
+ dl_repair_tickets
+ WHERE
+ create_time >= DATE_SUB(CURDATE(), INTERVAL 12 MONTH)
+ GROUP BY
+ name
+ ORDER BY
+ name
+ </select>
+ <select id="paymentWay" resultType="cn.iocoder.yudao.module.base.vo.RepairStatisticsVO">
+ SELECT
+ COALESCE(sdd.label, '未知') AS name,
+ COUNT(roi.id)
+ FROM
+ repair_order_info roi
+ LEFT JOIN system_dict_data sdd ON roi.pay_type = sdd.value AND sdd.dict_type = 'repair_pay_type' AND sdd.deleted = 0
+ WHERE
+ roi.deleted = 0
+ GROUP BY roi.pay_type
+ ORDER BY roi.create_time
+ </select>
+ <select id="repairTypeStatistics" resultType="cn.iocoder.yudao.module.base.vo.RepairStatisticsVO">
+ SELECT
+ COALESCE(sdd.label, '未知') AS `name`,
+ COUNT( drt.id ) AS `value`
+ FROM
+ dl_repair_tickets drt
+ LEFT JOIN system_dict_data sdd ON drt.repair_type = sdd.value AND sdd.dict_type = 'repair_type' AND sdd.deleted = 0
+ WHERE
+ drt.deleted = 0
+ GROUP BY
+ drt.repair_type
+ ORDER BY
+ drt.create_time
+ </select>
+ <select id="ticketStatistics" resultType="cn.iocoder.yudao.module.base.vo.RepairTicketStatisticsVO">
+ SELECT
+ COUNT( drt.id ) AS totalCount,
+ SUM( drt.total_price ) AS totalAmount,
+ COUNT( CASE WHEN DATE ( drt.create_time ) = CURDATE() THEN 1 END ) AS todayCount,
+ SUM( CASE WHEN DATE ( drt.create_time ) = CURDATE() THEN drt.total_price ELSE 0 END ) AS todayAmount
+ FROM
+ dl_repair_tickets drt
+ WHERE
+ drt.deleted = 0
+ </select>
+ <select id="ticketStatusCount" resultType="cn.iocoder.yudao.module.base.vo.RepairStatisticsVO">
+ SELECT
+ sdd.label AS `name`,
+ COUNT(drt.id) AS `value`
+ FROM
+ system_dict_data sdd
+ LEFT JOIN
+ dl_repair_tickets drt ON drt.tickets_status = sdd.`value`
+ WHERE
+ sdd.dict_type = 'repair_tickets_status'
+ AND sdd.deleted = 0
+ GROUP BY
+ sdd.value
+ ORDER BY
+ sdd.value
+ </select>
+ <select id="listTicketToday" resultType="cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO">
+ SELECT
+ drt.*
+ FROM
+ dl_repair_tickets drt
+ WHERE
+ drt.deleted = 0
+ AND DATE ( drt.create_time ) = CURDATE()
+ ORDER BY
+ drt.create_time DESC
+ </select>
+ <select id="listWorks" resultType="cn.iocoder.yudao.module.base.vo.RepairStatisticsVO">
+ SELECT
+ drw.user_name AS `name`,
+ COUNT(drr.id) AS `value`
+ FROM
+ dl_repair_worker drw
+ LEFT JOIN dl_repair_records drr ON drw.user_id = drr.deal_user_id AND drr.deleted = 0
+ WHERE drr.type = 'sgwczj'
+ GROUP BY drw.user_id,drr.ticket_id
+ ORDER BY value DESC
+ </select>
+</mapper>
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/controller/admin/SysAnnouncementController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/controller/admin/SysAnnouncementController.java
index d9cd8ae2..6d6e20f8 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/controller/admin/SysAnnouncementController.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/controller/admin/SysAnnouncementController.java
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.appBase.controller.admin;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.rescue.core.controller.BaseController;
-import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.module.appBase.domain.SysAnnouncement;
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java
index 2330b97d..26b7c4cb 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java
@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.rescue.core.controller.BaseController;
-import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo;
import cn.iocoder.yudao.module.rescue.domain.RescueInfo;
import cn.iocoder.yudao.module.rescue.dto.DriverInfo2Dto;
import cn.iocoder.yudao.module.rescue.dto.DriverInfoDto;
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarSpendController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarSpendController.java
index 49db4f28..5539215a 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarSpendController.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarSpendController.java
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.rescue.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.rescue.core.controller.BaseController;
-import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo;
import cn.iocoder.yudao.module.rescue.domain.RescueCarSpend;
import cn.iocoder.yudao.module.rescue.service.IRescueCarSpendService;
import cn.iocoder.yudao.module.rescue.utils.ExcelUtil;
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueConfigController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueConfigController.java
index eb1e8ec6..52e33e12 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueConfigController.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueConfigController.java
@@ -2,11 +2,12 @@ package cn.iocoder.yudao.module.rescue.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.rescue.core.controller.BaseController;
-import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo;
import cn.iocoder.yudao.module.rescue.domain.RescueConfig;
import cn.iocoder.yudao.module.rescue.service.IRescueConfigService;
import cn.iocoder.yudao.module.rescue.utils.ExcelUtil;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+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.web.bind.annotation.*;
@@ -34,10 +35,12 @@ public class RescueConfigController extends BaseController {
*/
@PreAuthorize("@ss.hasPermission('rescue:rescueConfig:list')")
@GetMapping("/list")
- public TableDataInfo list(RescueConfig rescueConfig) {
- startPage();
- List<RescueConfig> list = rescueConfigService.selectRescueConfigList(rescueConfig);
- return getDataTable(list);
+ public CommonResult list(RescueConfig rescueConfig,
+ @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+ @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
+ Page<RescueConfig> page = new Page<>(pageNum, pageSize);
+ IPage<RescueConfig> list = rescueConfigService.selectRescueConfigList(page,rescueConfig);
+ return success(list);
}
/**
@@ -46,10 +49,13 @@ public class RescueConfigController extends BaseController {
@PreAuthorize("@ss.hasPermission('rescue:rescueConfig:export')")
// @Log(title = "救援司机提成配置", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, RescueConfig rescueConfig) {
- List<RescueConfig> list = rescueConfigService.selectRescueConfigList(rescueConfig);
+ public void export(HttpServletResponse response, RescueConfig rescueConfig,
+ @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+ @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
+ Page<RescueConfig> page = new Page<>(pageNum, pageSize);
+ IPage<RescueConfig> list = rescueConfigService.selectRescueConfigList(page,rescueConfig);
ExcelUtil<RescueConfig> util = new ExcelUtil<RescueConfig>(RescueConfig.class);
- util.exportExcel(response, list, "救援司机提成配置数据");
+ util.exportExcel(response, list.getRecords(), "救援司机提成配置数据");
}
/**
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueDriverPositionController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueDriverPositionController.java
index 7213ec5c..450ab5d0 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueDriverPositionController.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueDriverPositionController.java
@@ -2,11 +2,12 @@ package cn.iocoder.yudao.module.rescue.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.rescue.core.controller.BaseController;
-import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo;
import cn.iocoder.yudao.module.rescue.domain.RescueDriverPosition;
import cn.iocoder.yudao.module.rescue.service.IRescueDriverPositionService;
import cn.iocoder.yudao.module.rescue.utils.ExcelUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.java.Log;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -32,11 +33,13 @@ public class RescueDriverPositionController extends BaseController {
*/
@PreAuthorize("@ss.hasPermission('rescue:rescue_driver_position:list')")
@GetMapping("/list")
- public TableDataInfo list(RescueDriverPosition rescueDriverPosition)
+ public CommonResult list(RescueDriverPosition rescueDriverPosition,
+ @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+ @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
{
- startPage();
- List<RescueDriverPosition> list = rescueDriverPositionService.selectRescueDriverPositionList(rescueDriverPosition);
- return getDataTable(list);
+ Page<RescueDriverPosition> page = new Page<>(pageNum, pageSize);
+ IPage<RescueDriverPosition> list = rescueDriverPositionService.selectRescueDriverPositionList(page,rescueDriverPosition);
+ return success(list);
}
/**
@@ -45,11 +48,14 @@ public class RescueDriverPositionController extends BaseController {
@PreAuthorize("@ss.hasPermission('rescue:rescue_driver_position:export')")
// @Log(title = "救援司机位置记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, RescueDriverPosition rescueDriverPosition)
+ public void export(HttpServletResponse response, RescueDriverPosition rescueDriverPosition,
+ @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+ @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
{
- List<RescueDriverPosition> list = rescueDriverPositionService.selectRescueDriverPositionList(rescueDriverPosition);
+ Page<RescueDriverPosition> page = new Page<>(pageNum, pageSize);
+ IPage<RescueDriverPosition> list = rescueDriverPositionService.selectRescueDriverPositionList(page,rescueDriverPosition);
ExcelUtil<RescueDriverPosition> util = new ExcelUtil<RescueDriverPosition>(RescueDriverPosition.class);
- util.exportExcel(response, list, "救援司机位置记录数据");
+ util.exportExcel(response, list.getRecords(), "救援司机位置记录数据");
}
/**
@@ -100,8 +106,11 @@ public class RescueDriverPositionController extends BaseController {
* 查询救援司机位置记录列表
*/
@GetMapping("/listByInfoId")
- public CommonResult listByInfoId(RescueDriverPosition rescueDriverPosition) {
- List<RescueDriverPosition> list = rescueDriverPositionService.listByInfoId(rescueDriverPosition);
+ public CommonResult listByInfoId(RescueDriverPosition rescueDriverPosition,
+ @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+ @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
+ Page<RescueDriverPosition> page = new Page<>(pageNum, pageSize);
+ IPage<RescueDriverPosition> list = rescueDriverPositionService.listByInfoId(page,rescueDriverPosition);
return success(list);
}
@@ -109,8 +118,11 @@ public class RescueDriverPositionController extends BaseController {
* 查询救援司机位置记录列表
*/
@GetMapping("/routeInfo")
- public CommonResult routeInfo(RescueDriverPosition rescueDriverPosition) {
- List<JSONObject> res = rescueDriverPositionService.routeInfo(rescueDriverPosition);
+ public CommonResult routeInfo(RescueDriverPosition rescueDriverPosition,
+ @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+ @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
+ Page<RescueDriverPosition> page = new Page<>(pageNum, pageSize);
+ IPage<JSONObject> res = rescueDriverPositionService.routeInfo(page,rescueDriverPosition);
return success(res);
}
}
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java
index 3c949648..efad8bcb 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java
@@ -8,7 +8,6 @@ import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.constant.UserConstants;
import cn.iocoder.yudao.module.rescue.core.controller.BaseController;
-import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo;
import cn.iocoder.yudao.module.rescue.domain.*;
import cn.iocoder.yudao.module.rescue.dto.DriverInfoDto;
import cn.iocoder.yudao.module.rescue.dto.SysDictData;
@@ -121,13 +120,12 @@ public class RescueInfoSystem extends BaseController {
* 查询【请填写功能名称】列表
*/
@GetMapping("/list")
- public TableDataInfo list(RescueInfo rescueInfo,
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ public CommonResult list(RescueInfo rescueInfo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
- startPage();
- List<RescueInfo> rescueInfos = rescueInfoService.selectRescueListSystem(rescueInfo);
- TableDataInfo dataTable = getDataTable(rescueInfos);
- return dataTable;
+ Page<RescueInfo> page = new Page<>(pageNum, pageSize);
+ IPage<RescueInfo> rescueInfos = rescueInfoService.selectRescueListSystem(page,rescueInfo);
+ return success(rescueInfos);
}
/**
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueRefuelRecordController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueRefuelRecordController.java
index 31f3dc35..7315991d 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueRefuelRecordController.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueRefuelRecordController.java
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.rescue.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.rescue.core.controller.BaseController;
-import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo;
import cn.iocoder.yudao.module.rescue.domain.RescueRefuelRecord;
import cn.iocoder.yudao.module.rescue.service.IRescueRefuelRecordService;
import cn.iocoder.yudao.module.rescue.utils.ExcelUtil;
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/SysConfigController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/SysConfigController.java
index 45056e53..17e9f970 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/SysConfigController.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/SysConfigController.java
@@ -3,10 +3,11 @@ package cn.iocoder.yudao.module.rescue.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.rescue.core.controller.BaseController;
-import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo;
import cn.iocoder.yudao.module.rescue.domain.SysConfig;
import cn.iocoder.yudao.module.rescue.service.ISysConfigService;
import cn.iocoder.yudao.module.rescue.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,21 +35,26 @@ public class SysConfigController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('system:config:list')")
@GetMapping("/list")
- public TableDataInfo list(SysConfig config)
+ public CommonResult list(SysConfig config,
+ @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+ @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
{
- startPage();
- List<SysConfig> list = configService.selectConfigList(config);
- return getDataTable(list);
+ Page<SysConfig> page = new Page<>(pageNum, pageSize);
+ IPage<SysConfig> list = configService.selectConfigList(page,config);
+ return success(list);
}
// @Log(title = "参数管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:config:export')")
@PostMapping("/export")
- public void export(HttpServletResponse response, SysConfig config)
+ public void export(HttpServletResponse response, SysConfig config,
+ @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+ @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
{
- List<SysConfig> list = configService.selectConfigList(config);
+ Page<SysConfig> page = new Page<>(pageNum, pageSize);
+ IPage<SysConfig> list = configService.selectConfigList(page,config);
ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
- util.exportExcel(response, list, "参数数据");
+ util.exportExcel(response, list.getRecords(), "参数数据");
}
/**
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueConfigMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueConfigMapper.java
index d904e10a..297299e0 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueConfigMapper.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueConfigMapper.java
@@ -3,7 +3,10 @@ package cn.iocoder.yudao.module.rescue.mapper;
import cn.iocoder.yudao.module.rescue.domain.RescueConfig;
+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 RescueConfigMapper
* @param rescueConfig 救援司机提成配置
* @return 救援司机提成配置集合
*/
- public List<RescueConfig> selectRescueConfigList(RescueConfig rescueConfig);
+ public IPage<RescueConfig> selectRescueConfigList(Page<RescueConfig> page, @Param("vo") RescueConfig rescueConfig);
/**
* 新增救援司机提成配置
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueDriverPositionMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueDriverPositionMapper.java
index 699cf4f6..43e030ae 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueDriverPositionMapper.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueDriverPositionMapper.java
@@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.rescue.mapper;
import cn.iocoder.yudao.module.rescue.domain.RescueDriverPosition;
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;
import java.util.List;
@@ -29,6 +32,6 @@ public interface RescueDriverPositionMapper extends BaseMapper<RescueDriverPosi
* @param rescueDriverPosition 救援司机位置记录
* @return 救援司机位置记录集合
*/
- public List<RescueDriverPosition> selectRescueDriverPositionList(RescueDriverPosition rescueDriverPosition);
+ public IPage<RescueDriverPosition> selectRescueDriverPositionList(Page<RescueDriverPosition> page, @Param("vo") RescueDriverPosition rescueDriverPosition);
}
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 a1e04dae..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
@@ -1,7 +1,10 @@
package cn.iocoder.yudao.module.rescue.mapper;
import cn.iocoder.yudao.module.rescue.domain.SysConfig;
+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;
@@ -36,6 +39,14 @@ public interface RescueSysConfigMapper {
*/
public List<SysConfig> selectConfigList(SysConfig config);
+ /**
+ * 查询参数配置列表
+ *
+ * @param config 参数配置信息
+ * @return 参数配置集合
+ */
+ public IPage<SysConfig> selectConfigListIPage(Page<SysConfig> page, @Param("vo") SysConfig config);
+
/**
* 根据键名查询参数配置信息
*
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueConfigService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueConfigService.java
index 7030308e..27324aa8 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueConfigService.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueConfigService.java
@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.rescue.service;
import cn.iocoder.yudao.module.rescue.domain.RescueConfig;
+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 IRescueConfigService
* @param rescueConfig 救援司机提成配置
* @return 救援司机提成配置集合
*/
- public List<RescueConfig> selectRescueConfigList(RescueConfig rescueConfig);
+ public IPage<RescueConfig> selectRescueConfigList(Page<RescueConfig> page, RescueConfig rescueConfig);
/**
* 新增救援司机提成配置
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueDriverPositionService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueDriverPositionService.java
index f014a945..6663215b 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueDriverPositionService.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueDriverPositionService.java
@@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.rescue.service;
import cn.iocoder.yudao.module.rescue.domain.RescueDriverPosition;
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;
@@ -30,7 +32,7 @@ public interface IRescueDriverPositionService extends IService<RescueDriverPosi
* @param rescueDriverPosition 救援司机位置记录
* @return 救援司机位置记录集合
*/
- public List<RescueDriverPosition> selectRescueDriverPositionList(RescueDriverPosition rescueDriverPosition);
+ public IPage<RescueDriverPosition> selectRescueDriverPositionList(Page<RescueDriverPosition> page, RescueDriverPosition rescueDriverPosition);
/**
* 新增救援司机位置记录
@@ -63,6 +65,6 @@ public interface IRescueDriverPositionService extends IService<RescueDriverPosi
* @return 结果
*/
public int deleteRescueDriverPositionById(Long id);
- List<RescueDriverPosition> listByInfoId(RescueDriverPosition rescueDriverPosition);
- List<JSONObject> routeInfo(RescueDriverPosition rescueDriverPosition);
+ IPage<RescueDriverPosition> listByInfoId(Page<RescueDriverPosition> page, RescueDriverPosition rescueDriverPosition);
+ IPage<JSONObject> routeInfo(Page<RescueDriverPosition> page,RescueDriverPosition rescueDriverPosition);
}
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java
index 3b37b45b..1df9c33c 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java
@@ -48,7 +48,7 @@ public interface IRescueInfoService extends IService<RescueInfo>
IPage<RescueInfo> selectRescueInfoListByAdmin(RescueInfo rescueInfo, Page<RescueInfo> page);
JSONObject rescueInfoDetail(Long rescueId);
- List<RescueInfo> selectRescueListSystem(RescueInfo rescueInfo);
+ IPage<RescueInfo> selectRescueListSystem(Page<RescueInfo> page,RescueInfo rescueInfo);
IPage<RescueInfo> selectRescueListSystem2(RescueInfo rescueInfo, Page<RescueInfo> page);
JSONObject listData(RescueInfo rescueInfo);
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/ISysConfigService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/ISysConfigService.java
index d189cc88..2285c521 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/ISysConfigService.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/ISysConfigService.java
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.rescue.service;
import cn.iocoder.yudao.module.rescue.domain.SysConfig;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
@@ -40,7 +42,7 @@ public interface ISysConfigService
* @param config 参数配置信息
* @return 参数配置集合
*/
- public List<SysConfig> selectConfigList(SysConfig config);
+ public IPage<SysConfig> selectConfigList(Page<SysConfig> page, SysConfig config);
/**
* 新增参数配置
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueConfigServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueConfigServiceImpl.java
index ba211b76..10d8b944 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueConfigServiceImpl.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueConfigServiceImpl.java
@@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.rescue.service.impl;
import cn.iocoder.yudao.module.rescue.domain.RescueConfig;
import cn.iocoder.yudao.module.rescue.mapper.RescueConfigMapper;
import cn.iocoder.yudao.module.rescue.service.IRescueConfigService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -49,9 +51,9 @@ public class RescueConfigServiceImpl implements IRescueConfigService
* @return 救援司机提成配置
*/
@Override
- public List<RescueConfig> selectRescueConfigList(RescueConfig rescueConfig)
+ public IPage<RescueConfig> selectRescueConfigList(Page<RescueConfig> page, RescueConfig rescueConfig)
{
- return rescueConfigMapper.selectRescueConfigList(rescueConfig);
+ return rescueConfigMapper.selectRescueConfigList(page,rescueConfig);
}
/**
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverPositionServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverPositionServiceImpl.java
index 15cce5e2..6e87cf54 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverPositionServiceImpl.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverPositionServiceImpl.java
@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.rescue.service.IRescueDriverPositionService;
import cn.iocoder.yudao.module.rescue.service.IRescueInfoDetailService;
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.framework.tenant.core.db.TenantBaseDO;
import cn.iocoder.yudao.module.rescue.mapper.RescueDriverPositionMapper;
@@ -50,9 +52,9 @@ public class RescueDriverPositionServiceImpl extends ServiceImpl<RescueDriverPos
* @return 救援司机位置记录
*/
@Override
- public List<RescueDriverPosition> selectRescueDriverPositionList(RescueDriverPosition rescueDriverPosition)
+ public IPage<RescueDriverPosition> selectRescueDriverPositionList(Page<RescueDriverPosition> page, RescueDriverPosition rescueDriverPosition)
{
- return baseMapper.selectRescueDriverPositionList(rescueDriverPosition);
+ return baseMapper.selectRescueDriverPositionList(page,rescueDriverPosition);
}
/**
@@ -104,8 +106,8 @@ public class RescueDriverPositionServiceImpl extends ServiceImpl<RescueDriverPos
}
@Override
- public List<RescueDriverPosition> listByInfoId(RescueDriverPosition rescueDriverPosition) {
- List<RescueDriverPosition> rescueDriverPositions = baseMapper.selectRescueDriverPositionList(rescueDriverPosition);
+ public IPage<RescueDriverPosition> listByInfoId(Page<RescueDriverPosition> page, RescueDriverPosition rescueDriverPosition) {
+ IPage<RescueDriverPosition> rescueDriverPositions = baseMapper.selectRescueDriverPositionList(page,rescueDriverPosition);
RescueInfoDetail rescueInfoDetail =new RescueInfoDetail();
rescueInfoDetail.setRescueInfoId(rescueDriverPosition.getRescueInfoId());
LambdaQueryWrapper<RescueInfoDetail> queryWrapper =new LambdaQueryWrapper<>();
@@ -113,7 +115,7 @@ public class RescueDriverPositionServiceImpl extends ServiceImpl<RescueDriverPos
List<RescueInfoDetail> details = detailService.list(queryWrapper);
List<Long> collect = details.stream().map(RescueInfoDetail::getPositionId).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(details)){
- for (RescueDriverPosition driverPosition : rescueDriverPositions) {
+ for (RescueDriverPosition driverPosition : rescueDriverPositions.getRecords()) {
if (collect.contains(driverPosition.getId())){
driverPosition.setMark("中转点");
}
@@ -123,8 +125,8 @@ public class RescueDriverPositionServiceImpl extends ServiceImpl<RescueDriverPos
}
@Override
- public List<JSONObject> routeInfo(RescueDriverPosition rescueDriverPosition) {
- List<RescueDriverPosition> rescueDriverPositions = baseMapper.selectRescueDriverPositionList(rescueDriverPosition);
+ public IPage<JSONObject> routeInfo(Page<RescueDriverPosition> page, RescueDriverPosition rescueDriverPosition) {
+ IPage<RescueDriverPosition> rescueDriverPositions = baseMapper.selectRescueDriverPositionList(page,rescueDriverPosition);
RescueInfoDetail rescueInfoDetail =new RescueInfoDetail();
rescueInfoDetail.setRescueInfoId(rescueDriverPosition.getRescueInfoId());
LambdaQueryWrapper<RescueInfoDetail> queryWrapper =new LambdaQueryWrapper<>();
@@ -134,19 +136,19 @@ public class RescueDriverPositionServiceImpl extends ServiceImpl<RescueDriverPos
Long distanceMeter = 0L;
List<JSONObject> res =new ArrayList<>();
if (CollectionUtil.isNotEmpty(details)){
- for (int i = 0; i < rescueDriverPositions.size()-1; i++) {
- double longitude = Double.parseDouble(rescueDriverPositions.get(i+1).getLongitude());
+ for (int i = 0; i < rescueDriverPositions.getRecords().size()-1; i++) {
+ double longitude = Double.parseDouble(rescueDriverPositions.getRecords().get(i+1).getLongitude());
//纬度
- double latitude = Double.parseDouble(rescueDriverPositions.get(i+1).getLatitude());
+ double latitude = Double.parseDouble(rescueDriverPositions.getRecords().get(i+1).getLatitude());
- double longitude2 = Double.parseDouble(rescueDriverPositions.get(i).getLongitude());
+ double longitude2 = Double.parseDouble(rescueDriverPositions.getRecords().get(i).getLongitude());
//纬度
- double latitude2 = Double.parseDouble(rescueDriverPositions.get(i).getLatitude());
+ double latitude2 = Double.parseDouble(rescueDriverPositions.getRecords().get(i).getLatitude());
distanceMeter = distanceMeter + getDistanceMeter(longitude2,latitude2, longitude, latitude);
- if (collect.contains(rescueDriverPositions.get(i+1).getId())){
+ if (collect.contains(rescueDriverPositions.getRecords().get(i+1).getId())){
LambdaQueryWrapper<RescueInfoDetail> queryWrapper1 =new LambdaQueryWrapper<>();
- queryWrapper1.eq(RescueInfoDetail::getRescueInfoId,rescueDriverPosition.getRescueInfoId()).eq(RescueInfoDetail::getPositionId,rescueDriverPositions.get(i+1).getId());
+ queryWrapper1.eq(RescueInfoDetail::getRescueInfoId,rescueDriverPosition.getRescueInfoId()).eq(RescueInfoDetail::getPositionId,rescueDriverPositions.getRecords().get(i+1).getId());
RescueInfoDetail detail = detailService.getOne(queryWrapper1);
JSONObject jsonObject =new JSONObject();
jsonObject.put("title",detail.getTitle());
@@ -156,6 +158,11 @@ public class RescueDriverPositionServiceImpl extends ServiceImpl<RescueDriverPos
}
}
}
- return res;
+ IPage<JSONObject> resultPage = new Page<>(page.getCurrent(), page.getSize());
+ resultPage.setRecords(res); // 设置记录
+ resultPage.setTotal(rescueDriverPositions.getTotal()); // 设置总数
+ return resultPage;
}
+
+
}
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java
index 063f4af6..2b70bbc0 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java
@@ -317,8 +317,8 @@ public class RescueInfoServiceImpl extends ServiceImpl<RescueInfoMapper, RescueI
}
@Override
- public List<RescueInfo> selectRescueListSystem(RescueInfo rescueInfo) {
- return baseMapper.selectList(new QueryWrapper<>());
+ public IPage<RescueInfo> selectRescueListSystem(Page<RescueInfo> page, RescueInfo rescueInfo) {
+ return baseMapper.selectPage(page,new QueryWrapper<>());
}
@Override
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 5f4ab49a..f24faf17 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
@@ -9,6 +9,8 @@ import cn.iocoder.yudao.module.rescue.domain.SysConfig;
import cn.iocoder.yudao.module.rescue.mapper.RescueSysConfigMapper;
import cn.iocoder.yudao.module.rescue.service.ISysConfigService;
import cn.iocoder.yudao.module.rescue.utils.StringUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -99,8 +101,8 @@ public class SysConfigServiceImpl implements ISysConfigService {
* @return 参数配置集合
*/
@Override
- public List<SysConfig> selectConfigList(SysConfig config) {
- return configMapper2.selectConfigList(config);
+ public IPage<SysConfig> selectConfigList(Page<SysConfig> page, SysConfig config) {
+ return configMapper2.selectConfigListIPage(page,config);
}
/**
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/dl-module-rescue/src/main/resources/mapper/rescue/RescueConfigMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueConfigMapper.xml
index 0ec216b4..4e50145f 100644
--- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueConfigMapper.xml
+++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueConfigMapper.xml
@@ -18,10 +18,10 @@
<select id="selectRescueConfigList" parameterType="cn.iocoder.yudao.module.rescue.domain.RescueConfig" resultMap="RescueConfigResult">
<include refid="selectRescueConfigVo"/>
<where>
- <if test="topDeptId != null "> and top_dept_id = #{topDeptId}</if>
- <if test="rescueTcBig != null "> and rescue_tc_big = #{rescueTcBig}</if>
- <if test="rescueTcMid != null "> and rescue_tc_mid = #{rescueTcMid}</if>
- <if test="rescueTcSmall != null "> and rescue_tc_small = #{rescueTcSmall}</if>
+ <if test="vo.topDeptId != null "> and top_dept_id = #{vo.topDeptId}</if>
+ <if test="vo.rescueTcBig != null "> and rescue_tc_big = #{vo.rescueTcBig}</if>
+ <if test="vo.rescueTcMid != null "> and rescue_tc_mid = #{vo.rescueTcMid}</if>
+ <if test="vo.rescueTcSmall != null "> and rescue_tc_small = #{vo.rescueTcSmall}</if>
</where>
</select>
diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml
index 523425cb..e18be413 100644
--- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml
+++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml
@@ -86,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
`rescue_info` ri
INNER JOIN rescue_driver_info rdi ON ri.id = rdi.rescue_id AND rdi.driver_accept = '2'
WHERE
+ ri.deleted = 0 and
rdi.driver_id =#{driverId} and ri.rescue_status = '2'
and ri.driver_id is null
ORDER BY rdi.create_time desc
@@ -128,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
`rescue_info` ri
left join rescue_order_info roi on ri.id = roi.rescue_info_id
WHERE
+ ri.deleted = '0' and
ri.driver_id =#{map.driverId}
<if test="map.rescueStatus == '3'.toString()">
and ri.rescue_status = #{map.rescueStatus}
@@ -143,6 +145,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
`rescue_driver_info` rdi
INNER JOIN rescue_info ri on rdi.rescue_id = ri.id
- where rdi.driver_accept ='2' and rdi.driver_id =#{driverId} and ri.rescue_status = '2' and ri.driver_id is null
+ where rdi.deleted = 0 and rdi.driver_accept ='2' and rdi.driver_id =#{driverId} and ri.rescue_status = '2' and ri.driver_id is null
</select>
</mapper>
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"
<select id="selectRescueDriverPositionList" resultType="cn.iocoder.yudao.module.rescue.domain.RescueDriverPosition">
select * from rescue_driver_position
<where>
- <if test="rescueInfoId != null "> and rescue_info_id = #{rescueInfoId}</if>
- <if test="driverId != null "> and driver_id = #{driverId}</if>
- <if test="longitude != null and longitude != ''"> and longitude = #{longitude}</if>
- <if test="latitude != null and latitude != ''"> and latitude = #{latitude}</if>
- <if test="positionInfo != null and positionInfo != ''"> and position_info = #{positionInfo}</if>
+ <if test="vo.rescueInfoId != null "> and rescue_info_id = #{vo.rescueInfoId}</if>
+ <if test="vo.driverId != null "> and driver_id = #{vo.driverId}</if>
+ <if test="vo.longitude != null and vo.longitude != ''"> and longitude = #{vo.longitude}</if>
+ <if test="vo.latitude != null and vo.latitude != ''"> and latitude = #{vo.latitude}</if>
+ <if test="vo.positionInfo != null and vo.positionInfo != ''"> and position_info = #{vo.positionInfo}</if>
</where>
order by create_time
</select>
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..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"
<include refid="selectConfigVo"/>
<include refid="sqlwhereSearch"/>
</select>
-
+
+ <select id="selectConfigListIPage" resultMap="SysConfigResult">
+ <include refid="selectConfigVo"/>
+ <where>
+ <if test="vo.configName != null and vo.configName != ''">
+ AND config_name like concat('%', #{vo.configName}, '%')
+ </if>
+ <if test="vo.configType != null and vo.configType != ''">
+ AND config_type = #{vo.configType}
+ </if>
+ <if test="vo.configKey != null and vo.configKey != ''">
+ AND config_key like concat('%', #{vo.configKey}, '%')
+ </if>
+ </where>
+ </select>
+
<select id="selectConfigList" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
<where>
- <if test="configName != null and configName != ''">
- AND config_name like concat('%', #{configName}, '%')
- </if>
- <if test="configType != null and configType != ''">
- AND config_type = #{configType}
- </if>
- <if test="configKey != null and configKey != ''">
- AND config_key like concat('%', #{configKey}, '%')
- </if>
- </where>
+ <if test="configName != null and configName != ''">
+ AND config_name like concat('%', #{configName}, '%')
+ </if>
+ <if test="configType != null and configType != ''">
+ AND config_type = #{configType}
+ </if>
+ <if test="configKey != null and configKey != ''">
+ AND config_key like concat('%', #{configKey}, '%')
+ </if>
+ </where>
</select>
<select id="selectConfigById" parameterType="Long" resultMap="SysConfigResult">
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 @@
<druid.version>1.2.23</druid.version>
<mybatis.version>3.5.16</mybatis.version>
<mybatis-plus.version>3.5.7</mybatis-plus.version>
- <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
+<!-- <pagehelper.boot.version>1.4.6</pagehelper.boot.version>-->
+ <pagehelper.boot.version>2.1.0</pagehelper.boot.version>
<jsqlparser.version>4.9</jsqlparser.version>
<mybatis-plus-generator.version>3.5.7</mybatis-plus-generator.version>
<dynamic-datasource.version>4.3.1</dynamic-datasource.version>
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 719b2e4c..af9d4d67 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
@@ -12,6 +12,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/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java
index 43b5691b..82cdf1f2 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java
@@ -16,7 +16,6 @@ public class NotifyTemplateSendReqVO {
private Long userId;
@Schema(description = "用户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "用户类型不能为空")
private Integer userType;
@Schema(description = "模板编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "01")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/notify/ApiNotifyMessageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/notify/ApiNotifyMessageController.java
new file mode 100644
index 00000000..3d5bc455
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/notify/ApiNotifyMessageController.java
@@ -0,0 +1,84 @@
+package cn.iocoder.yudao.module.system.controller.app.notify;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.service.notify.NotifyMessageService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+@Tag(name = "小程序-站内消息")
+@RestController
+@RequestMapping("/system/notify-message")
+@Validated
+public class ApiNotifyMessageController {
+
+ @Resource
+ private NotifyMessageService notifyMessageService;
+
+ // ========== 管理所有的站内信 ==========
+
+ @GetMapping("/get")
+ @Operation(summary = "获得站内信")
+ @Parameter(name = "id", description = "编号", required = true, example = "1024")
+ public CommonResult<NotifyMessageRespVO> getNotifyMessage(@RequestParam("id") Long id) {
+ NotifyMessageDO message = notifyMessageService.getNotifyMessage(id);
+ return success(BeanUtils.toBean(message, NotifyMessageRespVO.class));
+ }
+
+ // ========== 查看自己的站内信 ==========
+ @GetMapping("/my-page")
+ @Operation(summary = "获得我的站内信分页")
+ public CommonResult<PageResult<NotifyMessageRespVO>> getMyMyNotifyMessagePage(@Valid NotifyMessageMyPageReqVO pageVO) {
+ PageResult<NotifyMessageDO> pageResult = notifyMessageService.getWxMyNotifyMessagePage(pageVO,getLoginUserId());
+ return success(BeanUtils.toBean(pageResult, NotifyMessageRespVO.class));
+ }
+
+ @PutMapping("/update-read")
+ @Operation(summary = "标记站内信为已读")
+ @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
+ public CommonResult<Boolean> updateNotifyMessageRead(@RequestParam("ids") List<Long> ids) {
+ notifyMessageService.updateWXNotifyMessageRead(ids, getLoginUserId());
+ return success(Boolean.TRUE);
+ }
+
+ @PutMapping("/update-all-read")
+ @Operation(summary = "标记所有站内信为已读")
+ public CommonResult<Boolean> updateAllNotifyMessageRead() {
+ notifyMessageService.updateWXAllNotifyMessageRead(getLoginUserId());
+ return success(Boolean.TRUE);
+ }
+
+ @GetMapping("/get-unread-list")
+ @Operation(summary = "获取当前用户的最新站内信列表，默认 10 条")
+ @Parameter(name = "size", description = "10")
+ public CommonResult<List<NotifyMessageRespVO>> getUnreadNotifyMessageList(
+ @RequestParam(name = "size", defaultValue = "10") Integer size) {
+ List<NotifyMessageDO> list = notifyMessageService.getUnreadNotifyMessageList(
+ getLoginUserId(), UserTypeEnum.ADMIN.getValue(), size);
+ return success(BeanUtils.toBean(list, NotifyMessageRespVO.class));
+ }
+
+ @GetMapping("/get-unread-count")
+ @Operation(summary = "获得当前用户的未读站内信数量")
+ @ApiAccessLog(enable = false) // 由于前端会不断轮询该接口，记录日志没有意义
+ public CommonResult<Long> getUnreadNotifyMessageCount() {
+ return success(notifyMessageService.getWXUnreadNotifyMessageCount(getLoginUserId()));
+ }
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
index e9ce6d71..7473abe8 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
@@ -35,12 +35,20 @@ public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
.orderByDesc(NotifyMessageDO::getId));
}
+ default PageResult<NotifyMessageDO> selectWxPage(NotifyMessageMyPageReqVO reqVO, Long userId) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<NotifyMessageDO>()
+ .eqIfPresent(NotifyMessageDO::getReadStatus, reqVO.getReadStatus())
+ .betweenIfPresent(NotifyMessageDO::getCreateTime, reqVO.getCreateTime())
+ .eq(NotifyMessageDO::getUserId, userId)
+ .orderByDesc(NotifyMessageDO::getId));
+ }
+
default int updateListRead(Collection<Long> ids, Long userId, Integer userType) {
return update(new NotifyMessageDO().setReadStatus(true).setReadTime(LocalDateTime.now()),
new LambdaQueryWrapperX<NotifyMessageDO>()
.in(NotifyMessageDO::getId, ids)
.eq(NotifyMessageDO::getUserId, userId)
- .eq(NotifyMessageDO::getUserType, userType)
+ .eqIfPresent(NotifyMessageDO::getUserType, userType)
.eq(NotifyMessageDO::getReadStatus, false));
}
@@ -48,7 +56,7 @@ public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
return update(new NotifyMessageDO().setReadStatus(true).setReadTime(LocalDateTime.now()),
new LambdaQueryWrapperX<NotifyMessageDO>()
.eq(NotifyMessageDO::getUserId, userId)
- .eq(NotifyMessageDO::getUserType, userType)
+ .eqIfPresent(NotifyMessageDO::getUserType, userType)
.eq(NotifyMessageDO::getReadStatus, false));
}
@@ -64,7 +72,7 @@ public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
return selectCount(new LambdaQueryWrapperX<NotifyMessageDO>()
.eq(NotifyMessageDO::getReadStatus, false)
.eq(NotifyMessageDO::getUserId, userId)
- .eq(NotifyMessageDO::getUserType, userType));
+ .eqIfPresent(NotifyMessageDO::getUserType, userType));
}
}
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 cbcdbeba..dada9a7c 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
@@ -6,6 +6,8 @@ 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.controller.app.user.UserInfoVO;
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;
@@ -50,6 +52,8 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
}
List<AdminUserDO> getUsersByRoleRescue(@Param("roleCode") String roleCode, @Param("searchValue") String searchValue, @Param("deptIds") List<String> deptIds);
+ IPage<AdminUserDO> getUsersByRoleRescueTwo(Page<AdminUserDO> page,@Param("roleCode") String roleCode, @Param("searchValue") String searchValue, @Param("deptIds") List<String> deptIds);
+
Integer getStudentNumberByUserId(Long jlId);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
index b06aef32..aa428695 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
@@ -48,6 +48,15 @@ public interface NotifyMessageService {
*/
PageResult<NotifyMessageDO> getMyMyNotifyMessagePage(NotifyMessageMyPageReqVO pageReqVO, Long userId, Integer userType);
+ /**
+ * 获得【我的】站内信分页---小程序使用
+ *
+ * @param pageReqVO 分页查询
+ * @param userId 用户编号
+ * @return 站内信分页
+ */
+ PageResult<NotifyMessageDO> getWxMyNotifyMessagePage(NotifyMessageMyPageReqVO pageReqVO, Long userId);
+
/**
* 获得站内信
*
@@ -74,6 +83,13 @@ public interface NotifyMessageService {
* @return 返回未读站内信条数
*/
Long getUnreadNotifyMessageCount(Long userId, Integer userType);
+ /**
+ * 统计用户未读站内信条数--微信小程序
+ *
+ * @param userId 用户编号
+ * @return 返回未读站内信条数
+ */
+ Long getWXUnreadNotifyMessageCount(Long userId);
/**
* 标记站内信为已读
@@ -84,6 +100,14 @@ public interface NotifyMessageService {
* @return 更新到的条数
*/
int updateNotifyMessageRead(Collection<Long> ids, Long userId, Integer userType);
+ /**
+ * 标记站内信为已读 --微信小程序
+ *
+ * @param ids 站内信编号集合
+ * @param userId 用户编号
+ * @return 更新到的条数
+ */
+ int updateWXNotifyMessageRead(Collection<Long> ids, Long userId);
/**
* 标记所有站内信为已读
@@ -94,4 +118,12 @@ public interface NotifyMessageService {
*/
int updateAllNotifyMessageRead(Long userId, Integer userType);
+ /**
+ * 标记所有站内信为已读---微信小程序
+ *
+ * @param userId 用户编号
+ * @return 更新到的条数
+ */
+ int updateWXAllNotifyMessageRead(Long userId);
+
}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
index 1ac4c048..c54fc8b5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.system.service.notify;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
@@ -46,6 +47,11 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
public PageResult<NotifyMessageDO> getMyMyNotifyMessagePage(NotifyMessageMyPageReqVO pageReqVO, Long userId, Integer userType) {
return notifyMessageMapper.selectPage(pageReqVO, userId, userType);
}
+ @Override
+ @TenantIgnore
+ public PageResult<NotifyMessageDO> getWxMyNotifyMessagePage(NotifyMessageMyPageReqVO pageReqVO, Long userId) {
+ return notifyMessageMapper.selectWxPage(pageReqVO, userId);
+ }
@Override
public NotifyMessageDO getNotifyMessage(Long id) {
@@ -61,15 +67,30 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
public Long getUnreadNotifyMessageCount(Long userId, Integer userType) {
return notifyMessageMapper.selectUnreadCountByUserIdAndUserType(userId, userType);
}
+ @Override
+ @TenantIgnore
+ public Long getWXUnreadNotifyMessageCount(Long userId) {
+ return notifyMessageMapper.selectUnreadCountByUserIdAndUserType(userId, null);
+ }
@Override
public int updateNotifyMessageRead(Collection<Long> ids, Long userId, Integer userType) {
return notifyMessageMapper.updateListRead(ids, userId, userType);
}
+ @Override
+ @TenantIgnore
+ public int updateWXNotifyMessageRead(Collection<Long> ids, Long userId) {
+ return notifyMessageMapper.updateListRead(ids, userId, null);
+ }
@Override
public int updateAllNotifyMessageRead(Long userId, Integer userType) {
return notifyMessageMapper.updateListRead(userId, userType);
}
+ @Override
+ @TenantIgnore
+ public int updateWXAllNotifyMessageRead(Long userId) {
+ return notifyMessageMapper.updateListRead(userId, null);
+ }
}
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 ae9d775e..33e96340 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
@@ -12,6 +12,8 @@ import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqV
import cn.iocoder.yudao.module.system.controller.app.user.UserInfoVO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import javax.validation.Valid;
import java.io.InputStream;
@@ -234,6 +236,7 @@ public interface AdminUserService extends IService<AdminUserDO> {
boolean isPasswordMatch(String rawPassword, String encodedPassword);
List<AdminUserDO> getUsersByRoleRescue(String roleCode, String searchValue, List<String> deptIds);
+ IPage<AdminUserDO> getUsersByRoleRescueTow(Page<AdminUserDO> page,String roleCode, String searchValue, List<String> deptIds);
Integer getStudentNumberByUserId(Long jlId);
List<String> 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 830392fe..61a64edf 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
@@ -31,6 +31,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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.annotations.VisibleForTesting;
import com.mzt.logapi.context.LogRecordContext;
@@ -535,6 +537,10 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
return userMapper.getUsersByRoleRescue(roleCode,searchValue,deptIds);
}
+ @Override
+ public IPage<AdminUserDO> getUsersByRoleRescueTow(Page<AdminUserDO> page,String roleCode, String searchValue, List<String> 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 40245dc2..0ed7db61 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
@@ -31,6 +31,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</select>
+ <select id="getUsersByRoleRescueTwo" resultType="cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO">
+ SELECT
+ distinct su.*
+ FROM
+ system_users su
+ INNER JOIN system_user_role ur on ur.user_id = su.id
+ INNER JOIN system_role role on ur.role_id = role.id
+ where role.code = #{roleCode}
+ <if test="searchValue !=null and searchValue!=''">
+ and (mobile like concat('%',#{searchValue},'%') or nickname like concat('%',#{searchValue},'%') )
+ </if>
+ <if test="deptIds !=null and deptIds.size()>0">
+ AND su.dept_id in
+ <foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
+ </select>
+
<select id="getStudentNumberByUserId" resultType="Integer">
select distinct count(1) number from drive_school_reservation_course where coach_id = #{userId}
</select>
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 1571d693..aa41b6e1 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -179,6 +179,7 @@ logging:
cn.iocoder.yudao.module.company.mapper: debug #
cn.iocoder.yudao.module.staff.mapper: debug #
cn.iocoder.yudao.module.property.mapper: debug #
+ cn.iocoder.yudao.module.tickets.mapper: debug #
debug: false