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

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

@@ -298,27 +298,6 @@ public class ZbdcController extends Controller {
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
-    /**
-     * 功能：仪器设备查询
-     *
-     * @param area_id
-     * @param school_type_id
-     * @param keyword
-     * @param km_code
-     * @param level_filter
-     * @param year
-     * @param page
-     * @param limit
-     */
-    @Before({GET.class})
-    @IsLoginInterface({})
-    @EmptyInterface({"km_code"})
-    public void getQueryYqsb(String area_id, int school_type_id, String keyword, String km_code, String level_filter, int year, int page, int limit) {
-        if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份
-        String bureauIds = zm.getBureauIds(area_id, school_type_id, keyword);
-        Page<Record> list = zm.getFill(bureauIds, year, km_code, level_filter, page, limit);
-        renderJson(CommonUtil.renderJsonForLayUI(list));
-    }
 
 
     /**
@@ -497,6 +476,28 @@ public class ZbdcController extends Controller {
         Page<Record> list = zm.getQueryCgzb(area_id, school_type_id, year, keyword, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
+    /**
+     * 功能：仪器设备查询
+     *
+     * @param area_id
+     * @param school_type_id
+     * @param keyword
+     * @param km_code
+     * @param level_filter
+     * @param year
+     * @param page
+     * @param limit
+     */
+    @Before({GET.class})
+    @IsLoginInterface({})
+    @EmptyInterface({"km_code"})
+    // http://10.10.21.20:9000/QingLong/zbdc/getQueryYqsb?area_id=&school_type_id=211&keyword=&km_code=xxyl&level_filter=&year=0&page=1&limit=10
+    public void getQueryYqsb(String area_id, int school_type_id, String keyword, String km_code, String level_filter, int year, int page, int limit) {
+        if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份
+        String bureauIds = zm.getBureauIds(area_id, school_type_id, keyword);
+        Page<Record> list = zm.getFill(bureauIds, year, km_code, level_filter, page, limit);
+        renderJson(CommonUtil.renderJsonForLayUI(list));
+    }
 
 
     /**

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

@@ -11,7 +11,6 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.SqlPara;
-import jnr.ffi.annotations.In;
 
 import java.util.*;
 import java.text.SimpleDateFormat;
@@ -344,8 +343,13 @@ public class ZbdcModel {
             map2.put(record.getStr("bureau_id"), record.getStr("bureau_name"));
             map3.put(record.getStr("bureau_id"), record.getStr("xzqh"));
         }
+
+        Map<String, String> m1 = getSchoolAreaName();
+        Map<Integer, String> m2 = getSchoolTypeNameMap();
         //填充已填报的内容
         for (Record record : nList) {
+            record.set("area_name", m1.get(record.getStr("bureau_id")));
+            record.set("school_type_name", m2.get(record.getStr("bureau_id")));
             record.set("bureau_name", map2.get(record.getStr("bureau_id")));
             record.set("xzqh", map3.get(record.getStr("bureau_id")));
             if (map1.containsKey(record.getStr("bureau_id") + "_" + record.getInt("templet_id"))) {
@@ -707,6 +711,20 @@ public class ZbdcModel {
         return Db.findFirst(sql, school_type_id).getStr("school_type_name");
     }
 
+    /**
+     * 功能：获取所有学校的学校类型名称MAP
+     *
+     * @return
+     */
+    public Map<Integer, String> getSchoolTypeNameMap() {
+        List<Record> list = getQuerySchoolType();
+        Map<Integer, String> _map = new HashMap<>();
+        for (Record record : list) {
+            _map.put(record.getInt("school_type_id"), record.getStr("school_type_name"));
+        }
+        return _map;
+    }
+
     /**
      * 功能：查询符合条件的学校列表
      *
@@ -723,9 +741,9 @@ public class ZbdcModel {
                 sql += " and school_type_id=" + school_type_id;
             }
         } else if (area_id.equals("0")) {//市直
-            sql+=" and org_type_id=9 ";
+            sql += " and org_type_id=9 ";
             if (school_type_id > 0) {//某个学校类型
-                sql += " and school_type_id=" + school_type_id  ;
+                sql += " and school_type_id=" + school_type_id;
             }
         } else {//县区
             sql += " and parent_id='" + area_id + "'";
@@ -851,9 +869,9 @@ public class ZbdcModel {
         Map<String, String> _map = getSchoolAreaName();
         if (!StrKit.isBlank(area_id)) {
             String bureauIds = getBureauIds(area_id, school_type_id, keyword);
-            if(StrKit.isBlank(bureauIds)){
+            if (StrKit.isBlank(bureauIds)) {
                 p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_cgzb where 1=2");
-            }else{
+            } else {
                 p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_cgzb where bureau_id in (" + bureauIds + ") and year=" + year + " order by bureau_id");
             }