From 800fe7bbdcd513c06d23dd568850d8eb05dd4d63 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 14 十月 2026 15:17:19 +0800
Subject: [PATCH] feat:新增单位年度合同 开票 收款计划 新增统计页

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 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 60b0a37..2190a3d 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
@@ -107,12 +107,39 @@
 	}
 
 	/**
+	 * 鑾峰彇鍚堝苟寮�绁ㄥ悎鍚屽嚭搴撲俊鎭�
+	 * @return
+	 */
+	@PostMapping("/getMergeContractOutBound" )
+	public R getMergeContractOutBound(@RequestBody Long[] ids) {
+		return contractInvoiceService.getMergeContractOutBound(ids);
+	}
+
+	/**
 	 * 鐢熸垚寮�绁ㄩ瑙堜俊鎭�
 	 * @return
 	 */
 	@PostMapping("/genInvoiceInfo" )
 	public R genInvoiceInfo(@RequestBody GenInvoiceInfoDTO genInvoiceInfoDTO) {
 		return contractInvoiceService.genInvoiceInfo(genInvoiceInfoDTO);
+	}
+
+	/**
+	 * 鐢熸垚寮�绁ㄩ瑙堜俊鎭�
+	 * @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);
 	}
 
 	/**
@@ -228,4 +255,14 @@
 	public R selectBipByKey(@PathVariable("dictKey" ) String dictKey) {
 		return contractInvoiceService.selectBipByKey(dictKey);
 	}
+
+	/**
+	 * 鎵嬪姩閫氳繃鍙戠エ
+	 * @return
+	 */
+	@GetMapping("/takeEffect/{id}" )
+	public R takeEffect(@PathVariable("id" ) Long id) {
+		contractInvoiceService.takeEffect(id);
+		return R.ok();
+	}
 }

--
Gitblit v1.9.1