|
@@ -221,11 +221,11 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
int n=1;
|
|
int n=1;
|
|
for(Material m:materials){
|
|
for(Material m:materials){
|
|
m.setIndex(n++);
|
|
m.setIndex(n++);
|
|
- m.setRatio(baseInfo.getDeductRatio()*100+"%");
|
|
|
|
|
|
+ m.setRatio(StringUtils.number2StringZero(baseInfo.getDeductRatio(),tec.getPayRadicScale())+"%");
|
|
m.setAdvancePayment(StringUtils.number2StringZero(Double.parseDouble(m.getSum())*baseInfo.getDeductRatio(),2));
|
|
m.setAdvancePayment(StringUtils.number2StringZero(Double.parseDouble(m.getSum())*baseInfo.getDeductRatio(),2));
|
|
}
|
|
}
|
|
- this.total=StringUtils.number2StringZero(materials.stream().mapToDouble(m->Double.parseDouble(m.getSum())).sum(),2);
|
|
|
|
- this.totalAdvance=StringUtils.number2StringZero(materials.stream().mapToDouble(m->Double.parseDouble(m.getAdvancePayment())).sum(),2);
|
|
|
|
|
|
+ this.total=StringUtils.number2StringZero(materials.stream().mapToDouble(m->Double.parseDouble(m.getSum())).sum(),tec.getScale());
|
|
|
|
+ this.totalAdvance=StringUtils.number2StringZero(materials.stream().mapToDouble(m->Double.parseDouble(m.getAdvancePayment())).sum(),tec.getScale());
|
|
/*合计*/
|
|
/*合计*/
|
|
Material summary= new Material();
|
|
Material summary= new Material();
|
|
summary.setMaterialName("合计");
|
|
summary.setMaterialName("合计");
|