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

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

@@ -382,6 +382,11 @@ public class ZbdcModel {
             r.set("xx_hjddwjzsks", xx_hjddwjzsks); // 小学护眼灯未改造教室数量
             r.set("xx_hjddjzgnqshu", xx_hjddjzgnqshu); // 小学护眼灯已改造功能室数量
             r.set("xx_hjddwjzgnqshu", xx_hjddwjzgnqshu); // 小学护眼灯未改造功能室数量
+
+            r.set("xx_ldjy", xx_ldjy);//小学劳动教育
+
+            r.set("xx_ldjy_values", xx_ldjy_values);
+
         }
 
         if (stage_id == 5) {
@@ -473,6 +478,8 @@ public class ZbdcModel {
             r.set("cz_hjddwjzsks", cz_hjddwjzsks); // 初中护眼灯未改造教室数量
             r.set("cz_hjddjzgnqshu", cz_hjddjzgnqshu); // 初中护眼灯已改造功能室数量
             r.set("cz_hjddwjzgnqshu", cz_hjddwjzgnqshu); // 初中护眼灯未改造功能室数量
+            r.set("cz_ldjy", cz_ldjy);//初中劳动教育
+            r.set("cz_ldjy_values", cz_ldjy_values);
         }
 
         if (stage_id == 6) {
@@ -585,10 +592,6 @@ public class ZbdcModel {
             r.set("area_id", area_id);
         }
 
-        r.set("xx_ldjy", xx_ldjy);//小学劳动教育
-        r.set("cz_ldjy", cz_ldjy);//初中劳动教育
-        r.set("xx_ldjy_values",xx_ldjy_values);
-        r.set("cz_ldjy_values",cz_ldjy_values);
 
         if (record == null) {
             Db.save("t_zbdc_bureau_cgzb", "year,bureau_id", r);
@@ -599,6 +602,7 @@ public class ZbdcModel {
         //器材库
         String[] xdkmArray = {"xx_yq", "xx_ms", "cz_yq", "cz_ms", "gz_yq", "gz_ms"};
         int[] xdkmArrayValue = {xx_yqqjkkjshu, xx_msqjkkjshu, cz_yqqjkkjshu, cz_msqjkkjshu, gz_yqqjkkjshu, gz_msqjkkjshu};
+        List<Record> writeList = new ArrayList<>();
         for (int i = 0; i < xdkmArray.length; i++) {
             String xdkm = xdkmArray[i];
             String lx_name = "器材库";
@@ -613,8 +617,10 @@ public class ZbdcModel {
             r.set("area_name", area_name);
             r.set("js", xdkmArrayValue[i]);
             r.set("sort_id", 0);
-            Db.save("t_zbdc_bureau_cgzb_detail", "id", r);
+            writeList.add(r);
         }
+        //Db.save("t_zbdc_bureau_cgzb_detail", "id", r);
+        Db.batchSave("t_zbdc_bureau_cgzb_detail", writeList, 100);
     }
 
     /**
@@ -871,7 +877,7 @@ public class ZbdcModel {
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0,
                     null, null, null, null, null,
-                    null, null, null, null, null, null, null, null, null, null,null,null);
+                    null, null, null, null, null, null, null, null, null, null, null, null);
         }
 
         sql = "select km_code,km_name from t_zbdc_templet where templet_id=?";
@@ -1732,22 +1738,25 @@ public class ZbdcModel {
      *
      * @return
      */
+    Map<String, Record> cacheMapSchoolAreaName = null;
+
     public Map<String, Record> getSchoolAreaName() {
+        if(cacheMapSchoolAreaName!=null) return cacheMapSchoolAreaName;
         String sql = "select t1.org_id,t1.org_type_id,t1.parent_id,t2.area_id,t2.area_name from t_base_organization as t1 left join t_dm_area as t2 on t1.parent_id=t2.area_id where t1.org_id = t1.bureau_id and (t1.school_type_id>0 or t1.org_type_id in (11,5)) ";
         List<Record> list = Db.find(sql);
-        Map<String, Record> _map = new HashMap<>();
+        cacheMapSchoolAreaName = new HashMap<>();
         for (Record record : list) {
             Record r1 = new Record();
             r1.set("area_id", record.getStr("area_id"));
             if (record.getInt("org_type_id") == 9) {
                 r1.set("area_name", "市直");
-                _map.put(record.getStr("org_id"), r1);
+                cacheMapSchoolAreaName.put(record.getStr("org_id"), r1);
             } else {
                 r1.set("area_name", record.getStr("area_name"));
-                _map.put(record.getStr("org_id"), r1);
+                cacheMapSchoolAreaName.put(record.getStr("org_id"), r1);
             }
         }
-        return _map;
+        return cacheMapSchoolAreaName;
     }
 
 
@@ -2711,6 +2720,7 @@ public class ZbdcModel {
         Document doc = Jsoup.parseBodyFragment(html);
         Element body = doc.body();
         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");
@@ -2769,8 +2779,9 @@ public class ZbdcModel {
             r.set("bureau_id", bureau_id);
             r.set("area_id", area_id);
             r.set("area_name", area_name);
-            Db.save("t_zbdc_bureau_cgzb_detail", "id", r);
+            writeList.add(r);
         }
+        Db.batchSave("t_zbdc_bureau_cgzb_detail", writeList, 100);
         //封装返回的结构体
         Record record = new Record();
         record.set("sysshshu", sysshshu);//实验室数量