From c427840445fefb679a287dbeaba81bd417388aeb Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 04 九月 2026 17:10:44 +0800
Subject: [PATCH] feat:开票和bip推送分离 新增bip报账单  新增合同标的物变更

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java |   74 ++++++++++++++++++++++++++++++++++--
 1 files changed, 69 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 8f81a5b..60b0a37 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,6 +69,17 @@
 	}
 
 	/**
+	 * 鏂板鍙戠エ
+	 * @return R
+	 */
+	@Operation(summary = "鏂板鍙戠エ" , description = "鏂板鍙戠エ" )
+	@SysLog("鏂板鍙戠エ" )
+	@PostMapping
+	public R save(@RequestBody ContractInvoice contractInvoice) {
+		return contractInvoiceService.add(contractInvoice);
+	}
+
+	/**
 	 * 鑾峰彇鍚堝悓鍑哄簱淇℃伅
 	 * @return
 	 */
@@ -108,8 +120,8 @@
 	 * @return
 	 */
 	@PostMapping("/toInvoice" )
-	public R toInvoice(@RequestBody GenInvoiceInfoDTO genInvoiceInfoDTO) {
-		return contractInvoiceService.toInvoice(genInvoiceInfoDTO);
+	public R toInvoice(@RequestBody ToInvoiceDTO toInvoiceDTO) {
+		return contractInvoiceService.toInvoice(toInvoiceDTO);
 	}
 
 	/**
@@ -150,6 +162,33 @@
 	}
 
 	/**
+	 * 鎵嬪姩鎺ㄩ�乥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
 	 */
@@ -164,4 +203,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