From 297fb1d0eaba1fa1b13dff6dec6040746d87ec6d Mon Sep 17 00:00:00 2001 From: zhaol <15900249928@163.com> Date: Wed, 4 Jun 2025 16:10:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=9B=BE=E9=80=82=E7=94=A8?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=8D=A2=E8=A1=8C=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...om.awspaas.user.apps.coe.pal.output.bd.jar | Bin 40435 -> 41171 bytes .../pal/output/bd/util/PrReportComment.java | 9 +++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar b/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar index d7f8577378cb20c51b0f470d86ce03b3613d4a0c..29edad55aea4d30062541a4659c5dce24df93da8 100644 GIT binary patch delta 5275 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 delta 4554 zcmYkAWmFVQ8-`a(SV<{?r37iDWoZdnNvWlmhNY#YS1E}lWF?j^fu#firC(`Lx*O@1 zh6RaFUw*vb%$ajvGtd3ZIWs@+kyf0eMjTQtHC#L(06+);ct_hBy(4{y_pgd_+^QMx zt;P!6>Q|9lJ(K)bQDS#w@WlQ!R{Pxfd`Uc^Nnw1h4XGhz7 zT`Xr|ClHQgZ39@DJ!KI{Bqy|A?(5YM78F>YCsJ}LU&5^|k14m+*8dXS75zJ>K_$Uu zVh-v!=ksa~GV#mj)r|2Zw9$3Ow%nNcs=ryp@7?R&7h-3D>rxBn{Sr5O?kyrMheJmT zI9l@NS_q2HN+bn7r{{sRCO6g-e?hP6-h$3zn|ZPC9R%j*N2<%(5L)Uc_T`%Bm&>-) zBKwSVAGxp$)Zy5QkUb367)MKD{4(}9Fcx#k;4NJ75 z6g~i9t#9*$(aAkE8Cs)eV-1*!=F+N)AWu&h0}~BTHOAJFO32>C6@|?B_RH$TMZ-Pg zkn!PZQ{9R2@v(8U359P)v~l6(PJ{>@6^Fa5r5sGcgy$rSsYCCheHeOtnx(7=VFx)( zn}aCJp%)_6Wi6E|h9l%i$km0cNbYu_`3rV+grF;y(!YcGg;CV|)jiU4U48J9NviV zg3ewNLy(1awL)3Z;ajJ7W5WPpMShS+Tj||Lo{iok#bw1zmBg|rr&kEEQ2Js1W^H)& z3Mc1utkxMOHG3km^NdKX`Yb({sZAXokX*HJcrQb|3#ARSNa_l1QbSJxb8ZY`VXa)SWgf7st(31{B=2)`q+@xbWVolXrL74OvR)v) z>nn~*ADM)6UM%TnBp~23sul}*_voH=WNh50(NHdvq7chWoz0?IVqB{=@^=#mb?p}C z^hJM{fcC6>q3i>qD^|idmJ`%@B_QtpOV7sf**2;2K2I^Nlo?8MkN?20p?Ad#rLIdo zA9iS;H?P*%i{wDe%)eJQ(8kZl+|L=}DH+{xG)D9>jN6mo`&zTI<#Lu6 zXTm(@!TX~OZ?mmT{b-3~x-8Q@*ZSf8vvO@lzb^4uMvP;}hy3Ry59r|We$P$7X^{`C zgWI-=_vL;tFr>UyPzc0jn|A6zvd4H46{K8T>JZy1MC7Qm##XD51>`C>j~2PNP3I4p z8TSEdZT1&ySa-#+f)rK*MIQYRS9w#r3BOZ~aVdjX)aWV?k7b~bSsv3SB#GFp5*ySn zd#}#1wk=KX?qkyy>XZ_E&{H!+qYugUb5yxUOX#1R4Owl430e=3XUaELe3Qo z^?BVhm!Q=Uqz_6?6TJY<@r4orNNk?-VSz7>`f{cCjN zaYK4_g7V#P$SfODb}!^hyz*J}sIF)y{tDi-eKP-pZLg_`jL7=mAT~G_?eq~T@FvGH zZ8dOq^1CfM>m6a-u*^Gbiv=@7%zn;(z0cfiBXZ{2ZLrcIZumV@RZjthXxo*tF*}V1 zBGN)Qqtf}4l&y!QU0OLNlC49`s32N?kIV#DOkE^|zrW!J=!fm+*78>6m8o3h({F?k zyQ3j^U~t7XV@w^9vRBEy{%c)WfvJHhHgVT{J=!2@L!PFXpHAGY-N#kLRh_O1kyGU(dHo(3(~Fm`7*E)9TEHX{pcDtw@o3q3 zKl11ax#bDf5(z3+M84Ht3@l52SN+FNFc)!QqRNxXIv_*)j!EH_>SPavsrgH z?p#8~!Bar<-lQwrrNvg?dX)IrIvl4>Jq&x+&dJ>qi|j>O1+kE&rBHYwe?zb;qPTEm z#W!N`JqEuB=9S1r8{Aa9AxWC&@sUlpUP!u@va&3;XeTAnnRcd62B&8FfCY@x)FS0v zxMycVLK`tvR-d((Co%g(J&;6CDwt2%bF%z6Qlf{RPIvFVcTmYp&B0HcF9j{Zs+6YS z0I8R8fi3Rp`E#?WNC=~5&+#t_#5u(W(g*&+C<5Ul4xmPT6)5hdW?0y2HWyVFlWo0r zu;!_)zSrC1H^k+J2cJcmth3fZ_I5p@Gucu@jwsr67y5C-IE?q>AEcItNnzhHd52be zA{3B+G)k&npp@dnJa`zB|p(kZ^uWPGhMpWnq*2qqm-cc1R85rn)aDcF zuzlm@zreFH^#FsXCiS|PDHP+q!2&Co*~`HG#}v->rmjZ*U^`ba>=TsXY5{w2E~shq zOXXRZnv2Qz=cN0r^t=9Yh|Pjx|Hg4jgVFJ$cNZ{d5u!@vw{B3)gr9?^vai*}H$x-R zbnl@sF~PpRDmC`%t4pp$o3*tZ;tvSYZ#>-8a)f-TKCzC!yK#l2Xlf8G-?^t?E(1L@ zcn}@Sp0I3=osC0afAIP>?MaUPcDkQLm8j*|K-^Sw5n`9zG4(Bo%#+JMJ(os^N>Uy29nlAbP|_nM;uf?dz+V|I8WIbZ=KFgvDjcm4 zEm7Hd#jzkB;A<3VAtpBui1WD;pljTxw*1T?29cF{=&+ZH2P?!1p8jP53A;a-TFXZE zCwEm$6YWy`0$ZHn@22=%i+sP4otz+NQmnIFB03(NorE1RRED-vjbFow27j+9RNpQkE}3F`Y-c&w~N zj_CR7M`a3LeBk5gzah~}j{WJlUdLw0nD9ZhvlP3+TIPq$4*8TqO@QN?JyY#NxQ&-u z0+%_fSY*OQc;G2+hIfrWFC|+MuA|3Ial)P8o+dHsuH=zvP2sf_inH3Dh=#37;;=Tl z6NJ&YkRJ_XYbVk1|H!DG?gBRp2t8o}WIyp)k>^VbPOOXx=w<|x1Ru8&I!f1ONp7+~ zvCB<_@&8ad$`aH?<%6dlpp=sQ&R*VlX;vDc)&pX zq60DWR&pOuE5*<+kUTtRpUTJk0{FH{Dj@(k@rNSZuLxx+_p#E78zp@A`$&>H=O4aw zUqMj3_m2T?Lb?S}|0Jb-Nlll1sa+ualH9;Q1`m>;=KIwf`N447yDT2A@2DP`J1c~- zg2(=nFD9ktIeO6I_4UlRmf~2_D_dMZBm1>lgNY>P6|lix!WvJ4)xB#G?kx^ad6XJ{ zpHGSV#v}sB*G|9(!ToOORuXN6@7k(58-*y{XVG^zHCPfdja@eEBW;O5DFZ%Q@td_v zHpQKQ-#SHBzBzQ`r_N8a%Z;GPNv6qBMEce@!)TBoiH}t+xkjU5jqGv%boEC&6siyuKVAyoIu1( zF8k93z!nrcPJ)zRa>}zO9QP|;S*qfx4G#+VRlP8dOfS%x|<^wz(BSuGV z(xp@bk!3F!>w3EmIA(hdy0_~R-`()(bx9%z7WKa&vEEo|b8et@{X7%&!JP7JmxxW* zc4=KE#FMV}uG?$w*n>cZSCuET$gLM{v`2dWX*RR5p;}laSl!*Tw)XYuD8%nngN~w^ z2mwK8Z$N(+?ZG2o-|mox>{Zvrs)cq|s%R;$AUUF~J7%HITR*VC1$*jYsT~3F>LQnf z`K2I6Wg6nmN0+jDEDVqW#T^y*mBE~C08?9g0!(0#3Dn8_)V=w+jBglZt|A4)5Fag5 zo!P%g);Tq4{Lj}3Uj+Tk4#MTMGxVGFkLIXuKQDrry|>^lJz0~zN78RNwO`B6FBzF0 zvikJ+s&-9?|M0!QHMK&J9Zj4#)gU5IgyTlK1M8&e2EJk0=ny-R)nQi)?w{&4*BvZQ z1B!jg?#)9^A^WKIOe4KxA;_~;jD;|5f2y8Z15Nrv&Q z$0-APn@x0Nz;8VQnQs3k5~%!4+glHDmJaFPK;pm0pq#T{w-@zg(c{2vQLJzkJ}tF7 zI8=cDUYK-EW0!;r02JN@03d+>AC~ri8Wd1D*_14QzXC68jZ%&W0C;BqXZ^nq;N<+r dC=YsU?QH4ksilTb@V83&XMX)dj46M2{{!O_mOKCe diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java index 9a968b69..2705d96c 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java @@ -28,6 +28,10 @@ public class PrReportComment { public static String TARGET_METHOD_SCOPE = "process.bpmn2,process.epc,process.flowchart"; public static String PROCESS_STEP = "userTask,serviceTask,manualTask,receiveTask,sendTask,scriptTask,businessRuleTask,callActivityCallingProcess,method,process,predefinedProcess,decision"; + //word换行符 + private final String WRAPSTRING = ""; + + /** * 获取报告公共数据 * com.alibaba.fastjson @@ -94,9 +98,10 @@ public class PrReportComment { } } dataMap.put("pl_" + propertyObj.getString("key"), "V"+plver); - }else { + }else if("form_Scope_application".equals(propertyObj.getString("key"))){ + dataMap.put("pl_" + propertyObj.getString("key"), value.replace("\n", WRAPSTRING)); + }else{ dataMap.put("pl_" + propertyObj.getString("key"), value); - } //dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value"))); }