From 0cf3a552ceecf6cb4d44a59844a05920bc69baf5 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 16:26:37 +0800 Subject: [PATCH] 'commit' --- Doc/数据上报系统测试账号.txt | 3 +++ .../26131f31-95ed-4960-8a8f-4fe42134ec75.xlsx | Bin 0 -> 3792 bytes .../56a0642a-1390-4105-b315-0aa686f31364.xlsx | Bin 0 -> 3791 bytes .../QingLong/Collect/Model/CollectModel.java | 7 +++++-- 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 WebRoot/Excel/26131f31-95ed-4960-8a8f-4fe42134ec75.xlsx create mode 100644 WebRoot/Excel/56a0642a-1390-4105-b315-0aa686f31364.xlsx diff --git a/Doc/数据上报系统测试账号.txt b/Doc/数据上报系统测试账号.txt index b6c61eaf..87ca4da3 100644 --- a/Doc/数据上报系统测试账号.txt +++ b/Doc/数据上报系统测试账号.txt @@ -24,6 +24,8 @@ http://10.10.21.20:9000/QingLong/plogin.html 长春市第二实验小学干事 esyxxgs 123456 长春市第二实验中学干事 esyzxgs 123456 长春希望高中干事 xwgzgs 123456 +长春希望高中学生 stu67 123456 + 长春市朝鲜族中学干事 cxzzxgs 123456 长春市养正高级中学干事 yzgzgs 123456 长春市第一中学校干事 yzgs 123456 @@ -37,6 +39,7 @@ http://10.10.21.20:9000/QingLong/plogin.html ## 县区教育局下属学校校办干事 九台一中校办干事 jtyzxbgs 123456 +九台一中学生账号 stu63 123456 ## 县区教育局下属教辅单位干事 九台市电教站办公室干事 jtdjzgs 123456 diff --git a/WebRoot/Excel/26131f31-95ed-4960-8a8f-4fe42134ec75.xlsx b/WebRoot/Excel/26131f31-95ed-4960-8a8f-4fe42134ec75.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..ab5d4cc68fd2905203eab5655da4ba6ac66c4691 GIT binary patch literal 3792 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 literal 0 HcmV?d00001 diff --git a/WebRoot/Excel/56a0642a-1390-4105-b315-0aa686f31364.xlsx b/WebRoot/Excel/56a0642a-1390-4105-b315-0aa686f31364.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..0517c39a5fbdb38583ba1d14acd0a08c5c1f746c GIT binary patch literal 3791 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单位任务->学校只填写 fill_type_id=1 + (2)县区教育局->人员任务->学校只转不填 fill_type_id=2 (3)单位转给人员时->只填 fill_type_id=1 + + 填报任务类型:1:填报,2:转发,3:填报+转发 */ if (publish_role_id == 268) {//县区教育局办公室干事 if (target_type_id == 1) {//单位 @@ -2042,6 +2044,7 @@ public class CollectModel { fill_type_id = 2; } } else fill_type_id = 1; + if (forPerson) fill_type_id = 1; for (String s : targetSet) { Record record = new Record();