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

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

@@ -568,18 +568,6 @@ public class CollectController extends Controller {
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
-    /**
-     * 功能：获取学校类型
-     *
-     * @return
-     */
-    @Before({GET.class})
-    @IsLoginInterface({})
-    public void getSchoolType() {
-        List<Record> list = cm.getSchoolType();
-        renderJson(CommonUtil.renderJsonForLayUI(list));
-    }
-
     /**
      * 功能：获取单位类型
      *
@@ -592,24 +580,11 @@ public class CollectController extends Controller {
         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
@@ -617,9 +592,9 @@ public class CollectController extends Controller {
     @Before({GET.class})
     @IsLoginInterface({})
     public void getBureauList(int org_type_id, int school_type_id,
-                              int level_id, String city_id, String area_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);
+        Page<Record> list = cm.getBureauList(org_type_id, school_type_id,  city_id, area_id, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 

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

@@ -700,15 +700,6 @@ public class CollectModel {
         return pageRecord;
     }
 
-    /**
-     * 功能：获取学校类型
-     *
-     * @return
-     */
-    public List<Record> getSchoolType() {
-        SqlPara sqlPara = Db.getSqlPara("Collect.getSchoolType");
-        return Db.find(sqlPara);
-    }
 
     /**
      * 功能：获取单位类型
@@ -720,33 +711,22 @@ public class CollectModel {
         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,
+                                      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);
@@ -768,31 +748,35 @@ public class CollectModel {
                            int shiZhiJiaoFu, int quXiaoJiaoYuJu, String bureauIds) throws ParseException {
         Set<String> bureauSet = new HashSet<>();
         if (shiZhiSchool == 1) {
-            Page<Record> list = getBureauList(9, -1, 1, null, null, 1, 9999);
+            Page<Record> list = getBureauList(9, -1, null, null, 1, 9999);
             for (Record record : list.getList()) {
                 bureauSet.add(record.getStr("org_id"));
             }
         }
         if (shiZhiJiaoFu == 1) {
-            Page<Record> list = getBureauList(5, -1, 1, null, null, 1, 9999);
+            Page<Record> list = getBureauList(5, -1, null, null, 1, 9999);
             for (Record record : list.getList()) {
                 bureauSet.add(record.getStr("org_id"));
             }
         }
         if (quXiaoJiaoYuJu == 1) {
-            Page<Record> list = getBureauList(4, -1, 1, null, null, 1, 9999);
+            Page<Record> list = getBureauList(4, -1, null, null, 1, 9999);
             for (Record record : list.getList()) {
                 bureauSet.add(record.getStr("org_id"));
             }
         }
-        for (String s : bureauIds.split(",")) {
-            bureauSet.add(s);
+        if (!StrKit.isBlank(bureauIds)) {
+            for (String s : bureauIds.split(",")) {
+                bureauSet.add(s);
+            }
         }
         //写主表
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date date = dateFormat.parse(deadline_time);
         String sql = "update t_collect_job set publish_time=now(),publish_state=1,deadline_time=? where job_id=?";
         Db.update(sql, date, job_id);
+        sql = "delete from t_collect_job_bureau where job_id=?";
+        Db.update(sql, job_id);
         //写任务分派表
         List<Record> list = new ArrayList<>();
         for (String s : bureauSet) {

src/main/resource/Sql/collect.sql

@@ -12,20 +12,14 @@
         #end
         order by t1.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
+        select 5 as id ,'市直教辅单位' as name
         union
-        select 0 as level_id,'其它' as level_name
+        select 9 as id ,'市直学校' as name
+        union
+        select 11 as id ,'区县教育局' as name
     #end
 
     -- 获取单位列表
@@ -37,9 +31,7 @@
         #if(school_type_id)
             and school_type_id =#(school_type_id)
         #end
-        #if(level_id)
-            and level_id=#para(level_id)
-        #end
+        and level_id=1
         #if(city_id)
             and city_id=#para(city_id)
         #end