From 7c23d914bcce65cfa3450b119d3ffcf0556c6145 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 23 十二月 2024 14:09:18 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
index 25b1402..4b51994 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -89,7 +89,6 @@
}else{
model.setStatus(Constants.TWO);
}
- model.setStatus(Constants.ZERO);//寰呮墽琛�
model.setRemark(getRemarlByParam(model));
ywContractMapper.insert(model);
dealDetailListBiz(model);//澶勭悊鏉℃淇℃伅
@@ -468,8 +467,8 @@
}else if(fee.compareTo(new BigDecimal(0)) < 0){
//濡傛灉璐﹀崟杩樻湁娆惧緟鏀讹紝鍒欎繚鎸佺姸鎬佷笉鍙�
}
+ b.setReceivableFee(editBill.getReceivableFee());
}
- b.setReceivableFee(editBill.getReceivableFee());
b.setEditDate(param.getEditDate());
b.setEditor(param.getEditor());
b.setBtActDate(param.getBtActDate());
@@ -701,13 +700,19 @@
}
int num =1;
for(int i=0;i<billList1.size();i++){
+ if(Constants.formatBigdecimal(billList1.get(i).getReceivableFee()).compareTo(new BigDecimal(0)) == 0){
+ billList1.get(i).setPayStatus(Constants.ONE);
+ }
if(Constants.equalsInteger(billList1.get(i).getCostType(),Constants.ZERO)){
billList1.get(i).setSortnum(num);
num++;
}
}
for(int i=0;i<billList2.size();i++){
- if(Constants.equalsInteger(billList1.get(i).getCostType(),Constants.ONE)) {
+ if(Constants.formatBigdecimal(billList2.get(i).getReceivableFee()).compareTo(new BigDecimal(0)) == 0){
+ billList2.get(i).setPayStatus(Constants.ONE);
+ }
+ if(Constants.equalsInteger(billList2.get(i).getCostType(),Constants.ONE)) {
billList2.get(i).setSortnum(num);
num++;
}
--
Gitblit v1.9.3