From 84afb0cebcd698f0c1fdb95f02231dc99e9252a9 Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期六, 15 三月 2025 13:49:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-project-server-contract into dev
---
src/main/java/com/product/contract/service/ContractInfoService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/contract/service/ContractInfoService.java b/src/main/java/com/product/contract/service/ContractInfoService.java
index 5e29095..4fccc04 100644
--- a/src/main/java/com/product/contract/service/ContractInfoService.java
+++ b/src/main/java/com/product/contract/service/ContractInfoService.java
@@ -179,13 +179,14 @@
public FieldSetEntity getContractInfoByName(FieldSetEntity fs) throws BaseException {
FieldSetEntity fss = baseDao.getFieldSetEntity(CmnConst.LX_PROJECT_CONTRACT_INFO,fs.getUUID(),true);
FieldSetEntity fsProject = baseDao.getFieldSetEntity(CmnConst.PRODUCT_PROJECT_BUSINESS,fss.getString("project_uuid"),false);
+ FieldSetEntity fsCustomer = baseDao.getFieldSet("product_project_customer", fsProject.getString("customer_name"), false);
FieldSetEntity contractName = baseDao.getFieldSetEntityBySQL("SELECT sum(invoice_amount) invoice_amount FROM product_project_contract_invoice_info WHERE contract_invoice_uuid in(SELECT uuid FROM product_project_contract_invoice where contract_name=?)", new String[]{fs.getString("uuid")},false);
if (contractName==null||StringUtils.isEmpty(contractName.getString("invoice_amount"))){
fss.setValue("invoice_amount",0);
}else {
fss.setValue("invoice_amount",contractName.getString("invoice_amount"));
}
-
+ fss.setValue("customer_name", fsCustomer.getString("customer_name"));
fss.setValue("collection_amount",0);
fss.setValue("project_num",fsProject.getString("project_num"));
fss.setValue("project_name",fsProject.getString("project_name"));
--
Gitblit v1.9.2