Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/util/ExportUtil1.java

@@ -148,10 +148,12 @@ public class ExportUtil1 {
                     schedule.setBudgetInstallProject(decimalFormat.format(maintainData.getInstallFee()+maintainData.getMaterialFee()));
                     schedule.setBudgetEquipmentValue(decimalFormat.format(maintainData.getEquipmentFee()));//设备购置费
                     //其他费用合计
-                    schedule.setBudgetOtherFee(decimalFormat.format(maintainData.getTotalFee()));
+                    schedule.setBudgetOtherFee(decimalFormat.format(maintainData.getDesignFee()+maintainData.getSupervisionFee()+maintainData.getPreliminaryWorkFee()
+                            +maintainData.getDamages()+maintainData.getManagementFee()));
                     //预算合计费用
                     schedule.setBudgetTotalFee(decimalFormat.format(maintainData.getBuildingFee()+maintainData.getInstallFee()
-                            +maintainData.getMaterialFee()+maintainData.getEquipmentFee()+maintainData.getTotalFee()));
+                            +maintainData.getMaterialFee()+maintainData.getEquipmentFee()+maintainData.getDesignFee()+maintainData.getSupervisionFee()+maintainData.getPreliminaryWorkFee()
+                            +maintainData.getDamages()+maintainData.getManagementFee()));
                 }
             }
         }
@@ -713,8 +715,9 @@ public class ExportUtil1 {
                 if (null!=maintainData.getEndDate()&&maintainData.getEndDate().toString().length()>0){
                     completionDateList.add(maintainData.getEndDate());
                 }
-                investmentBudget+=maintainData.getTotalFee()+maintainData.getBuildingFee()+maintainData.getInstallFee()
-                +maintainData.getEquipmentFee()+maintainData.getMaterialFee();
+                investmentBudget+=maintainData.getDesignFee()+maintainData.getSupervisionFee()+maintainData.getPreliminaryWorkFee()
+                        +maintainData.getDamages()+maintainData.getManagementFee()+maintainData.getBuildingFee()+maintainData.getInstallFee()
+                        +maintainData.getEquipmentFee()+maintainData.getMaterialFee();
             }
             if (null!=organDataList&&organDataList.size()>0){
                 //去重
@@ -840,7 +843,8 @@ public class ExportUtil1 {
         }
         completed=transferAssets+vatDeduction;
         for (MaintainData maintainData:maintainDataList){
-            appropriatedFunds+=maintainData.getTotalFee()+maintainData.getBuildingFee()+maintainData.getInstallFee()
+            appropriatedFunds+=maintainData.getDesignFee()+maintainData.getSupervisionFee()+maintainData.getPreliminaryWorkFee()
+                    +maintainData.getDamages()+maintainData.getManagementFee()+maintainData.getBuildingFee()+maintainData.getInstallFee()
                     +maintainData.getEquipmentFee()+maintainData.getMaterialFee();
         }
         mCompletionProject.setTransferAssets(decimalFormat.format(transferAssets));