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-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 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..0e57fff 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.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;
+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;
+import java.util.List;
/**
* <p>
@@ -16,6 +29,28 @@
@RestController
@RequestMapping("/t-invoice")
public class TInvoiceController {
+ @Autowired
+ private TInvoiceService invoiceService;
+ @PreAuthorize("@ss.hasPermi('system:invoice:list')")
+ @ApiOperation(value = "获取开票列表")
+ @PostMapping("/list")
+ public R<PageInfo<TInvoice>> list(@RequestBody TInvoiceQuery query) {
+ return R.ok(invoiceService.pageList(query));
+ }
+
+ @PreAuthorize("@ss.hasPermi('system:invoice:delete')")
+ @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")
+ // public AjaxResult<List<TBill>> getBillByInvoiceId(String invoiceId){
+ // return AjaxResult.success(invoiceService.getBillByInvoiceId(invoiceId));
+ // }
}
--
Gitblit v1.7.1