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

Doc/数据上报系统测试账号.txt

@@ -24,6 +24,7 @@ DsideaL4r5t6y7u
 
 # 县区教育局资产填报干事
 南关区教育局资产填报干事  nggs   123456
+九台区教育局办公事干事    jtgs   123456
 
 # Q:如何设计才能让指定角色发的统计任务，让哪些指定角色接收到？
 select * from t_base_org_type_principalship where name like '%校办干事%'

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

@@ -717,11 +717,11 @@ public class CollectController extends Controller {
         }
         List<Record> list = cm.getXianQuJiaoYuJu(bureauIds, groupIds);
         boolean exist = false;
-        if(list!=null && list.size() > 0) exist=true;
+        if (list != null && list.size() > 0) exist = true;
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
         map.put("exist", exist);
-        map.put("list",list);
+        map.put("list", list);
         if (exist) map.put("message", "存在县区教育局!");
         else map.put("message", "不存在县区教育局!");
         renderJson(map);
@@ -903,7 +903,10 @@ public class CollectController extends Controller {
     @IsLoginInterface({})
     @IsNumericInterface({"is_finish"})
     @LayUiPageInfoInterface({"page", "limit"})
-    public void viewJobList(String keyword, int is_finish, int page, int limit) {
+    public void viewJobList(String keyword, int is_finish, int page, int limit, int fill_type_id, int forward_is_finish) {
+        //注意：要求前端必须传入新增参数：forward_is_finish,fill_type_id,如果不关心转为概念，需传入-1,不可以是0!
+        if (fill_type_id <= 0) fill_type_id = 1;//填报是默认值
+
         //操作人员
         String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
         //根据人员ID，获取人员所在的单位ID
@@ -911,7 +914,7 @@ public class CollectController extends Controller {
         Record rs = personModel.getLoginInfoByPersonId(person_id);
         String bureau_id = rs.get("bureau_id");
 
-        Page<Record> list = cm.viewJobList(bureau_id, keyword, is_finish, page, limit);
+        Page<Record> list = cm.viewJobList(bureau_id, keyword, is_finish, page, limit, fill_type_id, forward_is_finish);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 

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

@@ -985,16 +985,26 @@ public class CollectModel {
     /**
      * 功能：学校（单位）查看我该填报或者我已填报的任务列表
      *
-     * @param bureau_id 单位ID
-     * @param is_finish 是不是已完成
-     * @param keyword   搜索关键字
-     * @param is_finish 0:未填报，1：已填报，-1：全部
+     * @param bureau_id         单位ID
+     * @param is_finish         是不是已完成
+     * @param keyword           搜索关键字
+     * @param is_finish         0:未填报，1：已填报，-1：全部
+     * @param fill_type_id      1：填报，2：转发，3：即填报又转发
+     * @param limit             每页多少个
+     * @param page              第几页
+     * @param forward_is_finish 转发是不是已完成上交回复
      */
-    public Page<Record> viewJobList(String bureau_id, String keyword, int is_finish, int page, int limit) {
+    public Page<Record> viewJobList(String bureau_id, String keyword, int is_finish, int page, int limit, int fill_type_id, int forward_is_finish) {
         Kv kv = Kv.create();
         kv.set("bureau_id", bureau_id);
         if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword);
         if (is_finish != -1) kv.set("is_finish", is_finish);
+
+        if (fill_type_id == 1) kv.set("fill_type_id_1", 1);
+        else if (fill_type_id == 2) kv.set("fill_type_id_2", 1);
+        else if (fill_type_id == 3) kv.set("fill_type_id_3", 1);
+        if (forward_is_finish != -1) kv.set("forward_is_finish", forward_is_finish);
+
         SqlPara sqlPara = Db.getSqlPara("Collect.viewJobList", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
 
@@ -1030,7 +1040,11 @@ public class CollectModel {
         kv.set("job_id", job_id);
         if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword);
         if (is_finish != -1) kv.set("is_finish", is_finish);
-        kv.set("fill_type_id", fill_type_id);
+
+        if (fill_type_id == 1) kv.set("fill_type_id_1", 1);
+        else if (fill_type_id == 2) kv.set("fill_type_id_2", 1);
+        else if (fill_type_id == 3) kv.set("fill_type_id_3", 1);
+
         SqlPara sqlPara = Db.getSqlPara("Collect.listFilledJob", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
         for (Record record : pageRecord.getList()) {

src/main/resource/Sql/Collect.sql

@@ -48,6 +48,18 @@
         #if(is_finish)
          and t2.is_finish= #para(is_finish)
         #end
+        #if(fill_type_id_1)
+          and t2.fill_type_id in (1,3)
+        #end
+        #if(fill_type_id_2)
+          and t2.fill_type_id in (2,3)
+        #end
+        #if(fill_type_id_3)
+          and t2.fill_type_id in (3)
+        #end
+        #if(forward_is_finish)
+          and t2.forward_is_finish=#para(forward_is_finish)
+        #end
         #if(keyword)
          and t1.job_name like #para(keyword, "like")
         #end
@@ -66,8 +78,14 @@
         #if(is_finish)
           and t1.is_finish=#para(is_finish)
         #end
-        #if(fill_type_id)
-          and t1.fill_type_id=fill_type_id
+        #if(fill_type_id_1)
+          and t1.fill_type_id in (1,3)
+        #end
+        #if(fill_type_id_2)
+          and t1.fill_type_id = (2,3)
+        #end
+        #if(fill_type_id_3)
+          and t1.fill_type_id in (3)
         #end
         #if(keyword)
          and t2.org_name like #para(keyword, "like")