'commit'

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

@@ -16,8 +16,10 @@ import com.jfinal.ext.interceptor.GET;
 import com.jfinal.ext.interceptor.POST;
 import com.jfinal.kit.Kv;
 import com.jfinal.kit.StrKit;
+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 com.jfinal.upload.UploadFile;
 import org.apache.poi.openxml4j.util.ZipSecureFile;
 import org.apache.poi.ss.usermodel.IndexedColors;
@@ -479,8 +481,6 @@ public class CollectController extends Controller {
 
     /**
      * 功能：获取任务列表，支持关键字查询
-     *
-     * @param job_name /QingLong/collect/getJobList?page=1&limit=10
      */
 
     @Before({GET.class})
@@ -489,4 +489,59 @@ public class CollectController extends Controller {
         Page<Record> list = cm.getJobList(job_name, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
+
+    /**
+     * 功能：获取学校类型
+     *
+     * @return
+     */
+    @Before({GET.class})
+    @IsLoginInterface({})
+    public void getSchoolType() {
+        List<Record> list = cm.getSchoolType();
+        renderJson(CommonUtil.renderJsonForLayUI(list));
+    }
+
+    /**
+     * 功能：获取单位类型
+     *
+     * @return
+     */
+    @Before({GET.class})
+    @IsLoginInterface({})
+    public void getBureauType() {
+        List<Record> list = cm.getBureauType();
+        renderJson(CommonUtil.renderJsonForLayUI(list));
+    }
+
+    /**
+     * 市直属下拉框
+     *
+     * @return
+     */
+    @Before({GET.class})
+    @IsLoginInterface({})
+    public void getShiZhiType() {
+        List<Record> list = cm.getShiZhiType();
+        renderJson(CommonUtil.renderJsonForLayUI(list));
+    }
+
+    /**
+     * 功能：获取单位列表
+     *
+     * @param org_type_id
+     * @param school_type_id
+     * @param level_id
+     * @param city_id
+     * @param area_id
+     * @return
+     */
+    @Before({GET.class})
+    @IsLoginInterface({})
+    public void getBureauList(int org_type_id, int school_type_id,
+                              int level_id, String city_id, String area_id,
+                              int page, int limit) {
+        Page<Record> list = cm.getBureauList(org_type_id, school_type_id, level_id, city_id, area_id, page, limit);
+        renderJson(CommonUtil.renderJsonForLayUI(list));
+    }
 }

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

@@ -270,7 +270,6 @@ public class CollectModel {
     }
 
 
-
     /**
      * 功能：创建表
      *
@@ -915,4 +914,59 @@ public class CollectModel {
         }
         return pageRecord;
     }
+
+    /**
+     * 功能：获取学校类型
+     *
+     * @return
+     */
+    public List<Record> getSchoolType() {
+        SqlPara sqlPara = Db.getSqlPara("Collect.getSchoolType");
+        return Db.find(sqlPara);
+    }
+
+    /**
+     * 功能：获取单位类型
+     *
+     * @return
+     */
+    public List<Record> getBureauType() {
+        SqlPara sqlPara = Db.getSqlPara("Collect.getBureauType");
+        return Db.find(sqlPara);
+    }
+
+    /**
+     * 市直属下拉框
+     *
+     * @return
+     */
+    public List<Record> getShiZhiType() {
+        SqlPara sqlPara = Db.getSqlPara("Collect.getShiZhiType");
+        return Db.find(sqlPara);
+    }
+
+    /**
+     * 功能：获取单位列表
+     *
+     * @param org_type_id
+     * @param school_type_id
+     * @param level_id
+     * @param city_id
+     * @param area_id
+     * @return
+     */
+    public Page<Record> getBureauList(int org_type_id, int school_type_id,
+                                      int level_id, String city_id, String area_id,
+                                      int page, int limit) {
+        Kv kv = Kv.create();
+        if (org_type_id != -1) kv.set("org_type_id", org_type_id);
+        if (school_type_id != -1) kv.set("school_type_id", school_type_id);
+        if (level_id != -1) kv.set("level_id", level_id);
+        if (!StrKit.isBlank(city_id)) kv.set("city_id", city_id);
+        if (!StrKit.isBlank(area_id)) kv.set("area_id", area_id);
+        SqlPara sqlPara = Db.getSqlPara("Collect.getBureauList", kv);
+        String sql = sqlPara.getSql();
+        Page<Record> pageRecord = Db.paginateByFullSql(page, limit, CommonUtil.getTotalSql(sql), sql);
+        return pageRecord;
+    }
 }

src/main/resource/Sql/collect.sql

@@ -1,4 +1,5 @@
 #namespace("Collect")
+    -- 获取任务列表
     #sql("getJobList")
         select * from t_collect_job where 1=1
         #if(job_name)
@@ -6,4 +7,41 @@
         #end
         order by job_id desc
     #end
+    -- 获取学校类型
+    #sql("getSchoolType")
+        select school_type_id,school_type_name from t_dm_schooltype where school_type_id
+        in (211,341,345,111,342,213,311) order by school_type_id
+    #end
+    -- 获取单位类型
+    #sql("getBureauType")
+        select id,name from t_base_org_type_principalship where id in (5,9,10) and b_use=1 order by id
+    #end
+    -- 市直属下拉框
+    #sql("getShiZhiType")
+        select 1 as level_id,'市直学校' as level_name
+        union
+        select 0 as level_id,'其它' as level_name
+    #end
+
+    -- 获取单位列表
+    #sql("getBureauList")
+        select * from t_base_organization  where 1=1
+        #if(org_type_id)
+            and org_type_id=#para(org_type_id)
+        #end
+        #if(school_type_id)
+            and school_type_id =#para(school_type_id)
+        #end
+        #if(level_id)
+            and level_id=#para(level_id)
+        #end
+        #if(city_id)
+            and city_id=#para(city_id)
+        #end
+        #if(area_id)
+            and area_id=#para(area_id)
+        #end
+        order by org_name
+    #end
+
 #end