From d036da1b4c6b6a5e4fd358562bedda4a41341ff3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 27 二月 2025 17:07:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
index 0e57fff..5a781f8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
@@ -1,22 +1,20 @@
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.TBillService;
import com.ruoyi.system.service.TInvoiceService;
import io.swagger.annotations.ApiOperation;
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>
@@ -31,6 +29,8 @@
public class TInvoiceController {
@Autowired
private TInvoiceService invoiceService;
+ @Autowired
+ TBillService tBillService;
@PreAuthorize("@ss.hasPermi('system:invoice:list')")
@ApiOperation(value = "获取开票列表")
@PostMapping("/list")
@@ -46,11 +46,22 @@
return R.ok(invoiceService.removeById(id));
}
- // @ApiOperation(value = "关联账单信息")
- // @GetMapping(value = "/getBillByInvoiceId")
- // public AjaxResult<List<TBill>> getBillByInvoiceId(String invoiceId){
- // return AjaxResult.success(invoiceService.getBillByInvoiceId(invoiceId));
- // }
+ @ApiOperation(value = "关联账单信息")
+ @GetMapping(value = "/getBillByInvoiceId/{invoiceId}")
+ public R<PageInfo<TBill>> getBillByInvoiceId(@PathVariable String invoiceId){
+ return R.ok(tBillService.getBillByInvoiceId(invoiceId));
+ }
+ @ApiOperation(value = "上传开票凭证")
+ @PostMapping("/uploadVoucher")
+ public R<Boolean> uploadVoucher(@RequestBody TInvoiceQuery query) {
+ TInvoice tInvoice = new TInvoice();
+ tInvoice.setId(query.getId());
+ tInvoice.setInvoiceVoucher(query.getInvoiceVoucher());
+ tInvoice.setInvoiceVoucherName(query.getInvoiceVoucherName());
+ tInvoice.setInvoiceTime(query.getInvoiceTime());
+ tInvoice.setStatus(2);
+ return R.ok(invoiceService.updateById(tInvoice));
+ }
}
--
Gitblit v1.7.1