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

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

@@ -708,6 +708,7 @@ public class CollectController extends Controller {
      * 2：下属学校
      * 3：下属教辅单位
      * 4: 市教育局
+     *
      * @return
      */
     @Before({GET.class, RepeatIntercetpor.class})
@@ -767,6 +768,7 @@ public class CollectController extends Controller {
      * @param xiaShuSchool   下属学校：1选中，0未选中
      * @param xiaShuJiaoFu   下属教辅单位：1选中，0未选中
      * @param xiaShuJiaoYuJu 下属教育局：1选中，0未选中
+     * @param ShiJiaoYuJu    是教育局，1：选中，0：未选中
      * @param bureauIds      按单位选择的单位ids
      * @param groupIds       群组ids
      * @param memo           说明文字
@@ -789,7 +791,7 @@ public class CollectController extends Controller {
     @IsNumericInterface({"job_id", "publish_job_type_id", "xiaShuSchool", "xiaShuJiaoFu", "xiaShuJiaoYuJu", "fill_type_id"})
     @EmptyInterface({"deadline_time"})
     public void publishJob(int job_id, String deadline_time, int publish_job_type_id,
-                           int xiaShuSchool, int xiaShuJiaoFu, int xiaShuJiaoYuJu,
+                           int xiaShuSchool, int xiaShuJiaoFu, int xiaShuJiaoYuJu, int ShiJiaoYuJu,
                            String bureauIds, String groupIds, String memo,
                            int fill_type_id, int target_type_id,
                            //增加的参数
@@ -809,7 +811,7 @@ public class CollectController extends Controller {
         String area_id = bm.getOrgInfoById(bureau_id).getStr("area_id");
 
         cm.publishJob(job_id, deadline_time, publish_job_type_id, area_id,
-                xiaShuSchool, xiaShuJiaoFu, xiaShuJiaoYuJu, bureauIds,
+                xiaShuSchool, xiaShuJiaoFu, xiaShuJiaoYuJu, ShiJiaoYuJu, bureauIds,
                 groupIds, memo, fill_type_id, target_type_id, allTeacher, allStudent, njIds,
                 personIds, classIds);
         Map<String, Object> map = new HashMap<>();
@@ -1000,7 +1002,7 @@ public class CollectController extends Controller {
     public void viewJobPerson(int job_id) {
         //操作人员
         String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
-        Record record = cm.viewJobPerson(person_id,job_id);
+        Record record = cm.viewJobPerson(person_id, job_id);
         renderJson(record);
     }
 
@@ -1584,8 +1586,7 @@ public class CollectController extends Controller {
     @Before({POST.class, RepeatIntercetpor.class})
     @IsLoginInterface({})
     @IsNumericInterface({"job_id"})
-    public void ForwardJob(int job_id, String deadline_time, int xiaShuSchool, int xiaShuJiaoFu,
-                           String bureauIds, String groupIds, String memo,
+    public void ForwardJob(int job_id, String deadline_time, int xiaShuSchool, int xiaShuJiaoFu, String bureauIds, String groupIds, String memo,
                            //增加的参数
                            int allTeacher, int allStudent, String njIds,
                            String personIds, String classIds) throws ParseException {

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

@@ -797,6 +797,18 @@ public class CollectModel {
         return Db.find(sqlPara);
     }
 
+    /**
+     * 功能：获取当前安装地区市级的教育局，一般应该是一个，怕特殊情况，可以添加多个
+     *
+     * @return
+     */
+    public List<Record> getJiaoYuJu() {
+        //默认查全市
+        GlobalModel gm = new GlobalModel();
+        String city_id = gm.getGlobalValueByKey("install_area");
+        String sql = "select org_id from t_base_organization where org_type_id=4 and city_id=?";
+        return Db.find(sql, city_id);
+    }
 
     /**
      * 功能：获取单位列表
@@ -1015,13 +1027,14 @@ public class CollectModel {
      * @param xiaShuSchool        下属学校：1选中，0未选中
      * @param xiaShuJiaoFu        下属教辅单位：1选中，0未选中
      * @param xiaShuJiaoYuJu      下属教育局：1选中，0未选中
+     * @param ShiJiaoYuJu         市教育局
      * @param bureauIds           按单位选择的单位ids
      * @param groupIds            群组ids
      * @param memo                任务描述
      * @param fill_type_id        填报任务类型
      * @param target_type_id      1：单位填报，2：人员填报
      * @param allTeacher          所有教师
-     * @param allSutdent          所有学生
+     * @param allStudent          所有学生
      * @param njIds               哪些年级，比如1,2表示1、2年级所有学生
      * @param personIds           哪些人员(目前只支持教师)
      * @param classIds            哪些班级
@@ -1029,9 +1042,10 @@ public class CollectModel {
      *                            1：市级
      *                            2：县区级
      *                            3：单位、校级
+     * @param area_id             哪个县区
      */
     public void publishJob(int job_id, String deadline_time, int publish_job_type_id, String area_id,
-                           int xiaShuSchool, int xiaShuJiaoFu, int xiaShuJiaoYuJu,
+                           int xiaShuSchool, int xiaShuJiaoFu, int xiaShuJiaoYuJu, int ShiJiaoYuJu,
                            String bureauIds, String groupIds, String memo, int fill_type_id,
                            int target_type_id, int allTeacher, int allStudent, String njIds,
                            String personIds, String classIds) throws ParseException {
@@ -1060,6 +1074,13 @@ public class CollectModel {
                     targetSet.add(record.getStr("org_id"));
                 }
             }
+            //市教育局
+            if (ShiJiaoYuJu == 1) {
+                List<Record> list = getJiaoYuJu();
+                for (Record record : list) {
+                    targetSet.add(record.getStr("org_id"));
+                }
+            }
         }
         //县区级发布
         else if (publish_job_type_id == 2) {

src/main/java/com/dsideal/QingLong/Handler/RepeatIntercetpor.java

@@ -7,7 +7,7 @@ import com.jfinal.plugin.activerecord.Record;
 
 public class RepeatIntercetpor implements Interceptor {
 
-    private final static long timeOut = 1000;//1之内，同一个用户，同一个接口，只能调用一次
+    private final static long timeOut = 500;//1之内，同一个用户，同一个接口，只能调用一次
 
     //https://www.cnblogs.com/chenjy1225/p/14919428.html
     @Override