From b1b3da5393c75ced1afa1467be69d60af5403878 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 27 八月 2026 14:25:16 +0800
Subject: [PATCH] feat:合同审核、出库及履约阶段代码优化
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java | 86 +++++++++++++++++++++++++++++++++++-------
1 files changed, 71 insertions(+), 15 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..0795cbf 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
@@ -7,11 +7,15 @@
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.InvoiceQueryDTO;
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;
@@ -48,23 +52,34 @@
@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(contractInvoiceService.pageScope(page, queryDTO));
+ }
- return R.ok(contractService.pageByScope(page, wrapper));
+ /**
+ * 鏂板鍙戠エ
+ * @return R
+ */
+ @Operation(summary = "鏂板鍙戠エ" , description = "鏂板鍙戠エ" )
+ @SysLog("鏂板鍙戠エ" )
+ @PostMapping
+ public R save(@RequestBody ContractInvoice contractInvoice) {
+ return contractInvoiceService.add(contractInvoice);
}
/**
@@ -74,6 +89,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);
}
/**
@@ -123,6 +156,24 @@
}
/**
+ * 閲嶆柊寮�绁�
+ * @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);
+ }
+
+ /**
* 绾㈢エ鏌ヨ
* @return
*/
@@ -136,4 +187,9 @@
public R pageInvoice(@ParameterObject Page page, @ParameterObject ContractInvoiceQueryDTO queryDTO) {
return R.ok(contractInvoiceService.pageInvoice(page, queryDTO));
}
+
+ @GetMapping("/queryInvoice")
+ public R queryInvoice(@ParameterObject Page page, @ParameterObject InvoiceQueryDTO queryDTO) {
+ return contractInvoiceService.queryInvoice(page, queryDTO);
+ }
}
--
Gitblit v1.9.1