From 14c02ee6b9504ebfa50a7809de78138eae1add62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 29 Jan 2024 08:32:55 +0800 Subject: [PATCH] 'commit' --- .../1b466e25-e30c-447d-b456-c6c265dc1053.xlsx | Bin 0 -> 3711 bytes .../22087e32-6ec7-4468-804a-f8f622986cdf.xlsx | Bin 0 -> 3833 bytes .../46bf63fe-fcec-490f-88ac-35b1492f479b.xlsx | Bin 0 -> 3784 bytes .../82314cc7-f10d-42a6-827d-aa05fad4771a.xlsx | Bin 0 -> 3782 bytes .../aab44196-feee-4412-8c3a-cb0ca47abf68.xlsx | Bin 0 -> 3711 bytes .../d19bf2a7-3ca5-40bc-be27-8f770537f563.xlsx | Bin 0 -> 3712 bytes .../Collect/Controller/CollectController.java | 4 ++-- .../QingLong/Collect/Model/CollectModel.java | 9 +++------ 8 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 WebRoot/Excel/1b466e25-e30c-447d-b456-c6c265dc1053.xlsx create mode 100644 WebRoot/Excel/22087e32-6ec7-4468-804a-f8f622986cdf.xlsx create mode 100644 WebRoot/Excel/46bf63fe-fcec-490f-88ac-35b1492f479b.xlsx create mode 100644 WebRoot/Excel/82314cc7-f10d-42a6-827d-aa05fad4771a.xlsx create mode 100644 WebRoot/Excel/aab44196-feee-4412-8c3a-cb0ca47abf68.xlsx create mode 100644 WebRoot/Excel/d19bf2a7-3ca5-40bc-be27-8f770537f563.xlsx diff --git a/WebRoot/Excel/1b466e25-e30c-447d-b456-c6c265dc1053.xlsx b/WebRoot/Excel/1b466e25-e30c-447d-b456-c6c265dc1053.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..3f104cb8895c9aaf28b27204694e5c8089236808 GIT binary patch literal 3711 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 E0QM)ES^xk5 literal 0 HcmV?d00001 diff --git a/WebRoot/Excel/22087e32-6ec7-4468-804a-f8f622986cdf.xlsx b/WebRoot/Excel/22087e32-6ec7-4468-804a-f8f622986cdf.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..3ee717086cc754ab5490dae9073006cdd28118e2 GIT binary patch literal 3833 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 Z5dWtix(MnYbB&gQmO^p!1Q-S&?|(XYwZ8xW literal 0 HcmV?d00001 diff --git a/WebRoot/Excel/aab44196-feee-4412-8c3a-cb0ca47abf68.xlsx b/WebRoot/Excel/aab44196-feee-4412-8c3a-cb0ca47abf68.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..1e89f77daae875390120f05aebcd46d02aec2ad9 GIT binary patch literal 3711 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 Bn_>U} literal 0 HcmV?d00001 diff --git a/WebRoot/Excel/d19bf2a7-3ca5-40bc-be27-8f770537f563.xlsx b/WebRoot/Excel/d19bf2a7-3ca5-40bc-be27-8f770537f563.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..cba89236244a6ca4e6d6b924bd5b0b1b4bf32b4d GIT binary patch literal 3712 zcmai12{e>#8z#$)eaIFGg{)Z`Ymt4Mh>)d_Wh@ypwnUa`jMP{njPjAm7Ac{`Xa6*^ z?>iw&k)^Cz5`J$;pa1K0&pGp)Gv~dZdGG7F?(4oD0~i^(7zud$b1)8X|8Q9ih4g|W zy{wIW-Qb>TF*s<{8(Mr=c$HSEr^qRH@&lDc(aWNn z1A}anA$9E8hEhhNdCT9l^M_~_$i0WJqK*$iFeWXW7yDkT2}-$#5Z!I$jRraC1dh;c zg|hZ{3%06cAH}-~W^s6N9cDC=$!(E;AXK5N6%2%W96nnv6{+{OyIQCX zrCKyynhq*JVNyixtAe(`MnemUzjg>d|8>+f9LX9k>i8|8 z{i{|RhMbE!&`>;hsgJui;1GZkQVIa#&x5D!%0O~`#{I#19^zg7nDWH;qsdfJyJClX?ACLS4|H!l39Q7Q>%%fy!y z-#=6r($@A0AGw~cP_K`Yy{64;YkS8$7WDB_bK^XD)aUS_55&pg<5+neXO1#cw%z5q$|T?| z*&g%qepq{Xi47~1$xZpTf=_KbZD8*${WUab+@6=A+&a_!XotJBr+X@G(kzmD{9}yO z1@r^$XQOH3?aAQYD8b-5Wef(brxmkpgJ`v%;GK+HI!1-SziqGH;{lgAn(0vhjf18+my+BON^f zKo!GP0IHD82BE=zg}7ttY0eBm;;o=yFV{m&0uHjHi%oT762$ODS=T8n-cEp~rt+5R zf-f%L!bj=L9h%0DKv}7$mFWqi8P5=3I%1xp%$m zig595vXnGELb&|&hvS%}K%fMtoWgs)yF>{6BO&N^OYrhVz<<1Zwn+oBQ-XQ$#5_aX z3iNb5sfkH6b!d=Tp*BJhx2?yFeM!QT);vm}d0E6N&5O^a7R=Y3N^m(BzR0hv_UlJC z=(~BrUfbwC@$oCDyj!n|Ki@61=@C;QU-O`E+7y?kn9)O*&PuBG7qe`40h^(HXb81! zvoVan^l2<>)f?lU`_9t*>F#`$sXniK*{I&|H8c4#7v)m2ObNP%%F5M8>((9V8zHgB z6{!^lW2GnP+Ns~-HP6T8r@}*9xCC&Id8b3&yjvTm87qCbhkHqfCZkS1H15Y3W-=wc zY9dxWTL@F&mz5=nnTCmyyN2lwP8j;Waq2bIztudmE-cOEVAJAhoM!n z0Wc#`e40x2gkrQM)5hl*fsIMp90v2RcAp_w|S+wA#5OzORbl{ODknFy7b_h ziXU%@U$p2{mJT|i>``9{zu&o6jLw&bDkh%C1u4jGdV`j*CkL6_FHfH+0SURmH&j{ts9y-I!kj^q)fthTYyBB! zCtYyjUH%N1awrIci`TkF!19?;pXiwE30N7lZcK6|7BHvG>#NEz{!=TI6LA^lW7aH= zym~2#z;cFLMr2m@`Iu#_K}P3zqLxX_Te*3$BBasURmtm;&wUYO$@ioUU(yk%-J8TX zKw4_YHpk{n;LL-*U+wGCQ~3@oDyQUGU&__U-+CKL;e+X1XjUtT#1rQ&jg!tHFa9eaX5F&=O)G5pvn;l z*^!5LZOSZ=&dNg8y(>5q8*-UpjrN3YgknUk$$94bClS8tLM;Q6!OM5KCN(T8KKVD? zk~eZq#FV*!V%gOHDa@8Q$Qj%R3oFgVPtn|!(wZ$V%8Gx?EywAU%&uLKpnn|5>^mR<@OV1G z;a;BGqPx9F0tCAq-K0Mt0jZhQF2#O4Gi_-=qpAZTTw~DA%wL+(6ToTMYAquQQ3h0b z8wOojcaD8>7UywS7csDQATCR?gL+vFhh?_%&|?*j0%pF}tTS9@8R7K48C~PFUI?c2 zS5XzdWzvOJrYU{#k5Mz_4WvDE$9Tw?8lL|LTeprNUK67tL7D9RI@pj|syY=QT@jtxdpR6cd zz-y>^8Y3Ox@YE!6v{&mHS99V8iL7L=WavyvI!br}W4JMYBS0?e9D@L{Lz!o7$(K>9 zXQ}`2((t=g+c}=HO*uuSGwcNJ2(8p_4Usoj@%7&`s;kGO1qk{AsUui=8N$-mM9;{_ z6@~}rB4^u!ICR9A(SDr9Qdn2#)9GB(9BFN>`Ip05tWY z>=3rlF1l%1yW+Ao7N99|s-Nek>^8&v&+{fdBu2vg^RlpKWdR!tTo(Qv|8aFNfc<-e zJ(mYKJizJhNAUJv|KfWOChoZ?z(E1#Z$GlOw>oGA4`%PV2EZ`@4r@QKWWQwZ`K^QL zdlMU&)_|qhkG5?f{>xw-++k0o0f7c4`hLVx?CkJ!z8_586DvTd0QKIFG0>0HUnS{a z@?H}I4Giemey~#gNdAqg9o%P+8~`zZR^N{^)IVS1{~F%_M)6}HQISxQoZHS6p#}2( E2UC5W@&Et; literal 0 HcmV?d00001 diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java index 1e7219a4..50db9f37 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -1650,10 +1650,10 @@ public class CollectController extends Controller { int job_type = jobRecord.getInt("job_type");//任务类型:1:表单,2:EXCEL模板 switch (job_type) { case 1: - cm.getSummaryExcelForFormFill(job_id,publish_role_id, excelPath); //测试用例 job_id=8 + cm.getSummaryExcelForFormFill(job_id,bureau_id,publish_role_id, excelPath); //测试用例 job_id=8 break; case 2: - cm.getSummaryExcelForImportExcel(job_id,publish_role_id, excelPath);//测试用例 job_id=47 + cm.getSummaryExcelForImportExcel(job_id,bureau_id,publish_role_id, excelPath);//测试用例 job_id=47 break; } //提供下载 diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index d561665a..e2262f9d 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -2124,9 +2124,7 @@ public class CollectModel { * @param filePath * @throws IOException */ - public void getSummaryExcelForImportExcel(int job_id, int publish_role_id, String filePath) throws IOException { //给定任务编号,获取它有哪些表 - Record jobRecord = getJob(job_id); - String bureau_id = jobRecord.getStr("bureau_id"); + public void getSummaryExcelForImportExcel(int job_id, String bureau_id, int publish_role_id, String filePath) throws IOException { //给定任务编号,获取它有哪些表 //下辖单位有哪些 String controlBureauIds = getControlBureauIds(publish_role_id, bureau_id); // 创建工作簿和工作表 @@ -2283,7 +2281,7 @@ public class CollectModel { //拼接出单位ids String bureauIds = ""; for (String s : idList) { - bureauIds += "'"+s + "',"; + bureauIds += "'" + s + "',"; } if (bureauIds.length() > 0) bureauIds = bureauIds.substring(0, bureauIds.length() - 1); return bureauIds; @@ -2296,9 +2294,8 @@ public class CollectModel { * @param filePath * @throws IOException */ - public void getSummaryExcelForFormFill(int job_id, int publish_role_id, String filePath) throws IOException { + public void getSummaryExcelForFormFill(int job_id, String bureau_id, int publish_role_id, String filePath) throws IOException { Record jobRecord = getJob(job_id); - String bureau_id = jobRecord.getStr("bureau_id"); //下辖单位有哪些 String controlBureauIds = getControlBureauIds(publish_role_id, bureau_id); String table_name = jobRecord.getStr("form_table_name");//表格名称