From 3f9f3c40338190497d42c891dc0690789b834df6 Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期三, 12 二月 2025 13:19:55 +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 | 25 +++++++++++++++++++++++++
1 files changed, 25 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 b7c307b..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
@@ -4,12 +4,20 @@
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;
/**
@@ -22,6 +30,10 @@
*/
@Service
public class TInvoiceServiceImpl extends ServiceImpl<TInvoiceMapper, TInvoice> implements TInvoiceService {
+ @Autowired
+ TInvoiceToBillServiceImpl tInvoiceToBillService;
+ @Autowired
+ TBillService tBillService;
@Override
public PageInfo<TInvoice> pageList(TInvoiceQuery query) {
@@ -43,4 +55,17 @@
.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