diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 3699a060..a256a102 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -344,6 +344,12 @@ public class PayContactsManagementController extends JeroController 50){ return Result.error("合同名称长度不能大于50个字符!"); } - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PaySpendingContract::getContractNum,paySpendingContract.getContractNum()); - queryWrapper.eq(PaySpendingContract::getContractName,paySpendingContract.getContractName()); - queryWrapper.ge(PaySpendingContract::getCreateTime,startTime); - queryWrapper.le(PaySpendingContract::getCreateTime,endTime); Page page = new Page<>(pageNo, pageSize); - IPage pageList = paySpendingContractService.page(page, queryWrapper); + IPage pageList = paySpendingContractService.queryPageList(page, paySpendingContract.getContractNum(), + paySpendingContract.getContractName(),startTime,endTime); return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java index 6d5a7453..2649c730 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java @@ -2,7 +2,10 @@ package com.jero.contract.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.contract.entity.PaySpendingContract; +import org.apache.ibatis.annotations.Param; /** * @Description: pay_spending_contract @@ -12,4 +15,16 @@ import com.jero.contract.entity.PaySpendingContract; */ public interface PaySpendingContractMapper extends BaseMapper { + /** + * @Description 分页查询 + * @Author lqt + * @Date 2021/9/8 + * @Param + * @Return + * @Exception + */ + IPage queryPageList(Page page, @Param("contractNum") String contractNum, + @Param("contractName") String contractName,@Param("startTime") String startTime, + @Param("endTime") String endTime); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml index 4f33b071..a4bd0bd9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml @@ -2,4 +2,54 @@ + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java index d66f69a8..8a631f2c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java @@ -1,5 +1,7 @@ package com.jero.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 com.jero.contract.entity.PaySpendingContract; import com.jero.contract.vo.PaySpendingContractInput; @@ -13,6 +15,15 @@ import java.util.List; * @Version: V1.0 */ public interface IPaySpendingContractService extends IService { + /** + * @Description 分页查询 + * @Author lqt + * @Date 2021/9/8 + * @Param + * @Return + * @Exception + */ + IPage queryPageList(Page page,String contractNum,String contractName,String startTime,String endTime); /** * @Description 添加 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java index 49cdfdb7..88e52d47 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java @@ -2,6 +2,8 @@ package com.jero.contract.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +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.jero.common.exception.JeroBootException; import com.jero.common.util.ValidUtil; @@ -26,6 +28,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -52,6 +55,14 @@ public class PaySpendingContractServiceImpl extends ServiceImpl queryPageList(Page page, String contractNum, String contractName, String startTime, String endTime) { + return paySpendingContractMapper.queryPageList(page,contractNum,contractName,startTime,endTime); + } @Override public PaySpendingContract addPaySpendingContractInput(PaySpendingContractInput input) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 398409d7..0a77d8b2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -54,6 +54,8 @@ public class PayWorkingGroupController extends JeroController