20190805提交3

src/main/java/com/jeeplus/modules/sg/overheadline/service/SettlementService.java

@@ -72,8 +72,9 @@ public class SettlementService {
         for (int i = 2; i < lastDataRowNum; i++) {
             objects = new Object[2];
             key =  importExcel.getValue(i+1,1);
-//            val = importExcel.getDouble(i+1,2);
-//            text=importExcel.getValue(i+1,3);
+            if(key.contains(BashInfo.JS_SJ)){
+                key=BashInfo.JS_SJ;
+            }
             switch (key){
                 case BashInfo.JS_FBFX:
                     val = importExcel.getDouble(i+1,2);
@@ -111,6 +112,7 @@ public class SettlementService {
                     map.put(key, objects);
                     break;
                 case BashInfo.JS_SJ:
+
                     val = importExcel.getDouble(i+1,2);
                     text=importExcel.getValue(i+1,3);
                     objects[0] = val;

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

@@ -61,7 +61,7 @@ public class BashInfo {
     public static final String JS_CSXM="措施项目费";
     public static final String JS_QTXM="其他项目费";
     public static final String JS_GF="规费";
-    public static final String JS_SJ="税金 (税率: 9%)";
+    public static final String JS_SJ="税金";
     public static final String JS_FBRF="发包人采购材料费";
     public static final String JS_JGJS="竣工结算价合计";
     public static final String JS_BZZS="补增值税税率调整差额";