From c9743d30317ed0aaa70a2f6f3649915051ea59b8 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 10 二月 2025 11:57:49 +0800 Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java index 10b6e5c..b7c307b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java @@ -1,10 +1,16 @@ package com.ruoyi.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.mapper.TInvoiceMapper; import com.ruoyi.system.model.TInvoice; +import com.ruoyi.system.query.TInvoiceQuery; import com.ruoyi.system.service.TInvoiceService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; + +import java.util.List; /** * <p> @@ -17,4 +23,24 @@ @Service public class TInvoiceServiceImpl extends ServiceImpl<TInvoiceMapper, TInvoice> implements TInvoiceService { + @Override + public PageInfo<TInvoice> pageList(TInvoiceQuery query) { + PageInfo<TInvoice> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + List<TInvoice> list = makeQuery(query); + pageInfo.setRecords(list); + pageInfo.setTotal(list.size()); + return pageInfo; + } + + @Override + public List<TInvoice> makeQuery(TInvoiceQuery query) { + LambdaQueryWrapper<TInvoice> queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(null != query.getTitleType(),TInvoice::getTitleType,query.getTitleType()) + .like(StringUtils.isNotEmpty(query.getTitleName()),TInvoice::getTitleName,query.getTitleName()) + .eq(null != query.getStatus(),TInvoice::getStatus,query.getStatus()) + .ge(StringUtils.isNotEmpty(query.getInvoiceStartTime()),TInvoice::getInvoiceTime,query.getInvoiceStartTime()) + .le(StringUtils.isNotEmpty(query.getInvoiceEndTime()),TInvoice::getInvoiceTime,query.getInvoiceEndTime()) + .orderByDesc(TInvoice::getCreateTime); + return this.baseMapper.selectList(queryWrapper); + } } -- Gitblit v1.7.1