From 8b5d91f3910a6920e4249d53c0fcbc3a2dc40849 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 6 Aug 2024 17:51:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E6=8A=80=E5=B8=88=E8=81=8C=E7=A7=B0=E5=A4=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../technicalTitleFiling/technicalTitleFilingInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue index a36b7a3279..47d4286c24 100644 --- a/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue +++ b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue @@ -93,7 +93,7 @@ export default { this.formobj = res.data this.formobj.asTechTitleDetailDetailsList.forEach((e) => { if (e.techNames.length > 0) { - e.techNames = e.techNames.split(',') + e.techNames = e.techNames.join(',') } }) if (this.formobj.asTechTitleApplyFileList.length > 0) { From aa1b3a8337ca53b303516a51ffbcfb7570022a8b Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 6 Aug 2024 17:51:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=87=BA=E9=97=A8?= =?UTF-8?q?=E8=AF=81=20=E8=81=8C=E7=A7=B0=E5=A4=87=E6=A1=88=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asbusrepairbill/AsBusrepairBillRest.java | 6 +- .../AsBusrepairBillService.java | 49 + .../AsTechTitleApplyService.java | 2 +- yxt-as/src/main/resources/ftl/cmz.ftl | 1827 +++++++++++++++++ yxt-as/src/main/resources/ftl/出门证.doc | Bin 0 -> 16384 bytes 5 files changed, 1882 insertions(+), 2 deletions(-) create mode 100644 yxt-as/src/main/resources/ftl/cmz.ftl create mode 100644 yxt-as/src/main/resources/ftl/出门证.doc diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java index 87b866a2b5..2f2aef6155 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java @@ -125,7 +125,11 @@ public class AsBusrepairBillRest { return asBusrepairBillService.statConfirmOut(sids); } - + @ApiOperation("生成出门证") + @PostMapping("/createPdf") + public ResultBean createPdf(@RequestParam("sid") String sid){ + return asBusrepairBillService.createPdf(sid); + }; //============================================================================== diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index 34d62ffe3b..3ab32e0b9f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -2202,4 +2202,53 @@ public class AsBusrepairBillService extends MybatisBaseService createPdf(String sid) { + ResultBean rb = ResultBean.fireFail(); + Map map = new HashMap<>(); + AsBusrepairBill asBusrepairBill = fetchBySid(sid); + AsBusrepairBillVech asBusrepairBillVech = asBusrepairBillVechService.fetchByBillSid(sid); + //分公司简称 + map.put("orgName",asBusrepairBill.getCreateOrgName()); + //日期 + map.put("date",DateUtil.formatDate(new Date())); + //科目 + map.put("km",asBusrepairBill.getSubject()); + //维修单号 + map.put("billNo",asBusrepairBill.getBillNo()); + //客户名称 + map.put("custName",asBusrepairBill.getCustomerName()); + //车型 + map.put("modelName",asBusrepairBillVech.getVehModel()); + //车牌号 + map.put("vehMark",asBusrepairBillVech.getVehMark()); + //车架号 + map.put("vinNo",asBusrepairBillVech.getVinNo()); + //出门原因 + map.put("cmyy","维修完毕"); + //业务经办人 + map.put("ywjbr",asBusrepairBill.getWaitorName()); + //财务经办人 + map.put("cwjbr",""); + //提车人 + map.put("tcr",""); + //出门签章 + map.put("cmqz",""); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "cmz" + ".ftl"); + //生成word文件名 + String targetPath = docPdfComponent.getUploadTemplateUrl(); + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + File file = new File(targetPath + "cmz" + seconds + ".ftl"); + File dir = new File(targetPath); + WordConvertUtils.inputStreamToFile(inputStream, file); + WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir); + //新生成的word路径 + String wordPath = targetPath + typeName; + //生成文件名 + String pdfName = "出门证_" + dateStr + seconds + ".pdf"; + WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName); + return rb.success().setData(pdfName); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java index 7cc0b2c82e..4bddaf8c3f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java @@ -301,7 +301,7 @@ public class AsTechTitleApplyService extends MybatisBaseService + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ( + + + + + + + + + + + + ${orgName!} + + + + + + + + + + + + )出 门 证 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 日期： + + + + + + + + + + + + ${date!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 科目： + + + + + + + + + + + + ${km!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 维修单号： + + + + + + + + + + + + ${billNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 客户名称 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${custName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 车型 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车牌号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${vehMark!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 车架号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 出门原因 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${cmyy!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 业务经办人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${ywjbr!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 财务经办人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${cwjbr!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 提车人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${tcr!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 出门签章 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${cmqz!} + + + + + + + + + + + + + + + + + + + + + + + + 1 + 0 + 0 + 0 + 0 + 8 + false + false + 0 + WPS Office_12.1.0.17147_F1E327BC-269C-435d-A152-05C5408002CA + 0 + + + + + + + 2024-08-06T06:24:09Z + God + WPS_1599826008 + 2024-08-06T06:35:11Z + + + + + + + + 2052-12.1.0.17147 + + + 9A3486497ADD4D93A86CBC0A2447FC7D_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt-as/src/main/resources/ftl/出门证.doc b/yxt-as/src/main/resources/ftl/出门证.doc new file mode 100644 index 0000000000000000000000000000000000000000..754ccdaee61fefbce89c9dff26887e283210d570 GIT binary patch literal 16384 zcmeHO3v3kE6}>aFYp?m(hG65^CM;w_OaOOm4Cb5Ig#b3eAIv9w0vNC{#r%vRF{H$b zXnrKcZAlv;L`dXFNQtOZ(ngKahNvhFs1;NyR$8@@BSDGU3b{!Y8U#$wd9$+~+iTbb zY#{MnoqhlJ?!0^7eV=)A>g0fy*WOP3OghkmV#pOMPGVf~8vKN!L=hbxhObzbWk-s@ z+e>#)4_pSX-k=OUaFc`nShzkQ4(J2)1^NN~fp{PRfC|U}U?6Z8FbGHj1_P-;3UD_- z{YZnG4h#YA3C7()-SmxRb*^m0uU7o>uxx-^BXy8Y4?B5IL&;Wrpq8 z|EEU1@S79o{;C-W=23w_UMZ8UvL3&3)ph~6s02qfDyCM}!oR`J8umX!bd7q;Rw<;g znZiV#3K}x6Oh*f=6b}`u2cqL=0@`;gN0_EMMR8mm3%0*dJ?rXDTy!ebMMP?_ecI_r zpPzX%19pXEgMCMtupem)n9lLfaeKA#&vc^W_@@n_4RFRkZ9&KJKNN9(U>GnQxECNx z_W>h-`+*E#B=7(*3K$KH0WyK_049(HWCLS?9AF$U9>@hI026^pz+_+wKz@6vtp~1P z#Pm@bfX;Cd^`hkmuYU1$aaH1*Kk~__`;YvE{e2J#oCBD?2>{hUfj{a_JwUx_0I1_l z0OyWR0L~p}0G4e9IEP#UXa+o}ED>%$xYVUVa5W0Ltn;0CniESvY{s?e$*0?JpR?^p8xseVvYX# z7yka>ao8&5zwk`RZh<8=R^WtO@-P*!+we;!<&CdVgkG;!l1C`H%kk@N~p^JH#DBTs=U!vu|brp!yR0(T+R{(59>axK^kFxR%%i zQ0CMfhdRpI2qtuNS)Sy$Y?y73On`jUG5|iF#2@S31+bo`V3={#soBtqV(3PV(x>w#N<9$x^rBd^o}>Tb4@5~Y;|e>l0@IvGITv1p0yWM}k@u58bTpUz;P{{{&0@+grd@m;dc$r-`yX<$$p4-W7{~lj* zXdS`W6KzRheU=qm^dYq?zf-VLdA0|Kwc|Re;oLXCEq5T166@rO;V@jT3>@Ni=oe1l z2HY!{`e-F0r3&y*t8f`+vkC>@hWiM@{{%nWRo!a(HTZk;CNi-a{j={T*4JBA_w>N? zkb8RfRNY(a4fKGn*2_0gL2uFC9>5+uAUo9FX$|&JwLY?Q#mb-R&Tq5h*P$#+#>#(po-dwXcA?CUU#Zs8)oO=kr^m|c zOLABCpVwL!t6Jyj3s+z6_G6`T&+dhG`g*lCufQ6$eGcY%q~=1IoogF7uaY_7u13}c zIjP+9t2J%uYjM8AeWJs~#nR7TezmM+fy2dmoPE`WQd5gwn|pHSfw}J$+39uixO@*Q z<(goQ;V-pMU)3Q!R!*&|+~bt4#m>Sh$#!?{XxZM@?q=B@YL`3Y9wh9kbsz-@02x3g z@F0)}%mC&BXO17<_w<_LTxTZ8nN~PZiVHO<0ZM^oz{U)%9MR)^GV1|ZKP%3&1=ujl zij*!)rc_99gcf&lM=pmR# zs0UsF_5lZgb0^=~zpJ`5f8;e)Gg=wnb9J3yf82(e7VT5so=+ihla*%G2kQM zZ@{O(8Q>qlxj($$_~PdB0-m=^kPM^(0bm3$ z0hk1w`SbgY&)1a~Wby?b==OMqUVXtta-CLE`cSUZff>M~z*1l(uo|cVYJn#K*#E{C zYZvvv`0v%Ko?9V^*+~vwZK>I zCvR{Eo^=Oyx&vF?f!odx#V!ws5s>77R#3@zM3KbswFn9fcFIgzkRUnDF{0^4we9i2 z<84miOU!V%tC>gr7Ly`%WA_HMr19FIuTaLr=lf-r-OC>0T?f8E5xmrP)rp z?F_LU>ol6xWL&dXG^22sdS1;4XrUeuFJ;X&KiB(Q>vJvmKCs!{RFylh+#TSnun^4& z`EG`%3+d=aKo9XBNgjEr=Ox%Cy%}QcwchG;EGfJMBkd?#(tOcvIY?`67ff#-9MV3h zG{I1spc^TDp%J=ar1ljrWzBUz*Zf@Xb3J$w=vuJT-8}PJMTok37a56^BFQ6%Zlxrb zif6AiC8j0*#k+1ymZAP~d2IRe&09#m^rtmo>=%Kkr?!9PO`Xs14T;}NTkspHh zysic$cPp{&o+LiALy^4wcjtG?UCVX))}3!WZVM365MIEmvCcg|_xs%Ib1&EcL^u!h z&i~PLc-MJv+5AsgJNy22GN0Eqv$rILhUL($w9((l^`AakhBiH&>2LZde^`?*_TGkr z-r;ZqaPMovE$*f=Bc-Xu$S%<(t6_q@hrK1@?`^dEdcc`G9Jl*g>b{yC-jCuU>M5WF zXyv6;EL;)+KVSlRKnbt{*aXxA4M11roO&JCkG$7Y&$qqYVs!m~EM4GoORGqiRqLL` z`5NzWmj}4{%L?#j?6krpyf%lN)YSsKn=aI)9Iw)6&(b^HDp)>CgG4$~K=SjxuwLVR z%8<>9kxvdZ?*8Svsk;^~DJy1)B3YaFrF8_Zx|*&k@yLeC)P}0(rd09!lSvEu+J}7n zW~u$LpT~*e`Je7wXGR^BvM=w5d}JoGq}DTBZfvY)OvYOhO>&rrh>&}w-VP(cJYqN<8H{DTlk@GMG8?iK>NgD6utwt}f=T#%=^=Rxm#YrRyYhSe zxSr%s_TTLv;veB3KU_0)(=feeoY~jxZzh-n%p`NLsad)eYsFdptavNcO0$MqQ>{E} zsr8t(%xd8wQ;$-HEWy>WcO}K2?)RB}%zkFPnP?6&lT9D^n`|wyKC{l=Fjv0VgWh*! zzv%S?d+6ydUFICq1(h&rt9qZSsCV?bTMZ}qE8F|ANwbqS0EkZ?3o4afx1TX8r7JK$?&T-2)(llBuC<+JBaWm?A61Ur(JnFn18@fh