From e02812df9217d3e50a368a8234c07c60c64c0ff4 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 05 八月 2026 08:34:26 +0800
Subject: [PATCH] feat:新增石煤机 机械厂模版合同/客户数据主数据同步接口/合同履约进度新增质保结束操作/合同开票状态 修改为待开 可开 已开/出库逻辑完善
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 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 8f9f36c..b5eb269 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,6 +4,8 @@
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.entity.Contract;
import com.by4cloud.platformx.business.service.ContractInvoiceService;
@@ -40,23 +42,29 @@
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
- * @param contract 鍚堝悓绠＄悊
+ * @param queryDTO 鍚堝悓绠＄悊
* @return
*/
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/page" )
- public R getContractPage(@ParameterObject Page page, @ParameterObject Contract contract) {
- LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery();
- wrapper.like(StringUtils.isNotBlank(contract.getContractName()),Contract::getContractName,contract.getContractName());
- wrapper.like(StringUtils.isNotBlank(contract.getPartyA()),Contract::getPartyA,contract.getPartyA());
- wrapper.eq(Contract::getBillingStatus,contract.getBillingStatus());
- if (StrUtil.equals(contract.getBillingStatus(),"1")){
- wrapper.orderByDesc(BaseModel::getCreateTime);
- }else {
- wrapper.orderByAsc(BaseModel::getCreateTime);
- }
+ 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)");
+// }
+//
+// 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));
}
/**
@@ -66,6 +74,15 @@
@GetMapping("/getContractOutBound/{contractId}" )
public R getContractOutBound(@PathVariable("contractId")Long contractId) {
return contractInvoiceService.getContractOutBound(contractId);
+ }
+
+ /**
+ * 鑾峰彇鍚堝悓鎴跨 姘寸數 璐圭敤淇℃伅
+ * @return
+ */
+ @GetMapping("/getContractHouseWater/{contractId}" )
+ public R getContractHouseWater(@PathVariable("contractId")Long contractId) {
+ return contractInvoiceService.getContractHouseWater(contractId);
}
/**
@@ -123,4 +140,10 @@
public R queryRedInvoice() {
return contractInvoiceService.queryRedInvoice();
}
+
+ @GetMapping("/pageInvoice")
+ public R pageInvoice(@ParameterObject Page page, @ParameterObject ContractInvoiceQueryDTO queryDTO) {
+ return R.ok(contractInvoiceService.pageInvoice(page, queryDTO));
+ }
+
}
--
Gitblit v1.9.1