From dabdf1277f122b0d8e5f4cd5766f9c64b66511c4 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 10 九月 2024 15:17:17 +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 | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 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 7f4effd..24fc726 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 @@ -9,9 +9,11 @@ import com.ruoyi.other.query.InvoiceTypePageList; import com.ruoyi.other.service.TInvoiceTypeService; import io.swagger.annotations.ApiOperation; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -38,6 +40,18 @@ PageInfo<TInvoiceType> pageInfo = invoiceTypeService.pageList(pageList); return AjaxResult.success(pageInfo); } + @ResponseBody + @GetMapping("/pageListR/{company}") + @ApiOperation(value = "获取开票公司和类型列表", tags = {"管理后台-发票管理"}) + public R<List<TInvoiceType>> pageListR( String company){ + List<TInvoiceType> list = new ArrayList<>(); + if (StringUtils.hasLength(company)){ + list = invoiceTypeService.lambdaQuery().eq(TInvoiceType::getInvoicingCompany, company).list(); + }else{ + list = invoiceTypeService.lambdaQuery().list(); + } + return R.ok(list); + } @ResponseBody -- Gitblit v1.7.1