1111

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

@@ -30,6 +30,7 @@ public class BashInfo {
     public static final String KJJGCC = "扣减甲供材超供材料费";
     public static final String GCJS = "工程结算价";
     public static final String TBJG = "竣工结算价合计";
+    public static final String TBJG1 = "投标报价";
     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

@@ -697,7 +697,6 @@ public class JkxlController extends BaseController {
       }
       if(type.equals(BashInfo.TBJG) || type.equals(BashInfo.GCJS)){
         gcjs = importExcel.getDouble(i+1,2);
-        break;
       }
     }
     double[] wsb = new double[3];

src/main/resources/j2cache/j2cache.properties

@@ -88,8 +88,8 @@ redis.cluster_name = j2cache
 redis.namespace = 
 
 ## connection
-redis.hosts = 192.168.2.4:6379
-#redis.hosts = 127.0.0.1:6379
+#redis.hosts = 192.168.2.4:6379
+redis.hosts = 127.0.0.1:6379
 redis.timeout = 2000
 redis.password =
 redis.database = 0

src/main/resources/properties/jeeplus.properties

@@ -14,8 +14,8 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
-#jdbc.url=jdbc:mysql://localhost:3306/guowang?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://192.168.2.4:3306/guowang?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://localhost:3306/guowang?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://192.168.2.4:3306/guowang?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 jdbc.password=root
 jdbc.testSql=SELECT 'x'