From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 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 b6f8562..157d180 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,9 +1,22 @@
package com.ruoyi.web.controller.api;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.TencentMailUtil;
+import com.ruoyi.system.dto.TBillDto;
+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 org.springframework.web.bind.annotation.RestController;
/**
* <p>
@@ -16,6 +29,36 @@
@RestController
@RequestMapping("/t-invoice")
public class TInvoiceController {
+ @Autowired
+ private TInvoiceService invoiceService;
+ @Autowired
+ TBillService tBillService;
+ @PreAuthorize("@ss.hasPermi('invoice:list')")
+ @ApiOperation(value = "获取开票列表")
+ @PostMapping("/list")
+ public R<PageInfo<TInvoice>> list(@RequestBody TInvoiceQuery query) {
+ return R.ok(invoiceService.pageList(query));
+ }
+ @PreAuthorize("@ss.hasPermi('invoice:list:del')")
+ @Log(title = "开票信息-删除开票", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除开票")
+ @DeleteMapping(value = "/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ return R.ok(invoiceService.removeById(id));
+ }
+
+ @ApiOperation(value = "关联账单信息")
+ @GetMapping(value = "/getBillByInvoiceId/{invoiceId}")
+ public R<PageInfo<TBillDto>> getBillByInvoiceId(@PathVariable String invoiceId){
+ return R.ok(tBillService.getBillByInvoiceId(invoiceId));
+ }
+
+ @ApiOperation(value = "上传开票凭证")
+ @PostMapping("/uploadVoucher")
+ @PreAuthorize("@ss.hasPermi('invoice:list:payment')")
+ public R<Boolean> uploadVoucher(@RequestBody TInvoiceQuery query) {
+ return R.ok(invoiceService.uploadVoucher(query));
+ }
}
--
Gitblit v1.7.1