From 38c2954d317dc0c9dc9f73565d893a0d30f8a054 Mon Sep 17 00:00:00 2001 From: yupeng <roc__yu@163.com> Date: 星期五, 14 二月 2025 15:08:19 +0800 Subject: [PATCH] feat:创建订单修改返回的错误信息 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 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 65db90f..81c4fdf 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,9 +1,24 @@ 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.TBill; +import com.ruoyi.system.model.TInvoice; +import com.ruoyi.system.model.TInvoiceToBill; +import com.ruoyi.system.query.TInvoiceQuery; +import com.ruoyi.system.query.TInvoiceToBillQuery; +import com.ruoyi.system.service.TBillService; import com.ruoyi.system.service.TInvoiceService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sun.org.apache.regexp.internal.RE; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.ArrayList; +import java.util.List; /** * <p> @@ -15,5 +30,29 @@ */ @Service public class TInvoiceServiceImpl extends ServiceImpl<TInvoiceMapper, TInvoice> implements TInvoiceService { + @Autowired + TInvoiceToBillServiceImpl tInvoiceToBillService; + @Autowired + TBillService tBillService; + @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