From 2073d419646f757632fa6273b30badbb72cbe1b1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 15:16:33 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java | 14 ++++++++++++++
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/TOrderInvoiceQuery.java | 2 +-
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java | 5 ++++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 6 ++++--
4 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/TOrderInvoiceQuery.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/TOrderInvoiceQuery.java
index f1bad4a..a06da9c 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/TOrderInvoiceQuery.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/TOrderInvoiceQuery.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "申请人姓名")
private String nickName;
- @ApiModelProperty(value = "公司名称")
+ @ApiModelProperty(value = "公司名称(抬头)")
private String name;
@ApiModelProperty(value = "用户id 前端忽略")
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
index b5179bc..ee866d2 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
@@ -5,12 +5,14 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.TCompany;
import com.ruoyi.other.api.domain.TCoupon;
+import com.ruoyi.other.api.domain.TInvoiceType;
import com.ruoyi.other.api.domain.TUserTag;
import com.ruoyi.other.api.dto.TagListQueryDto;
import com.ruoyi.other.api.dto.UnitListQueryDto;
import com.ruoyi.other.api.factory.OtherFallbackFactory;
import com.ruoyi.other.api.vo.CouponListVOVO;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -24,8 +26,9 @@
*/
@FeignClient(contextId = "UnitClient", value = ServiceNameConstants.OTHER_SERVICE, fallbackFactory = OtherFallbackFactory.class)
public interface OtherClient {
+
//单位分页
- @PostMapping(value = "/t-company/unit/page")
+ @PostMapping(value = "/t-invoice-type/t-company/unit/page")
R<Page<TCompany>> queryUnitPage(@RequestBody UnitListQueryDto unitListQueryDto);
//单位添加修改
@PostMapping(value = "/t-company/unit/addOrUpdate")
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index efb4d7f..9ccfa94 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -118,13 +118,15 @@
}
@GetMapping(value = "/settlementTotal")
@ApiOperation(value = "结算汇总-列表查询", tags = {"管理后台-财务结算"})
- @ApiParam(name = "time", value = "汇报时间2024-01-01 00:00:00")
+ @ApiParam(name = "time", value = "汇报时间2024-01")
public AjaxResult<SettlementTotalVO> settlementTotal(String time) {
+ time = time+"-01 00:00:00";
SettlementTotalVO res = chargingOrderService.settlementTotal(time);
return AjaxResult.success(res);
}
@GetMapping(value = "/settlementTotalR")
- public R<SettlementTotalVO> settlementTotalR( String time) {
+ public R<SettlementTotalVO> settlementTotalR(String time) {
+ time = time+"-01 00:00:00";
SettlementTotalVO res = chargingOrderService.settlementTotal(time);
return R.ok(res);
}
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