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

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -2102,8 +2102,10 @@ public class CollectController extends Controller {
         } else {
             //需要重写根据第三方数据表，获取指定年级下有哪些班级
             Record record = personModel.getTyPersonBureauInfo(person_id);
-            String org_id = record.getStr("org_id");//人员所在单位
-            //TODO
+            String bureau_id = record.getStr("org_id");//人员所在单位
+
+            Page<Record> list = cm.getTyClassList(bureau_id, nj_id, keyword, page, limit);
+            renderJson(CommonUtil.renderJsonForLayUI(list));
         }
     }
 }

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -2688,6 +2688,41 @@ public class CollectModel {
         return pageRecord;
     }
 
+    public Page<Record> getTyClassList(String bureau_id, int nj_id, String keyword, int page, int limit) {
+        Kv kv = Kv.by("bureau_id", bureau_id);
+        String prev="";
+        if (nj_id == 1) {
+            prev = "一年级";
+        } else if (nj_id == 2) {
+            prev = "二年级";
+        } else if (nj_id == 3) {
+            prev = "三年级";
+        } else if (nj_id == 4) {
+            prev = "四年级";
+        } else if (nj_id == 5) {
+            prev = "五年级";
+        } else if (nj_id == 6) {
+            prev = "六年级";
+        } else if (nj_id == 7) {
+            prev = "七年级";
+        } else if (nj_id == 8) {
+            prev = "八年级";
+        } else if (nj_id == 9) {
+            prev = "九年级";
+        } else if (nj_id == 10) {
+            prev = "高中一年级";
+        } else if (nj_id == 11) {
+            prev = "高中二年级";
+        } else if (nj_id == 12) {
+            prev = "高中三年级";
+        }
+        kv.set("prev", prev);
+        if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword);
+        SqlPara sqlPara = Db.getSqlPara("Collect.getTyClassList", kv);
+        Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
+        return pageRecord;
+    }
+
     /**
      * 功能：获取当前登录人员是否具有发布到下级的权限
      */

src/main/resource/Sql/Collect.sql

@@ -199,6 +199,12 @@
         #end
         order by t1.stage_id,t1.class_num
     #end
+    #sql("getTyClassList")
+        select org_id as class_id,org_name as class_name from ds_base_class where bureau_id=#para(bureau_id)
+        and org_name like '#(prev)%'
+        and org_name like #para(keyword, "like")
+        order by id_int
+    #end
     -- 获取我系统中所有已匹配单位 或 未匹配单位
     #sql("getAllBureau")
         select t1.org_id,t1.org_name,t1.third_party_id,CASE WHEN t1.third_party_id IS NULL THEN 0 ELSE 1 END AS is_match,