1111

src/main/java/com/jeeplus/modules/sg/overheadline/util/BashInfo.java

@@ -35,7 +35,7 @@ public class BashInfo {
     public static final String CS_AQWM = "安全文明施工费";
     public static final String GF_WXZY = "危险作业意外伤害保险费";
     public static final String QT_SGCDZY = "施工场地租用费";
-    public static final String QT_ZBDL = "招标代理费";
+    public static final String QT_ZBDL = "招标代理";
     public static final String QT_HJ = "合计";
     public static final String BZZSSL = "补增值税税率调整差额";
     public static final String KJJGCC = "扣减甲供材超供材料费";
@@ -156,12 +156,15 @@ public class BashInfo {
             String type1 = importExcel.getValue(i+1,0);
             if(type.equals(QT_SGCDZY)){
                 cdFree = importExcel.getDouble(i+1,2);
+                continue;
             }
-            if(type.equals(QT_ZBDL)){
+            if(type.contains(QT_ZBDL)){
                 zbFree = importExcel.getDouble(i+1,2);
+                continue;
             }
             if(type1.equals(QT_HJ)){
                 totalFree = importExcel.getDouble(i+1,2);
+                continue;
             }
         }
         double[] rate = new double[3];

src/main/java/com/jeeplus/modules/sg/overheadline/web/OverheadLineController.java

@@ -505,7 +505,8 @@ public class OverheadLineController extends BaseController {
     JkxlDetailFee jkxlDetailFee1 = new JkxlDetailFee();
     java.text.NumberFormat NF = java.text.NumberFormat.getInstance();
     NF.setGroupingUsed(false);//去掉科学计数法显示
-    jkxlDetailFee.setOriginalTotalCost(new BigDecimal(NF.format(zFee[0])).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+//    jkxlDetailFee.setOriginalTotalCost(new BigDecimal(NF.format(zFee[0])).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlDetailFee.setOriginalTotalCost(Double.valueOf(NF.format(zFee[0])));
     jkxlDetailFee.setZjgcFee(new BigDecimal(zFee[1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setOriginalRgCost(new BigDecimal(zFee[2]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setOriginalCbrCost(new BigDecimal(zFee[3]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());