|
@@ -32,11 +32,11 @@ public class RebateIncentiveAdvPay implements DataModel{
|
|
private String meterAmount;
|
|
private String meterAmount;
|
|
@JSONField(name = "key_4",label="计量支付扣回开工预付款",ordinal = 5)
|
|
@JSONField(name = "key_4",label="计量支付扣回开工预付款",ordinal = 5)
|
|
private String retained ;
|
|
private String retained ;
|
|
- @JSONField(name = "key_4",label="累计扣回开工预付款金额",ordinal = 5)
|
|
|
|
|
|
+ @JSONField(name = "key_5",label="累计扣回开工预付款金额",ordinal = 5)
|
|
private String endPay ;
|
|
private String endPay ;
|
|
- @JSONField(name = "key_4",label="扣除金额-上期末累计扣回金额",ordinal = 5)
|
|
|
|
|
|
+ @JSONField(name = "key_6",label="扣除金额-上期末累计扣回金额",ordinal = 5)
|
|
private String previousPay ;
|
|
private String previousPay ;
|
|
- @JSONField(name = "key_4",label="本期扣回金额",ordinal = 10)
|
|
|
|
|
|
+ @JSONField(name = "key_7",label="本期扣回金额",ordinal = 10)
|
|
private String currentPay ;
|
|
private String currentPay ;
|
|
public void calc(String contractAmount,String dyTotalAmount){
|
|
public void calc(String contractAmount,String dyTotalAmount){
|
|
double contractAmountD=BaseUtils.obj2DoubleZero(contractAmount);
|
|
double contractAmountD=BaseUtils.obj2DoubleZero(contractAmount);
|