From c5c284896ce6428cffc5092e9cdef4fefc23409f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 18 九月 2026 17:12:49 +0800
Subject: [PATCH] feat: 石煤机客商产品查询处理 合同推送新增选商方式和是否关联交易
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 114 insertions(+), 5 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java
index b5eb269..55b75dd 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java
@@ -4,14 +4,15 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.by4cloud.platformx.business.dto.ContractInvoiceQueryDTO;
-import com.by4cloud.platformx.business.dto.ContractQueryDTO;
-import com.by4cloud.platformx.business.dto.GenInvoiceInfoDTO;
+import com.by4cloud.platformx.business.dto.*;
import com.by4cloud.platformx.business.entity.Contract;
+import com.by4cloud.platformx.business.entity.ContractInvoice;
+import com.by4cloud.platformx.business.entity.ContractOutBound;
import com.by4cloud.platformx.business.service.ContractInvoiceService;
import com.by4cloud.platformx.business.service.ContractService;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.common.security.annotation.Inner;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -68,12 +69,32 @@
}
/**
+ * 鏂板鍙戠エ
+ * @return R
+ */
+ @Operation(summary = "鏂板鍙戠エ" , description = "鏂板鍙戠エ" )
+ @SysLog("鏂板鍙戠エ" )
+ @PostMapping
+ public R save(@RequestBody ContractInvoice contractInvoice) {
+ return contractInvoiceService.add(contractInvoice);
+ }
+
+ /**
* 鑾峰彇鍚堝悓鍑哄簱淇℃伅
* @return
*/
@GetMapping("/getContractOutBound/{contractId}" )
public R getContractOutBound(@PathVariable("contractId")Long contractId) {
return contractInvoiceService.getContractOutBound(contractId);
+ }
+
+ /**
+ * 鑾峰彇鍚堝悓棰勫紑绁ㄤ俊鎭�
+ * @return
+ */
+ @GetMapping("/getContractAdvance/{contractId}" )
+ public R getContractAdvance(@PathVariable("contractId")Long contractId) {
+ return contractInvoiceService.getContractAdvance(contractId);
}
/**
@@ -86,6 +107,15 @@
}
/**
+ * 鑾峰彇鍚堝苟寮�绁ㄥ悎鍚屽嚭搴撲俊鎭�
+ * @return
+ */
+ @PostMapping("/getMergeContractOutBound" )
+ public R getMergeContractOutBound(@RequestBody Long[] ids) {
+ return contractInvoiceService.getMergeContractOutBound(ids);
+ }
+
+ /**
* 鐢熸垚寮�绁ㄩ瑙堜俊鎭�
* @return
*/
@@ -95,12 +125,30 @@
}
/**
+ * 鐢熸垚寮�绁ㄩ瑙堜俊鎭�
+ * @return
+ */
+ @PostMapping("/genMergeInvoiceInfo" )
+ public R genMergeInvoiceInfo(@RequestBody GenMergeInvoiceDTO mergeInvoiceDTO) {
+ return contractInvoiceService.genMergeInvoiceInfo(mergeInvoiceDTO);
+ }
+
+ /**
+ * 寮�鍚堝苟钃濈エ
+ * @return
+ */
+ @PostMapping("/toMergeInvoice" )
+ public R toMergeInvoice(@RequestBody ToMergeInvoiceDTO toMergeInvoiceDTO) {
+ return contractInvoiceService.toMergeInvoice(toMergeInvoiceDTO);
+ }
+
+ /**
* 寮�钃濈エ
* @return
*/
@PostMapping("/toInvoice" )
- public R toInvoice(@RequestBody GenInvoiceInfoDTO genInvoiceInfoDTO) {
- return contractInvoiceService.toInvoice(genInvoiceInfoDTO);
+ public R toInvoice(@RequestBody ToInvoiceDTO toInvoiceDTO) {
+ return contractInvoiceService.toInvoice(toInvoiceDTO);
}
/**
@@ -132,6 +180,42 @@
}
/**
+ * 閲嶆柊寮�绁�
+ * @return
+ */
+ @GetMapping("/refresh/{invoiceId}")
+ public R refresh(@PathVariable("invoiceId")Long invoiceId) {
+ return contractInvoiceService.refresh(invoiceId);
+ }
+
+ /**
+ * 鎵嬪姩鎺ㄩ�乥ip
+ * @return
+ */
+ @GetMapping("/bipPush/{invoiceId}")
+ public R bipPush(@PathVariable("invoiceId")Long invoiceId) {
+ return contractInvoiceService.bipPush(invoiceId);
+ }
+
+ /**
+ * 鎵嬪姩鎺ㄩ�乥ip
+ * @return
+ */
+ @GetMapping("/bipPushPdf/{invoiceId}")
+ public R bipPushPdf(@PathVariable("invoiceId")Long invoiceId) {
+ return contractInvoiceService.bipPushPdf(invoiceId);
+ }
+
+ /**
+ * 淇濆瓨骞舵帹閫�
+ * @return
+ */
+ @PostMapping("/saveAndPush")
+ public R saveAndPush(@RequestBody ContractInvoiceUpateDTO upateDTO) {
+ return contractInvoiceService.saveAndPush(upateDTO);
+ }
+
+ /**
* 绾㈢エ鏌ヨ
* @return
*/
@@ -146,4 +230,29 @@
return R.ok(contractInvoiceService.pageInvoice(page, queryDTO));
}
+ @GetMapping("/queryInvoice")
+ public R queryInvoice(@ParameterObject Page page, @ParameterObject InvoiceQueryDTO queryDTO) {
+ return contractInvoiceService.queryInvoice(page, queryDTO);
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鏌ヨ" , description = "閫氳繃id鏌ヨ" )
+ @GetMapping("/{id}" )
+ public R getById(@PathVariable("id" ) Long id) {
+ return R.ok(contractInvoiceService.getById(id));
+ }
+
+
+ /**
+ * 閫氳繃key鏌ヨbip瀛楀吀
+ * @return R
+ */
+ @Operation(summary = "閫氳繃key鏌ヨbip瀛楀吀" , description = "閫氳繃key鏌ヨbip瀛楀吀" )
+ @GetMapping("/selectBipByKey/{dictKey}" )
+ public R selectBipByKey(@PathVariable("dictKey" ) String dictKey) {
+ return contractInvoiceService.selectBipByKey(dictKey);
+ }
}
--
Gitblit v1.9.1