Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java

@@ -496,16 +496,17 @@ public class ZbdcController extends Controller {
             cz_ldjy = Base64.decodeStr(cz_ldjy).replace("\n", "");
         }
 
+        //小学创客
         if (!StrKit.isBlank(xx_ck)) {
             xx_ck = Base64.decodeStr(xx_ck).replace("\n", "");
             zm.JxSave(xx_ck, year, bureau_id);
         }
-
+        //初中创客
         if (!StrKit.isBlank(cz_ck)) {
             cz_ck = Base64.decodeStr(cz_ck).replace("\n", "");
             zm.JxSave(cz_ck, year, bureau_id);
         }
-
+        //高中创客
         if (!StrKit.isBlank(gz_ck)) {
             gz_ck = Base64.decodeStr(gz_ck).replace("\n", "");
             zm.JxSave(gz_ck, year, bureau_id);

src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java

@@ -2725,6 +2725,7 @@ public class ZbdcModel {
         Elements elements = body.getAllElements().getFirst().getElementsByTag("input");
         List<Record> writeList = new ArrayList<>();
         for (int i = 0; i < elements.size(); i++) {
+
             Element input = elements.get(i);
             String input_name = input.attr("name");
             if (StrKit.isBlank(xdkm)) {
@@ -2735,15 +2736,16 @@ public class ZbdcModel {
             }
             //去掉多余的最后面的随机数
             String[] array = input_name.split("_");
+
             int jsny = 0;//建设年份
             double mj = 0;//面积
-            String type_name = "";//类型
             String lx_name = "";//类型名称
 
             String prefix = array[0] + "_" + array[1];
             String key = (prefix).replace(xdkm, "");
 
-            if (!prefix.endsWith("jsny") && !prefix.endsWith("mj") && !prefix.endsWith("jslx")) continue;//两个都不是的，不处理跳过
+            if (!prefix.endsWith("jsny") && !prefix.endsWith("mj") && !prefix.endsWith("jslx")) continue;//三个都不是的，不处理跳过
+
             if (prefix.endsWith("jsny")) {//建设年份
                 jsny = Integer.parseInt(input.attr("value"));//建设年份
                 Element inputNext = elements.get(i + 1);//下一个必定是面积
@@ -2753,6 +2755,11 @@ public class ZbdcModel {
                 sysshshu++;//实验室
                 sysmj += mj;//面积
                 i++;
+            } else if (prefix.endsWith("jslx")) {//教室类型
+                lx_name = input.attr("value");//教室类型
+                Element inputNext = elements.get(i + 1);//下一个必定是面积
+                mj = Double.parseDouble(inputNext.attr("value"));//面积
+                i++;
             } else if (prefix.endsWith("mj")) {//以mj结尾，一定是面积
                 mj = Double.parseDouble(input.attr("value"));//面积
                 lx_name = map.get(key.substring(0, key.length() - 2));
@@ -2769,16 +2776,14 @@ public class ZbdcModel {
                 } else if (prefix.substring(5).startsWith("jtr")) {//普通教室
                     jtrshu++; //普通教室
                     jtrmj += mj;//面积
-                } else if (prefix.endsWith("jslx")) {//教室类型
-                    type_name = input.attr("value");
                 } else {
                     tgsmjshu++; //探究实验室
                     tgsmjmj += mj;
                 }
             }
+
             Record r = new Record();
             r.set("xdkm", xdkm);
-            if (StrKit.isBlank(lx_name)) lx_name = "教室类型";
             r.set("lx_name", lx_name);
             r.set("jsny", jsny);
             r.set("mj", mj);
@@ -2786,7 +2791,6 @@ public class ZbdcModel {
             r.set("bureau_id", bureau_id);
             r.set("area_id", area_id);
             r.set("area_name", area_name);
-            r.set("type_name", type_name);
             writeList.add(r);
         }
         Db.batchSave("t_zbdc_bureau_cgzb_detail", writeList, 100);