From 6efb0ab56534f7c5afe5d8d494d7b78625b7cd00 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 11 九月 2024 14:58:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java
index fcbe968..12d6fcb 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java
@@ -5,6 +5,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.other.api.domain.TInvoiceType;
import com.ruoyi.other.query.InvoiceTypePageList;
import com.ruoyi.other.service.TInvoiceTypeService;
@@ -40,13 +42,12 @@
PageInfo<TInvoiceType> pageInfo = invoiceTypeService.pageList(pageList);
return AjaxResult.success(pageInfo);
}
- @ResponseBody
@GetMapping("/pageListR")
@ApiOperation(value = "获取开票公司和类型列表", tags = {"管理后台-发票管理"})
- public R<List<TInvoiceType>> pageListR( String company){
+ public R<List<TInvoiceType>> pageListR(String invoicingCompany ){
List<TInvoiceType> list = new ArrayList<>();
- if (StringUtils.hasLength(company)){
- list = invoiceTypeService.lambdaQuery().eq(TInvoiceType::getInvoicingCompany, company).list();
+ if (StringUtils.hasLength(invoicingCompany )){
+ list = invoiceTypeService.lambdaQuery().eq(TInvoiceType::getInvoicingCompany, invoicingCompany).list();
}else{
list = invoiceTypeService.lambdaQuery().list();
}
@@ -57,6 +58,7 @@
@ResponseBody
@PostMapping("/addInvoiceType")
@ApiOperation(value = "添加发票类型", tags = {"管理后台-发票类型管理"})
+ @Log(title = "【发票类型管理】添加发票类型", businessType = BusinessType.INSERT)
public AjaxResult addInvoiceType(@RequestBody TInvoiceType invoiceType){
invoiceTypeService.save(invoiceType);
return AjaxResult.success();
@@ -74,6 +76,7 @@
@ResponseBody
@PostMapping("/editInvoiceType")
@ApiOperation(value = "编辑发票类型", tags = {"管理后台-发票类型管理"})
+ @Log(title = "【发票类型管理】编辑发票类型", businessType = BusinessType.UPDATE)
public AjaxResult editInvoiceType(@RequestBody TInvoiceType invoiceType){
invoiceTypeService.updateById(invoiceType);
return AjaxResult.success();
@@ -83,6 +86,7 @@
@ResponseBody
@DeleteMapping("/delInvoiceType")
@ApiOperation(value = "删除发票类型", tags = {"管理后台-发票类型管理"})
+ @Log(title = "【发票类型管理】删除发票类型", businessType = BusinessType.DELETE)
public AjaxResult<TInvoiceType> delInvoiceType(Integer[] id){
List<TInvoiceType> tInvoiceTypes = invoiceTypeService.listByIds(Arrays.asList(id));
for (TInvoiceType invoiceType : tInvoiceTypes) {
--
Gitblit v1.7.1