From e5c385b510c54107f9a4ab26d24603706c95cf9f Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期五, 26 七月 2024 18:22:33 +0800
Subject: [PATCH] 整体优化
---
src/main/java/com/product/contract/service/ContractInfoService.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/product/contract/service/ContractInfoService.java b/src/main/java/com/product/contract/service/ContractInfoService.java
index d913f63..d2b6d6e 100644
--- a/src/main/java/com/product/contract/service/ContractInfoService.java
+++ b/src/main/java/com/product/contract/service/ContractInfoService.java
@@ -140,27 +140,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);
- DataTableEntity dt = fss.getSubDataTable(CmnConst.LX_PROJECT_CONTRACT_INFO_SUB);
- FieldSetEntity fsub = null;
- int invoiced = 0;//宸插紑绁ㄩ噾棰�
- int payment_received = 0;//宸插洖娆鹃噾棰�
- if(dt!=null && dt.getRows()>0){
- for (int i = 0; i < dt.getRows(); i++) {
- fsub = dt.getFieldSetEntity(i);
- String invo = fsub.getString("invoiced");
- String paym = fsub.getString("payment_received");
- if(BaseUtil.strIsNull(invo)){
- invo = "0";
- }
- if(BaseUtil.strIsNull(paym)){
- paym = "0";
- }
- invoiced += Double.parseDouble(invo);
- payment_received += Double.parseDouble(paym);
- }
+ 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("invoiced",invoiced);
- fss.setValue("payment_received",payment_received);
+
+ fss.setValue("collection_amount",0);
fss.setValue("project_num",fsProject.getString("project_num"));
fss.setValue("project_name",fsProject.getString("project_name"));
return fss;
--
Gitblit v1.9.2