|
@@ -160,7 +160,7 @@ public class BudgetListenerForProject extends AnalysisEventListener<Budget> {
|
|
}
|
|
}
|
|
table.get(UtilMap.getInt(detail,"index")).put("numberField_ludre3z5",NumberUtil.sub(String.valueOf(map.get("type5")),used5).toString()); // 剩余设备定额
|
|
table.get(UtilMap.getInt(detail,"index")).put("numberField_ludre3z5",NumberUtil.sub(String.valueOf(map.get("type5")),used5).toString()); // 剩余设备定额
|
|
detail.put("textField_luh0k82j",map.get("yearMonthStr"));
|
|
detail.put("textField_luh0k82j",map.get("yearMonthStr"));
|
|
- detail.put("numberField_lrru2tny",NumberUtil.add(String.valueOf(map.get("type1")),String.valueOf(map.get("type2")),String.valueOf(map.get("type3")),
|
|
|
|
|
|
+ detail.put("numberField_lrru2tny",NumberUtil.add(String.valueOf(map.get("type2")),String.valueOf(map.get("type3")),
|
|
String.valueOf(map.get("type4")),String.valueOf(map.get("type5"))).toString());
|
|
String.valueOf(map.get("type4")),String.valueOf(map.get("type5"))).toString());
|
|
}else{
|
|
}else{
|
|
Map detail=new HashMap();
|
|
Map detail=new HashMap();
|
|
@@ -175,7 +175,7 @@ public class BudgetListenerForProject extends AnalysisEventListener<Budget> {
|
|
detail.put("numberField_ludujw4f",0); // 已用物耗定额
|
|
detail.put("numberField_ludujw4f",0); // 已用物耗定额
|
|
detail.put("numberField_ludujw4i",0); // 已用设备定额
|
|
detail.put("numberField_ludujw4i",0); // 已用设备定额
|
|
detail.put("textField_luh0k82j",map.get("yearMonthStr"));
|
|
detail.put("textField_luh0k82j",map.get("yearMonthStr"));
|
|
- detail.put("numberField_lrru2tny",NumberUtil.add(String.valueOf(map.get("type1")),String.valueOf(map.get("type2")),String.valueOf(map.get("type3")),
|
|
|
|
|
|
+ detail.put("numberField_lrru2tny",NumberUtil.add(String.valueOf(map.get("type2")),String.valueOf(map.get("type3")),
|
|
String.valueOf(map.get("type4")),String.valueOf(map.get("type5"))).toString());
|
|
String.valueOf(map.get("type4")),String.valueOf(map.get("type5"))).toString());
|
|
table.add(detail);
|
|
table.add(detail);
|
|
}
|
|
}
|