1111

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

@@ -29,6 +29,7 @@ public class BashInfo {
     public static final String BZZSSL = "补增值税税率调整差额";
     public static final String KJJGCC = "扣减甲供材超供材料费";
     public static final String GCJS = "工程结算价";
+    public static final String TBJG = "投标报价";
     public static final String HZ_JCGC = "基础工程";
     public static final String HZ_GTGC = "杆塔工程";
     public static final String HZ_JDGC = "接地工程";

src/main/java/com/jeeplus/modules/sg/web/JkxlController.java

@@ -547,7 +547,7 @@ public class JkxlController extends BaseController {
       for(JkxlData jkxlData: list){
         rate1 = jkxlData.getTotalFee()/tz;
         gxFee1 = gxFee*rate1;
-        totalF = gxFee1 + jkxlData.getTotalFee();
+        totalF = jkxlData.getTotalFee()-gxFee1;
         jkxlData.setGxFee(gxFee1);
         jkxlData.setTotalFee(totalF);
       }
@@ -695,7 +695,7 @@ public class JkxlController extends BaseController {
         kcFree = importExcel.getDouble(i+1,2);
         continue;
       }
-      if(type.equals(BashInfo.GCJS)){
+      if(type.equals(BashInfo.TBJG) || type.equals(BashInfo.GCJS)){
         gcjs = importExcel.getDouble(i+1,2);
         break;
       }