|
|
@@ -13,7 +13,7 @@ import java.util.TreeSet;
|
|
|
/**
|
|
|
* 导出数据计算类
|
|
|
*/
|
|
|
-public class ExportUtil1 {
|
|
|
+public class ExportUtil1{
|
|
|
public static String POWER_DEPARTMENT="配电检修工区";
|
|
|
public static String POWER_BDZ="变压器";
|
|
|
public static String POWER_BOXBDZ="箱式变电站";
|
|
|
@@ -322,7 +322,7 @@ public class ExportUtil1 {
|
|
|
//项目建设管理费
|
|
|
managementFee = preWorkingFee+itemManageFee+supervisionFee;
|
|
|
//合计金额
|
|
|
- totalFee=preWorkingFee+itemManageFee+supervisionFee+designFee;
|
|
|
+ totalFee=preWorkingFee+itemManageFee+supervisionFee+designFee+compensateFee;//合计金额
|
|
|
scheduleOther.setPreWorkingFee(decimalFormat.format(preparationFee));//项目前期工作费合计
|
|
|
scheduleOther.setItemManageFee(decimalFormat.format(itemManageFee));//法人管理经费
|
|
|
// scheduleOther.setCleaningFees(decimalFormat.format(cleaningFees));//余物清理费
|
xs