From 2db76f2066701cbe292f206ad49a7f8523b8aa9f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 14 八月 2026 16:30:25 +0800
Subject: [PATCH] feat:银行流水关联多个合同，新增预收款开票，所有List校验调整为ColUtil
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 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 4296f4a..95c50e3 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
@@ -48,23 +48,23 @@
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/page" )
public R getContractPage(@ParameterObject Page page, @ParameterObject ContractQueryDTO queryDTO) {
- LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery();
- wrapper.like(StringUtils.isNotBlank(queryDTO.getContractName()),Contract::getContractName,queryDTO.getContractName());
- wrapper.like(StringUtils.isNotBlank(queryDTO.getPartyA()),Contract::getPartyA,queryDTO.getPartyA());
- wrapper.eq(Contract::getBillingStatus,queryDTO.getBillingStatus());
- if (StrUtil.equals(queryDTO.getInvoiceType(),"1")){
- wrapper.eqSql(Contract::getBillingAmout,"(select sum(delivered_quantity*unit_price) from contract_subject_matter csm where csm.contract_id = contract.id)");
- }else if (StrUtil.equals(queryDTO.getInvoiceType(),"0")){
- wrapper.ltSql(Contract::getBillingAmout,"(select sum(delivered_quantity*unit_price) from contract_subject_matter csm where csm.contract_id = contract.id)");
- }
+// LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery();
+// wrapper.like(StringUtils.isNotBlank(queryDTO.getContractName()),Contract::getContractName,queryDTO.getContractName());
+// wrapper.like(StringUtils.isNotBlank(queryDTO.getPartyA()),Contract::getPartyA,queryDTO.getPartyA());
+// wrapper.eq(Contract::getBillingStatus,queryDTO.getBillingStatus());
+// if (StrUtil.equals(queryDTO.getInvoiceType(),"1")){
+// wrapper.eqSql(Contract::getBillingAmout,"(select sum(delivered_quantity*unit_price) from contract_subject_matter csm where csm.contract_id = contract.id)");
+// }else if (StrUtil.equals(queryDTO.getInvoiceType(),"0")){
+// wrapper.ltSql(Contract::getBillingAmout,"(select sum(delivered_quantity*unit_price) from contract_subject_matter csm where csm.contract_id = contract.id)");
+// }
+//
+// if (StrUtil.equals(queryDTO.getBillingStatus(),"1")){
+// wrapper.orderByDesc(BaseModel::getCreateTime);
+// }else {
+// wrapper.orderByAsc(BaseModel::getCreateTime);
+// }
- if (StrUtil.equals(queryDTO.getBillingStatus(),"1")){
- wrapper.orderByDesc(BaseModel::getCreateTime);
- }else {
- wrapper.orderByAsc(BaseModel::getCreateTime);
- }
-
- return R.ok(contractService.pageByScope(page, wrapper));
+ return R.ok(contractInvoiceService.pageScope(page, queryDTO));
}
/**
@@ -74,6 +74,24 @@
@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);
+ }
+
+ /**
+ * 鑾峰彇鍚堝悓鎴跨 姘寸數 璐圭敤淇℃伅
+ * @return
+ */
+ @GetMapping("/getContractHouseWater/{contractId}" )
+ public R getContractHouseWater(@PathVariable("contractId")Long contractId) {
+ return contractInvoiceService.getContractHouseWater(contractId);
}
/**
@@ -136,4 +154,5 @@
public R pageInvoice(@ParameterObject Page page, @ParameterObject ContractInvoiceQueryDTO queryDTO) {
return R.ok(contractInvoiceService.pageInvoice(page, queryDTO));
}
+
}
--
Gitblit v1.9.1