预算导入

mjava-lanyun/src/main/java/com/malk/lanyun/listener/BudgetListenerForProject.java

@@ -122,7 +122,7 @@ public class BudgetListenerForProject extends AnalysisEventListener<Budget> {
                     }
                 }
             }
-            if(type1.equals("0")&&type2.equals("0")&&type3.equals("0")&&type4.equals("0")&&type5.equals("0")){
+            if(type1.equals("0")&&type2.equals("0")&&type3.equals("0")&&type4.equals("0")&&type5.equals("0")&&type6.equals("0")){
                 continue;
             }
             resultdata.add(UtilMap.map("yearMonth, yearMonthStr, type1, type2, type3, type4, type5, type6",yearMonth,yearMonthStr,NumberUtil.mul(type1,"1.06").toString(),type2,NumberUtil.mul(type3,"1.13"),type4,type5,type6));
@@ -169,7 +169,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()); // 剩余设备定额
                 detail.put("textField_luh0k82j",map.get("yearMonthStr"));
                 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")),String.valueOf(map.get("type6"))).toString());
             }else{
                 Map detail=new HashMap();
                 detail.put("dateField_lrru2tnr",yearMonth);
@@ -185,7 +185,7 @@ public class BudgetListenerForProject extends AnalysisEventListener<Budget> {
                 detail.put("numberField_ludujw4i",0); // 已用设备定额
                 detail.put("textField_luh0k82j",map.get("yearMonthStr"));
                 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")),String.valueOf(map.get("type6"))).toString());
                 table.add(detail);
             }
         }