ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
@@ -1,10 +1,13 @@ package com.ruoyi.web.controller.api; import com.mysql.cj.x.protobuf.MysqlxDatatypes; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.model.TBill; import com.ruoyi.system.model.TInvoice; import com.ruoyi.system.query.TInvoiceQuery; import com.ruoyi.system.service.TInvoiceService; @@ -12,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; /** * <p> @@ -41,5 +46,11 @@ return R.ok(invoiceService.removeById(id)); } @ApiOperation(value = "关联账单信息") @GetMapping(value = "/getBillByInvoiceId") public AjaxResult<List<TBill>> getBillByInvoiceId(String invoiceId){ return AjaxResult.success(invoiceService.getBillByInvoiceId(invoiceId)); } } ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TBill; import com.ruoyi.system.model.TInvoice; import com.ruoyi.system.query.TInvoiceQuery; @@ -18,4 +19,5 @@ public interface TInvoiceService extends IService<TInvoice> { PageInfo<TInvoice> pageList(TInvoiceQuery query); List<TInvoice> makeQuery(TInvoiceQuery query); List<TBill> getBillByInvoiceId(String invoiceId); } 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; } }