From 70f37a212c6f4dbe7dca127bd8cb5d8cbccd9666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 5 Jan 2024 14:24:01 +0800 Subject: [PATCH] 'commit' --- Doc/数据上报系统测试账号.txt | 2 +- .../23DB0932-1EBB-4696-B1E9-2E93E78BB4F1.docx | Bin 0 -> 14654 bytes .../77EABAA4-4D8B-4CC0-B5C1-33BCF5A484F5.jpg | Bin 0 -> 16542 bytes .../94efaf1d-bb54-4e18-91e7-407add49d93c.pdf | Bin 141571 -> 141571 bytes .../QingLong/Collect/Model/CollectModel.java | 24 ++++++++++-------- src/main/resource/Sql/Collect.sql | 8 +++--- 6 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 WebRoot/Excel/23DB0932-1EBB-4696-B1E9-2E93E78BB4F1.docx create mode 100644 WebRoot/Excel/77EABAA4-4D8B-4CC0-B5C1-33BCF5A484F5.jpg diff --git a/Doc/数据上报系统测试账号.txt b/Doc/数据上报系统测试账号.txt index 7a7a9eaa..49a29afd 100644 --- a/Doc/数据上报系统测试账号.txt +++ b/Doc/数据上报系统测试账号.txt @@ -45,7 +45,7 @@ truncate table t_collect_job restart identity; truncate table t_collect_job_sheet restart identity; truncate table t_collect_job_sheet_col restart identity; truncate table t_collect_mapping restart identity; -truncate table t_collect_job_bureau restart identity; +truncate table t_collect_job_target restart identity; truncate table t_collect_group restart identity; -- 删除所有以ds_job开头的表 diff --git a/WebRoot/Excel/23DB0932-1EBB-4696-B1E9-2E93E78BB4F1.docx b/WebRoot/Excel/23DB0932-1EBB-4696-B1E9-2E93E78BB4F1.docx new file mode 100644 index 0000000000000000000000000000000000000000..584a4ee17e16eb91c8566d7bd820d88d69918aed GIT binary patch literal 14654 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 W3gTTne!GGN2k3d-`@H(14@> literal 0 HcmV?d00001 diff --git a/WebRoot/Excel/77EABAA4-4D8B-4CC0-B5C1-33BCF5A484F5.jpg b/WebRoot/Excel/77EABAA4-4D8B-4CC0-B5C1-33BCF5A484F5.jpg new file mode 100644 index 0000000000000000000000000000000000000000..848105bf3faf01fb6904e2525fd004b5e0794bf3 GIT binary patch literal 16542 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 RPN0A#gvi_2m!0>u{{wP}9X$X5 literal 0 HcmV?d00001 diff --git a/WebRoot/Excel/94efaf1d-bb54-4e18-91e7-407add49d93c.pdf b/WebRoot/Excel/94efaf1d-bb54-4e18-91e7-407add49d93c.pdf index e0aa7d7a4074754316159df4bee4341b8cf321b6..eddd2ecb8bfd63a8c232371e8a77fcfa16f813c9 100644 GIT binary patch delta 157 zcmZp^#L;|-W5eQo>Lvz;2BrpPhUUhGQJM<+zWFIGi6yBD8ZK5w21W?U=2QE&pW4TG zJu}JB#Kg$S&CJZw(7@8n*v!<-+05A-NV_>XnH!jzS=!mS8CaM&IT=|PxLLXwo0+&- zxH?&wTUfXnm{^)yx|*8U#qx65+3|7}mn0UIR1~GA@p2iO7#N!y@N%iDy862T02_`f AIsgCw delta 157 zcmYMpF$%&k6aY}%N+5UWQq;-(pX4VI3A9PGiM!xXv4WFOJGl2KUck+*2k6+v>p1$> zH_X{EXYbdzlz?c3MbL0u=bQcg5}UrwS8 getJobFill(int job_id) { - String sql = "select * from t_collect_job_bureau where job_id=?"; + String sql = "select * from t_collect_job_target where job_id=?"; return Db.find(sql, job_id); } @@ -677,7 +677,7 @@ public class CollectModel { * @param upload_excel_filename_user */ public void writeJobFinish(int job_id, String bureau_id, String upload_excel_filename_user) { - String sql = "update t_collect_job_bureau set fill_time=now(),is_finish=1,upload_excel_filename_user=? where job_id=? and bureau_id=?"; + String sql = "update t_collect_job_target set fill_time=now(),is_finish=1,upload_excel_filename_user=? where job_id=? and bureau_id=?"; Db.update(sql, upload_excel_filename_user, job_id, bureau_id); } @@ -689,7 +689,7 @@ public class CollectModel { * @return */ public Record viewFilledJob(int job_id, String bureau_id) { - String sql = "select * from t_collect_job_bureau where job_id=? and bureau_id=?"; + String sql = "select * from t_collect_job_target where job_id=? and bureau_id=?"; return Db.findFirst(sql, job_id, bureau_id); } @@ -842,7 +842,7 @@ public class CollectModel { 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=?"; + sql = "delete from t_collect_job_target where job_id=?"; Db.update(sql, job_id); //写任务分派表 List list = new ArrayList<>(); @@ -853,7 +853,7 @@ public class CollectModel { record.set("is_finish", 0); list.add(record); } - Db.batchSave("t_collect_job_bureau", list, 100); + Db.batchSave("t_collect_job_target", list, 100); } /** @@ -896,7 +896,7 @@ public class CollectModel { sql = "delete from t_collect_job where job_id=?"; Db.update(sql, job_id); - sql = "delete from t_collect_job_bureau where job_id=?"; + sql = "delete from t_collect_job_target where job_id=?"; Db.update(sql, job_id); sql = "delete from t_collect_job_sheet where job_id=?"; @@ -1174,11 +1174,15 @@ public class CollectModel { record.set(key, v1); break; case 2://数字 - int v2 = Integer.parseInt(entry.getValue().toString()); + int v2; + if (StrKit.isBlank(entry.getValue().toString())) v2 = 0; + else v2 = Integer.parseInt(entry.getValue().toString()); record.set(key, v2); break; case 3://小数 - double v3 = Double.parseDouble(entry.getValue().toString()); + double v3; + if (StrKit.isBlank(entry.getValue().toString())) v3 = 0; + else v3 = Double.parseDouble(entry.getValue().toString()); record.set(key, v3); break; case 4: //日期 @@ -1191,7 +1195,7 @@ public class CollectModel { } Db.save(table_name, "id", record); //保存原始JSON数据 - sql = "update t_collect_job_bureau set form_fill_json=? where job_id=? and bureau_id=?"; + sql = "update t_collect_job_target set form_fill_json=? where job_id=? and bureau_id=?"; Db.update(sql, json, job_id, bureau_id); //保存多选结果 @@ -1224,7 +1228,7 @@ public class CollectModel { * @param bureau_id */ public String getFormFillJob(int job_id, String bureau_id) { - String sql = "select form_fill_json from t_collect_job_bureau where bureau_id=? and job_id=?"; + String sql = "select form_fill_json from t_collect_job_target where bureau_id=? and job_id=?"; return Db.findFirst(sql, bureau_id, job_id).getStr("form_fill_json"); } diff --git a/src/main/resource/Sql/Collect.sql b/src/main/resource/Sql/Collect.sql index f286baa6..c8e62a89 100644 --- a/src/main/resource/Sql/Collect.sql +++ b/src/main/resource/Sql/Collect.sql @@ -2,8 +2,8 @@ -- 获取任务列表 #sql("getJobList") select t1.*, - (select count(1) from t_collect_job_bureau as t2 where t2.job_id=t1.job_id and t2.is_finish=1) as finish_count, - (select count(1) from t_collect_job_bureau as t2 where t2.job_id=t1.job_id ) as total_count, + (select count(1) from t_collect_job_target as t2 where t2.job_id=t1.job_id and t2.is_finish=1) as finish_count, + (select count(1) from t_collect_job_target as t2 where t2.job_id=t1.job_id ) as total_count, (select count(1) from t_collect_job_sheet as t2 where t2.job_id=t1.job_id and t2.is_check=1) as already_check_sheet, (select count(1) from t_collect_job_sheet as t2 where t2.job_id=t1.job_id) as all_sheet from t_collect_job as t1 where publish_role_id = #para(publish_role_id) @@ -36,7 +36,7 @@ #end -- 任务列表 #sql("viewJobList") - select t1.*,t2.is_finish from t_collect_job as t1 inner join t_collect_job_bureau as t2 on t1.job_id=t2.job_id + select t1.*,t2.is_finish from t_collect_job as t1 inner join t_collect_job_target as t2 on t1.job_id=t2.job_id where t2.bureau_id = #para(bureau_id) #if(is_finish) and t2.is_finish= #para(is_finish) @@ -52,7 +52,7 @@ t3.person_name as person_name, t3.telephone as telephone, t3.email as email - from t_collect_job_bureau as t1 + from t_collect_job_target as t1 inner join t_base_organization as t2 on t1.bureau_id=t2.org_id left join v_collect_xbgs as t3 on t1.bureau_id=t3.bureau_id where t1.job_id=#para(job_id)