From 2ba52666860b04bedff1da95af0f6445315e6128 Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期二, 11 二月 2025 14:27:52 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 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..c602c6b 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,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>
@@ -16,5 +30,42 @@
*/
@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);
+ }
+
+ @Override
+ public List<TBill> getBillByInvoiceId( String invoiceId){
+ ArrayList<TBill> bills = new ArrayList<>();
+ TInvoiceToBillQuery query = new TInvoiceToBillQuery();
+ query.setInvoiceId(invoiceId);
+ List<TInvoiceToBill> tInvoiceToBills = tInvoiceToBillService.makeQuery(query);
+ for (TInvoiceToBill tInvoiceToBill : tInvoiceToBills) {
+ TBill byId = tBillService.getById(tInvoiceToBill.getBillId());
+ bills.add(byId);
+ }
+ return bills;
+ }
}
--
Gitblit v1.7.1