1111

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

@@ -585,21 +585,24 @@ public class BashInfo {
      */
     public static List<JkxlAdjustFee> getWsbFee(ImportExcel importExcel) {
         int lastRow = importExcel.getLastDataRowNum();
-        int row = 0;
+        int row1 = 0;
+        int row2 = 0;
         List<JkxlAdjustFee> jkxlAdjustFees = new ArrayList<>();
         JkxlAdjustFee jkxlAdjustFee = null;
         for (int i = 0; i < lastRow; i++) {
             String type = importExcel.getValue(i + 1, 1);
             if (type.contains(JS_SJ)) {
-                row = i+1;
+                row1 = i+1;
                 break;
             }
-//            if(index.length()==1 && !type.contains(JS_FBFX) && !type.contains(JS_CSXM) && !type.contains(JS_QTXM)  && !type.contains(JS_GF)
-//                    && !type.contains(JS_SJ) && !type.contains(JS_FBRF) && !type.contains(JS_CBRF) && !type.contains(JS_JGJS)){
-//
-//            }
         }
-        for (int j = row; j < lastRow; j++) {
+        for (int i = 0; i < lastRow; i++) {
+            String type = importExcel.getValue(i + 1, 1);
+            if (type.contains("竣工") || type.contains("合计") || type.contains("结算") ||type.contains("投标") ) {
+                row2 = i+1;
+            }
+        }
+        for (int j = row1; j < row2; j++) {
             String type = importExcel.getValue(j + 1, 1);
             String index = importExcel.getValue(j + 1, 0);
             if(type.equals("")){