erp自动结算书，数据比对规程变动，获取原数据变动

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

@@ -258,7 +258,7 @@ public  class ErpInfo {
                     }else if(wbsDetail.contains("工程设计费")||wbsDetail.contains("设计文件评审费")){
                         erpCredit.setOtherDesignFee(DoubleUtil.add(erpCredit.getOtherDesignFee(),lineItemAmount));
                         erpCredit.setOtherTotalFee(DoubleUtil.add(erpCredit.getOtherTotalFee(),lineItemAmount));
-                    }else if(wbsDetail.contains("项目管理经费 - 会议费")){
+                    }else if(wbsDetail.contains("项目管理经费 - 会议费")||wbsDetail.contains("项目管理经费 -其它")){
                         erpCredit.setOtherTotalFee(DoubleUtil.add(erpCredit.getOtherTotalFee(),lineItemAmount));
                         erpCredit.setOtherLegalManage(DoubleUtil.add(erpCredit.getOtherLegalManage(),lineItemAmount));
                     }

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

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.sg.financial.erpcredit.util;
 
+import com.jeeplus.modules.filing.basicInformation.entity.BasicInformation;
 import com.jeeplus.modules.sg.financial.erpcredit.entity.*;
 import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
@@ -10,6 +11,7 @@ import org.apache.poi.xssf.usermodel.XSSFFont;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -108,7 +110,18 @@ public class ExportUtil {
                 }else {
                     cell=row.getCell(9);
                 }
-                cell.setCellValue(schedule.getActualIntallProject());
+                String actualIntallProject = schedule.getActualIntallProject();
+                String actualEquipmentValue = schedule.getActualEquipmentValue();
+                if (null == actualIntallProject || "".equals(actualIntallProject)) {
+                    actualIntallProject = "0.0";
+                }
+                if (null == actualEquipmentValue || "".equals(actualEquipmentValue)) {
+                    actualEquipmentValue = "0.0";
+                }
+                BigDecimal all = new BigDecimal(actualIntallProject);
+                BigDecimal mul = new BigDecimal(actualEquipmentValue);
+                BigDecimal bigDecimal = all.subtract(mul);
+                cell.setCellValue(bigDecimal.toString());
                 cell.setCellStyle(cellStyle);
                 if (i==scheduleList.size()-1){ cell.setCellStyle(cellStyleFont); }
                 if (row.getCell(10)==null){