|
@@ -93,7 +93,7 @@ public class BudgetListenerForProject extends AnalysisEventListener<Budget> {
|
|
LocalDate date=LocalDate.of(Integer.parseInt(yearStr),i+1,1);
|
|
LocalDate date=LocalDate.of(Integer.parseInt(yearStr),i+1,1);
|
|
String yearMonthStr=date.format(DateTimeFormatter.ofPattern("yyyy-MM"));
|
|
String yearMonthStr=date.format(DateTimeFormatter.ofPattern("yyyy-MM"));
|
|
String yearMonth= String.valueOf(date.atStartOfDay().toInstant(ZoneOffset.of("+8")).toEpochMilli());
|
|
String yearMonth= String.valueOf(date.atStartOfDay().toInstant(ZoneOffset.of("+8")).toEpochMilli());
|
|
- String type1="0",type2="0",type3="0",type4="0";// 收入、人工、材料、其他
|
|
|
|
|
|
+ String type1="0",type2="0",type3="0",type4="0",type5="0";// 收入、人工、材料、其他、设备
|
|
for (Budget budget:list){
|
|
for (Budget budget:list){
|
|
String data=ReflectUtil.invoke(budget, keys[i]);
|
|
String data=ReflectUtil.invoke(budget, keys[i]);
|
|
if(data!=null&&!data.equals("")&&!data.equals("0")){
|
|
if(data!=null&&!data.equals("")&&!data.equals("0")){
|
|
@@ -111,12 +111,15 @@ public class BudgetListenerForProject extends AnalysisEventListener<Budget> {
|
|
case "其他":
|
|
case "其他":
|
|
type4= NumberUtil.add(type4,data).toString();
|
|
type4= NumberUtil.add(type4,data).toString();
|
|
break;
|
|
break;
|
|
|
|
+ case "设备":
|
|
|
|
+ type5= NumberUtil.add(type4,data).toString();
|
|
|
|
+ break;
|
|
default:
|
|
default:
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- resultdata.add(UtilMap.map("yearMonth, type1, type2, type3, type4",yearMonth,type1,type2,type3,type4));
|
|
|
|
|
|
+ resultdata.add(UtilMap.map("yearMonth, type1, type2, type3, type4, type5",yearMonth,type1,type2,type3,type4,type5));
|
|
}
|
|
}
|
|
saveData(resultdata);
|
|
saveData(resultdata);
|
|
System.out.println("存储数据库成功!");
|
|
System.out.println("存储数据库成功!");
|
|
@@ -147,6 +150,7 @@ public class BudgetListenerForProject extends AnalysisEventListener<Budget> {
|
|
table.get(UtilMap.getInt(detail,"index")).put("numberField_lrru2tnt",map.get("type2")); // 人工定额
|
|
table.get(UtilMap.getInt(detail,"index")).put("numberField_lrru2tnt",map.get("type2")); // 人工定额
|
|
table.get(UtilMap.getInt(detail,"index")).put("numberField_lrru2tnu",map.get("type3")); // 物耗定额
|
|
table.get(UtilMap.getInt(detail,"index")).put("numberField_lrru2tnu",map.get("type3")); // 物耗定额
|
|
table.get(UtilMap.getInt(detail,"index")).put("numberField_lrru2tnx",map.get("type4")); // 其他定额
|
|
table.get(UtilMap.getInt(detail,"index")).put("numberField_lrru2tnx",map.get("type4")); // 其他定额
|
|
|
|
+ table.get(UtilMap.getInt(detail,"index")).put("numberField_lrru2tnw",map.get("type5")); // 设备定额
|
|
}else{
|
|
}else{
|
|
Map detail=new HashMap();
|
|
Map detail=new HashMap();
|
|
detail.put("dateField_lrru2tnr",yearMonth);
|
|
detail.put("dateField_lrru2tnr",yearMonth);
|