|
@@ -264,6 +264,7 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
currentD=current.stream().mapToDouble(s->Double.parseDouble(s.getMeterMoney())).sum();
|
|
|
elementWriter.write(fdm.get(AdvancePaymentCertificate.TBN+":key_2"),StringUtils.number2String(currentD,2));
|
|
|
currentStart=StringUtils.number2String(currentD,3);
|
|
|
+ tec.getPeriodInfo().setCurTotal(currentStart);
|
|
|
FormulaUtils.elementFindByKey(fdm,"key_5").ifPresent(t->{
|
|
|
elementWriter.write(t,one.getFileName());
|
|
|
});
|
|
@@ -632,9 +633,11 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
}
|
|
|
if(BaseUtils.handleObj2Integer(v)>0) {
|
|
|
List<InventoryForm> list= group.get(v);
|
|
|
- InventoryForm one =list.get(0);
|
|
|
- sc.setPrice(one.getCurrentPrice());
|
|
|
- sc.setMonth(one.getUnit());
|
|
|
+ if(Func.isNotEmpty(list)) {
|
|
|
+ InventoryForm one = list.get(0);
|
|
|
+ sc.setPrice(one.getCurrentPrice());
|
|
|
+ sc.setMonth(one.getUnit());
|
|
|
+ }
|
|
|
}
|
|
|
if("小计".equals(k)){
|
|
|
addGetSetConfig(sc, summaryConfigMap, SupervisionCertificate::getContractAmount, sc::setContractAmount);
|