From e11ec9f1f37e416b79b72646bcf4e49d9e8aabd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 22 Jan 2024 15:48:42 +0800 Subject: [PATCH] 'commit' --- .../c2c2a47f-96de-4190-8679-d3ddcf1581f6.xlsx | Bin 0 -> 3789 bytes .../d7764939-d8cc-4863-9da7-ae3f8c41e0fd.xlsx | Bin 0 -> 3830 bytes .../QingLong/Collect/Model/CollectModel.java | 23 +++++++++++++----- .../QingLong/Handler/LoginHandler.java | 3 ++- 4 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 WebRoot/Excel/c2c2a47f-96de-4190-8679-d3ddcf1581f6.xlsx create mode 100644 WebRoot/Excel/d7764939-d8cc-4863-9da7-ae3f8c41e0fd.xlsx diff --git a/WebRoot/Excel/c2c2a47f-96de-4190-8679-d3ddcf1581f6.xlsx b/WebRoot/Excel/c2c2a47f-96de-4190-8679-d3ddcf1581f6.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..020798c9ba30d41ba3fe9d8546cc7ed74204438e GIT binary patch literal 3789 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 list = new ArrayList<>(); int fill_type_id; - if (forPerson) { - fill_type_id = 1;//到人,肯定是填报 - } else { - //否则继承原来的fill_type_id - fill_type_id = getJobTarget(job_id, bureau_id).getInt("fill_type_id"); - } + + + /** + -- 市教育局让 县区教育局 只转不填 + 转发按钮里: + (1)县区教育局-》判断单位任务-》学校只填写 fill_type_id=1 + (2)县区教育局-》判断人员任务-》学校只转不填 fill_type_id=2 + (3)单位转给人员时->只填 fill_type_id=1 + */ + if (publish_role_id == 268) {//县区教育局办公室干事 + if (target_type_id == 1) {//单位 + fill_type_id = 1; + } else {//人员 + fill_type_id = 2; + } + } else fill_type_id = 1; + for (String s : targetSet) { Record record = new Record(); record.set("job_id", child_job_id); diff --git a/src/main/java/com/dsideal/QingLong/Handler/LoginHandler.java b/src/main/java/com/dsideal/QingLong/Handler/LoginHandler.java index 5835cb4c..1ce7ea74 100644 --- a/src/main/java/com/dsideal/QingLong/Handler/LoginHandler.java +++ b/src/main/java/com/dsideal/QingLong/Handler/LoginHandler.java @@ -21,7 +21,8 @@ public class LoginHandler extends Handler { private boolean isStaticFile(String uri) { uri = uri.toLowerCase(); // 判断文件类型是否为静态文件类型,根据需要进行调整 - return uri.endsWith(".css") || uri.endsWith(".js") || uri.endsWith(".png") || uri.endsWith(".jpg") || uri.endsWith(".html") || uri.endsWith(".config.yml"); + return uri.endsWith(".css") || uri.endsWith(".js") || uri.endsWith(".png") || uri.endsWith(".jpg") || + uri.endsWith(".html") || uri.endsWith(".config.yml")|| uri.endsWith(".svg"); } @Override