From 215dfa906a17cfd76be03a6cfa09962ae9dc0ffe Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Sun, 29 May 2022 11:12:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=AF=BC?= =?UTF-8?q?=E5=87=BAword=E6=8A=A5=E5=91=8A=E5=AE=8C=E5=96=84=E3=80=82=20?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E5=8F=91=E8=B5=B7=E4=BA=BA=20=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=BA=BA=20=20=E8=AE=BE=E7=BD=AE=E7=A9=BA=E5=80=BC?= =?UTF-8?q?=E3=80=82=20=E8=AE=BE=E8=AE=A1=E3=80=81=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E3=80=81prehomo=20=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E5=B7=A5=E7=A8=8B=E4=BA=A4=E4=BB=98=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../5.模板/ComplianceReportTemplate.docx | Bin 82149 -> 82305 bytes .../entity/ProjectLawsInventoryEO.java | 6 ++ .../ProjectLawsInventoryEOServiceImpl.java | 69 +++++++++++------- ...ectTaskInventoryFeedbackEOServiceImpl.java | 28 +++++++ .../src/main/resources/application-test.yml | 6 +- 5 files changed, 82 insertions(+), 27 deletions(-) diff --git a/SynologyDrive/5.模板/ComplianceReportTemplate.docx b/SynologyDrive/5.模板/ComplianceReportTemplate.docx index bb2ddeb81771d273f4a0afd134cc2dc075b28286..fdd8cfc19c195af0784cbd2346013b7c8098a5ad 100644 GIT binary patch delta 7767 zcmZ8m1yCGKw`CR&QNeK3n z?|ZNQS8t}OyUw|%d#2B=ny%@)6$B0n0VncfENRw{djd#E$w}fAupx&9Zv1a#{SxR+ z3hy@&gcTHD<^9>!kl(JGK~-&I(4`5Ph`M1$>>k9I^9!Tc9^5y9HwlK!$GhJkJ~^bq zN<`l~Yt`~*_S9=eK0;1|4$?S^oO5y~KK%N*jrKG9%Wm+iyjNIVGEsWhUxV}f{ ztOupkaR=U!<2jMSw6NlKG{$A0??EXkTo?f;-=EcI(BMqPY%KZyHkz7=q|bvnj0&Jy zjvG6Y;Pul+2(ddV?FPkielKaz&zqYOis@xXIg{>)&l|4+^%n<*I9FO}f;ZJ(E;;u} zM=F?;81#%fVz(8?k0?ArFk}h`xGZ{T^%1-@18K$mOqxiyLxFuJ(>I~{U?N-Phkd1l zee~&mKw#S>{qW<1g7PGd`R-L(40&nhNQp2Drd@@m+6g{gFpbB}=Ge}JVKhU+N)lPm zJ8{??X`AKNzEw`@(87zXF;e?_Hc|^2vP)BC4*4M;Wb=KL(|uoJN9FKy?p5O6k@yBH z7@(?vj6#frgoK5T6rsEh9jy(iw}r0&bTEZ3ZsM>N@PpKVZ`S*ob@|zj6ft4^3f9)1 zO$RIio7dIucfU#u^jI*(mls{ze3g^!ywxn6P|Pff$s%P?!1>H&kjtX zri*_g&kjxK=_Vu@ey4rnSj7~(1CA1T zqQvDA7x?YmWRL9I}ERxAZnvXFW zWT|%5?rBydHZsqKa&X^WnEG&U`Kda;F)y2_TNbG7*LQ5t`52z}rt=o=>ifECN~&P6 zM8w%r16N?Tdf7@->>bB_rGS&O1bgE{2GK8R@got!11k|U&xCn9TITyG?@FkJ8|>pg zC85S;564S>)*F=dZs;%un{IdWwPzg1>8t8m80DPS~%*G4ybp%ne6_6zFz0M^9YY} zSg6Sf;%Dhj>0sGaHw|vFCGRbb!gi$^bq+0xjSpH-66D%!aFnH9JNXx7O?SB67_wp5 zZuGvSs^^(#x;ELce6lQpY&@Tg3n?RHXViQ~Pc}6nUY8p2tuggLv#9)3=vd_3$ObO9 zTb(2VS7FB@9Az{xmcz+#RWwj1-hducWfQJom($g0(<+!Dw2k zia>k^X3@FxYzdAIc8`6auRr&V+Og?M@VYH{$-Hi?egthATK3Dvra(pJZNt9pIh*ZO z4!zZGf-Z)Rph?aEFR%QvztHB#qZ6r0!c&>ti-K#*2lvLH_VCM*0&NcD5?r1`flHan zKe(v9h-##(i*hL~-Tk;s7|4x#j*-8w_sXuU79?KZ5Dc5uz)C4)} zTi~&C3VteJ;@x#MAiWO(OYlKc4+k6zBvx|SQ&}-G0!QzUm+t0FXxNfP%hM>nC+`uR zx6!28Hw;3z`Q}QQQ`9UkzQnj1bv#@y&N<(wOzg?p?B^~XZm6@vNGR|5sjlTP+__ zW;k&U4SN&IFs4TX)2WKFjS(~1c$NCkUNkAZDY&TOUXa2CVel!EmsXYWM#Wx9RrUd53y8K>GzD4g5 zPczRYTQ?U>ux7#=tF0Vt8Pu4f_Z8cU_K1y$wC+uBbG9x4Y!DynM;900$C;JSOIuVG z@-}K`+=~1dAkNSA5s%Y{6dLZL(ht5$5aE&4*}_m*{pL`P)|%eb*6oad9y9>7GuD;#7iOKjn|Iww9l@uY+};pG$RA=z@KT5Tp(EXjQx>Pr?k znzce5bmaXtSS+5@0;6@kl(K%1C4Ds;&YJ~>EDTb!j2LP{uddn62H`kAyjZ9OsISx4 zwA)urTxc(TI9wc#i;$jl;r zRg7-C)Ivkuz=7LKP-zvInK4B7D0N|QtJAN62a`cf3(~B^Myq8MR}EU4Wq^ z7kE120rpdWC6~%wO28`9{f^XmHvY?V;-}U>uW{EC7}o=xslLoJcb~G(tjv$%@ke}~ zjRPrT=)(#x@}lhLx*AM)9FLinGfvBLc%Dj2jKb=R!KXn+W zv?a*q%w{`}2!Cqapj_;w+3`)sR?1EF1$re|41e-2yK*&zlE;o>zGlX#S+3OB5=VGP=x^hk@s@3hO^Qi? z076N0z5W(5OM*%3k`J)9y}j$b9Y?8}i(&n-&y_NbO?qsI^x_4vE}wTP5)y_-)Ch&# zPdZ{Fwa;c)+qgg7p6|iv9!{pdF4tU6B~!2@W?oi!Tg)vwwel~RkbWz7Y?d1N z2&1Zkq95|2rG{>VSkD< z%HI%3E_OOTPVClxoin^|7xS7DyCHv`=3O|68|M=AgPdk%H-V-Ls)za6U{Pah-=s(0 z`LFLBH27uiD4T&0r}x+Fbt6M>OA)sm%fxo6=dwT+W5*rl+y?`eK}M<+9AgiDzuP zRaHyA9V!tIjh?4nt`HipHb_+#DxvuUqcy?lmPu%(HRB4`F>I}}?ck)V#!_JL1uJwr zy1dG|uch|cN(dE1MbJ2TbcBGzy|p#vg?>U)%OtWdWkzO9CEh5fJ`W^Zs`eX#*Qm2`|~6x)$f0UxeZ`b9&Tcq?dmBzf`jFkCdcp+)&@U+08yb zOrfRFpYppR!iJ4V^t5r82`P$q-6l{wP3jQ7kIO1rjo;!!8QFcpXjN5^Vd~P94Sx!+ zZe+(6(}~Y{>Wx=Ob{&>%}};mN(i;e5oy|o;qdT8l1oN{UR$w z$&(~^(Mk`y6kc33FS&lbF*C5^3RcIXZE6xr_Y|f&v8@B)-YgyiJ&d_pkT`4Th3IbV zZ_3a6skRr1S-Gn}A^`IFG5`Cjb2 zFpv-Aaz6`j&l8E|dof3qFG)IDI1oB3SY&n+j#2gA<@u>n^`Xr#$d`orVCL+vOyklP zdvx?3Xwnjpc7KQ0v+C$p4SUQUy6w(0U->FC?Ni$DJTmQH4>92?ksb|ECE%Bw)n2Q< zTWH3DVN2v$cgVlNu4{v4kR=vikG}0asGhaF-Aci3pul``ub^hUK}6F}$nT*YR-{_^tORq?sk)$c~4N%3e^aPb=-39x&4dk;Dd z7UQ&ch+hK*jYz5AFfq+go9yT0=oo?(d)`Z(IEuTi2&Vn!Cr~=0=|1fI@pR{HEGp$H z*cu-3D{TQOfSBei=A~QoFcWiP%XC3m2W@dQSy{+%w^bpT`n0zPR`$I30R8o(08%#J~ z%?-w*uw>6s@xwWr)i9h;XNE+aO2G{G=D49KLogrz4*H+2bBsFucm78^OHN6A#9$F~3e)AR(ff+)5 z#b#z@N)l|-9EAW|?W6A3L<>xQpI+h-593LQ=ZM`FO9zQMXc)SO(1Fj0`$OjaHlU7K z-*wZ(rEh4ii4zLGtj9VE7zFDh#~KE+lQin0_>0Zv)9jF{M)nQGRWzCKX;r-1*Opcp zaCW`O>>_tDbh3&W?N|M78d ze{rQwL~y5}@;O4Vasey4-)0HI%F~oVSV)}I_S&MS6LfiO(|ny*TX4Q(TRH*Rr|>AV z5PLc8vt4qI&PGouh7`(}hCoTr9iW0jb|`5z|g%rDXK;JnSpN#U5`>sE{R~ ziXrSPoFYM#BX$s%r2xsBZL|0UJ7?;kS;e!#Q_E4u*xnSUeo%B16C;Z^+_p?c1N#_5 z3Rga@%0?dpqzar6eqh&9s}bHzA@@PB{|BkJt}MMicZ( z4p634@VNKCpb44d07KF%xPma$GB+=A|GWabcZe?WXQy1A+M@9XTyzhwee{ZU>YLyM zhtcHIgQuD`>lP(h=eM>lbn_??^PLpBckm?TGu|J&S%oSLuzNWPv)-kCrRe8xq?rUm zbKD9C89thm+?TH^p<~W6O6CMwMXfYh()L8$v}VzFY`cf?%EX;D3Y!*>&PqS^Gj08? z-5e#04Nqe#=fEod^#U1q%IQy)>F(W|y1|>!I9A~|=*dEvSzI%jacuj?xSw-{BTSN| zV+No@78$C|fmO|&8X2oZi5eI9Fs#4%`ZCu(z|V^}Z>)=|Y3=2YuWy!xJ0WQlH`vdz z7aS5A3k#_vaB|Ut%hQT@b?AzAG{#WNhRSl^>cy#xWjCGpbUhRv&(_*^-P1qEAa~Ybb%b5M9~OdMAux8kOJouZK9F#C zY(4Ik`idj9Y3b}KxcUR`sKZVcK|V>kKtSc&c(Pksxq$9-`Fci5d;_ddNk1H~r-kos z?&*&QR!z)7tsfruF>(#IO1C`A`=s3pH;`r_13 zVp2T0Ka7-XusaU)RQ-PNpb!bwi^3k-DkX(Vs-k*suTacL-Dc4vD96i2XN^^Ch!Ne? zLf>F#`HhvOY1=jt8xn0otC8kM5~%nMlfXRQYgu%n{bOfrQk07MdKfS)t8|chL5`P` zUU%LYBA&@B8h5rRIYU@k-$DyD#mvvWIq5o?gE=+e)e|aN3=h&S8nCLk@YRQWeHUJS z#1F&o(wvN3?>j)sC5lU=Mpi5gG)AGnz@u2>M_Pnzc(0^yL;NtL9ae|K!GL6Y0*ZcS zJ=PCUzNfWn%Q2Q`aZuprk zPCa^1fgmFGRxZ8I;fu6xV>TVSC1fO1namwS$qqRV+lv7f!fzKQN0QK_AEeAkvvlFq3{&mBp5m4)&1H@m0trW=@WjB)I7ePD+Z$R7{>PtoF*H|G6%h z%XxuHqyAIC4mbV2&TU($3Ww*FhX`)M$J&k0NX$x>9@JNHjuk9{*yG-S8V)5l?DeX% zjmWfaF?%?{eE3%*VeML+FS;TyAwwt6%iZ4_g+q0W@t5e$&@58MvjtXAzcflaGl2Ad zeALl=$qN#Z8knFij4ZnI|+gHs>axn)H)^Sud#PK8Y>CYG5>gy z6u-jRPOHX4RV7NsZp>i0AXGEQ3svcH3X2(!S`!#`5{opYqlZPunFvwzuJ@f0%Ww6) zDzZ-+^*N*A*(ET+=eqx<8?ezSDlzDQO<|l)nY!flryTW~Y+ZkE*Sr_3GX@k@s)hdC zHC~=S3*Ws6{fcSnJ#v6XVS8c3szXq}#KAz+%qDO5`1`Dr^t-a^t$;uVHOI8xzIjh) z0oMCP! ziffYf1byOQ)xJ|%@)`$JRXZ`+xxkbUmZL;^GSSSe@uxViC)IaFk!TDn?Fy?{ug%AX zbtgqX?TGs}oPWQ@Jx>@=m?jF+z~fHZ`>k5SDXfwQxezTtr^&X|T-vETX{U0yK~G&? zZKyiDxpF$ANl4E2BU*Ayv1QSBja=&*nsc*&k>GM1TNioq5dj7NCTfc6VmFpcZO?i2F<@ZW8|cW7%P7G|A8e^ z))>EG10k@40etwX1unn~KeiZqY}+iS;K%y30ACHR!3i3`2Y)c1Ktu^Ws!B9*0SMe! zuN9&40szAq^@rg$I<#;jJup00XBAGXj|O+u9Yvu1uU4R@PIDCmzc)vPXK9bZqts~u z!J1NaN&wz!i31v7FhV#90AvUefyaP0$KQZF z=ndz;f~mix{Ih?-Dkp%6pcDh}5yFCxGfHv&OWO)QYB1Fh1%d$cUxO$?WEzO|zhF=Z zpakX+3_`%uzn)NnnhX)B(bjZ46h@BSADhI`P*IN)Xf(vHe#T zrT%|qM3x8^VL$?Os|F9$CPDZM10;x(7mxCFjem%)M*_ZJj*n=10bqi93?4~J1n!H+ zRNUzO59wy~kMc1gBnaBSL*+~mfiD1d#E-wPO>OZ{bm4C_`7gm{^$$TW0x15sj*9RQ z0r5e0ZbqR$aNqJSXC;yI#56p%wk;sFpr+yM1oA~^IO2d9kdILK z+nFGu9y<^n4WeHh5Cv`#V2MYz10f{=2m$*DKM6n**hRES0IbyiEqEdQzehnx;crNZ p5TsCm9k@rlgaV=t^IlI{>`=@J-X=umouK}tdzX(We~?v(D7mJZ>E&$Hh3 zeAoNWIctB`b?+0``Qu)DhlHVQhoB@1VjKkMQThN75THqta}!3B$L0z{GNY+&#wzPh!Z7AIMoqJYHJ=N5`W(!QvMoAyF@icZ^UEeM1;oZCI& zfS&~Uva#3N;Ew#>CbvGHaA&w-7F4IfP}NR!_yYrpJH!lA#Bi0+e6|C~R2OzCtFSdcqv5 zsC_-jpt&O`4W!~qJ5@9=p_TLG;LgS* z2wryFUT0KqSZ@^g^J2cxskGdFp%9oVuT@X^#*-zd_C%`E zOoV`dfQ60_rLiH+aF6QX1YHHtKwfv#5=E@4Kj7k=aE-f6B~>uLyZSmn;3&{WXUbAN zj+$oj1g~>Eh-H>EKWk`EEI9OREFaa)Y%zX}9-ra+? zil~8M^adwe^;q;c*qtALBKXr=Ss{?gB?23dZce9fl!NS9!)(~h@mNTkXWsN+gL=Qf zoP>?4yOYMRFde8{`zp(Qc?14~&O-p?dR#FsW&cFFPSNDy0`S)JAPGd2~L&ua0*(E{`phn&ctFk-Dfh8F?YJfRv?4 zL3-l0>a?Vp#_(%hgV;>q<@pz4i~r}rzZOv3Ck)6T!D7V$n6=?ZZ3LL@Q>=EDs0av$ zgitjSa)`6%q7e3DTgxA`FKsL&Y`;bfd{|<17r*U$c(()=+AQqI6L^2368>`;wzBb6 zzIplmJ<(@egwPJ8@U=3FHr?$F^LhOY@KK`UPov^y9*`N$?C9?6TfHsL1&vvdQM&QB zEVLQ1_SVPSB7n8aHubfCCfK6ikB(avSJF)nxu4j$Vot|^0?fo+hfXe%oDz%zDjW0{ct@mz zS1_StQu=V;=UyS$cS< zRxeUXVS}Y4jF-_oT7&j}Cv3mbB|}?sX)p|;GJ?_QT>nny!Mv-apHXD+YfU3)&fMPf zQ{0_`J=R3X!a96nWZ;E|Yf5;%k=p_Z;c(o38{v{VHoP8zL;}>AT$&q>Im7RBG>oR@ z@5kQq+M{J(jo+12GTYPZ>09+(SqaF;acG6>0b)@ zcr5T~%yn?~%`IhEkCw4f2S7NE6JfLi%W=@?UH>aovkpY%zUTyrbzbESRU~IS&*}T) z{9idNroXR?Qbt%V3+{D%`Z|-aE}HaYzne|IGb+*_Xh|s2u15-brw3daLi7BUJY!O$`tHMHD`l99Pz9k<5%5b0WX?{^l$wnbFI8v0TmzQ@7bv$~Z$lOquD zovSckB71)tB21-zpIRm56_xN^naZ!_N=*<2#YSSp(^_W&m8N(5`N?>{l!O4g0RbQ2 z3GwldJEU%2`a|pVNL-|Gjn&)7hLMY)N=|F@A&q5eHV4PiSDAg7kCpepu`;ZD$okVk z#Zk#JBp|%&%hXA;%hr?#S@&fAYdl%ML3hS}`Vjh03V>Jm3Y(0INx{(~UHGYA$v?Cn zdjCQNxNu=bMEQ>>|I&y!RmT?jNM8CX4K_}is2NRmo{mhHAVH-3`H6twYv(l6mwSa8 z9`uQ5?XEmBMX~{<4}Q|0VQ571d=LUZdlFV$osiyi%r_)p?J=8AEOV0P8z@xuI~WRb z(fd3bccSSiB$~$?Vwn*)%AegzqWC1&rq#6~5eVe%y<~U5$TJw^I01DkvR~RdZt!x* zBpk>l1f&@#m}N3^)UcbrxPQ{ibwe3FXalbW@jqCAM}M%=hvv@5dnmX&Rzp;gLOcX) zCAqOW01HDSp7H0Kf1;Dk{9@5zg=&^H)e_%(hdP9j*oBe`6YLd0@5QG3+YC0 z7|&!wZ9(gdc=jaP36sc|T$gEY$Wxo9S=>d;_Oo{d;$+nrcHxWwyQ?V$OEgCSW3*<+e7H6%iPRF7{hLp`GSrG~~0J-;9WegR&$_6Gtm z@)0E1c7epjKSOzwa?1(uRV}1*Og1hV3FVJJpdZ0SLuBPa^2b`ZCqTcoKDr7* zaAqF$7JjTB>*o2~HQ`djG%=e?+`V{@2PPVh{D-Zmt;}%zUOa9*H;AWFlJOfh+*a%s zXC9eap5OSZ0ZBcv{?TZGm67Z+HzZ$qi;$_=a<04J72LXwBYI^)JMH!71`t6D-OYMQ z=*;Z9rpA2>6zMW!=OeSy1M*dNvi)ftYtMzzwV4_8x)jbKs@`I9vdjv75ZQ6#0Di!!t0Gy(;eNA!Wtksb!dbXh9|!t} z5FK@U^~BlL%@1Qt;5|#xsP$C8Pnl&vxH2O0SlNs0kCB}_@Ydm^(l#*kDl9U6r>Xw@ z(l;e=&$)Z1xh~@|MR~cuki2N@D5N|~nN1|OB(mZ*aHTPAv>o;pmOr_uCO5#EW<|l8H5P>}Beb zopMTLlQ3ZX4Fg=kd&9f@?4Z!L;JcSp<&gW%T32!r4{=%%Ut+5q+m=Hqe3gdHJ{f{yan9ca?4b<5cG2X=Y3h8*;)a ze=42j@_NcYJ&ss{{&6fEKVi+bl`|d5$3BWR%B_98N3%cP$DTzT_M5j%?R!DqE!=-N zrbre&Dx;$AFsP+bE~uVtB>xr3bS<#ASf|aQ&Y{Spi?>hYWH1KVYu_wWeiApld7Dv# zSYwecBtVSz^^Uk4-Tz#qQ-3SQN(s$({{%DOjNMUP8Gxk3c~#Q0Pz}Ucu3kr+*Vj$^ z>gg=2vJAV{hAn87S%4Y4W0+0m?)KCg49s3xFN)Uck$u=MbeUQ2w`^!=KaVO+xnVsd2`w z#{M2U%JXOQy~r_Vb#7cb!^wvke&i9>90t2oc1I@cY^rDhLWA#R1ct*hocirC?{mE@l{L|Q|@xS2&jqu%l4z5>du9!@-} zo4fv=seK35oYSsC(#I+96+uJ>RqqCmE;%I0CmhKPp@PkY0lLwubC*!dU+n`cD8k?` zW;H%U0iB{Z0@2rdI5^N%L?j*@PM+wJTyi`lEh{wFqZ9R#$S?VR;r>m9@(f5U`>y_x zNWBvKm0XZIUu8&nX#ElNU?k|#vF1y+Q#bM`F64Df%4!_ORirxOi#uuWBT>^O`tO`#=G=vfxWBP}4xQ|AI~!2RU)N_5mic7lTv(%}F+%Faj<)fE1jMvrd#poDKKhA3iz zkSMYHLHQd8zf1q7;ZN(8oasT9VkrjU4NsSer(F9y?BA=by1$4FkcfUV8*u1R@Brtm z{lif|qkN>W)LIRVds$2oo-E$_1JvX^7FASjRVOIE&dC^}xRw2g;o-w`VMW}v`<)WZ zw|xkyKb(`nLLTMADfFvV-@mu7oN@2t(~yQL-25Jp2rm(LmPi%r4GP{YA{>!pQ_Cp@ z^tJ{g7HC&%OX;`P#J~tKO@$bOH?DhF{Kz9`nhtIgL?pOB5NV>lx`6Kj(__)|Kl0@o zzO;g&+V!|S%m|abN$osg<{RzuZW%YIsAGq`=p|q=%^h80VZW^{bhx_2$5*v`d*4iD z0!lrLd2ozc#hPNx>O0>4?RPubt#@0ro?}K8(pCN7Ce7{RVvNj6i$*l{24WhsR)*fh zR}h3^G&EOEoMXDO@^tm>-s|dO>C%WsQWNE6{+2uDf_~&j46oq?-CdmD%eG#JRS$v? zJul8D{7z$Lplo2nz)aDMT`Y`dGwmc4A<#>YhFrQ$a&wqeC~Jw9nl-w{njf)Pj2?(O z!xm&pm5VkV{Jk>Ubu8QE7=&2h0h{ohgr6bmRA`q8z+K9}me88}Ox|a)YVg5Y{*dVz zYuBoumAEzS1H1Dx=1b~ph=C3F0gn*XmP?{_R~ZxJ1%iGoB70R@6kHVB_|d)<@Ppte zhw&OcMjgt25kF>2^u7MK0|;4!*gCzo@dPHAb4ZE$nro_5li^&wd5HN}NYF z9P{>l^qF+e!|%=G!!vH@r2b8XZExY57&&vs-*1GZL?;%RYg292CgyX~HU@qgWS%+g z6VMBE9QKrHCzZ*MCt%@-X<0%-l+Ns%lDvhTc2quvi|)+p1T0bI+e$@JEmE-@I ztT)d3Sh5c0~c2Ok&#F6+Nsu@$~25TZN_cro!@m0bp?oBf=1dx5OmUG5dQB2UTPj-MK=pT-KJvO|{p zM4v}AI4%lrYj0_Xx8DsTI`X?#=^fJz(beL#SgCXY@rLY2sAx&vOxguDmRII zornr{qPj4{GpW|)x4gW%v&^E7t#Z3y$#!29w8=sejB2$X5YnSKw-krL&N;MNEds)F zU7ZKBl5gbGc|Bz91|A!!Jv-fZB7@l#BDmo9uatP%Wgz*<`W}NiScR-)!kxAZ0hV>d ztUT$8m$_u`gw?-AGme8~^l+dWq|D`!tAQavY4c1Z_xg zWEpZIT!4(n#Yeez`(5}eD%BXCj*W+kh-90dhp6k*v-gB;x^DYeZTOytJDMS-WVdOs z@UODi4|)K7FjV7#dHzm?;%Bt^#gZ)vecBG|%&VXje@jd0Tqr$yj)s+HJ2A zSpPmY((OWILP;k%%ft&?oNL{?KWr#No9^n<)G~xjIv>xr$djU>=q1?A)Rm5ZfcPs+ z|4Sz@%lt0WOX*|^UCY*z2%S8^K=Q?IM_VbLjn|et0rghuyC^A$s;Wx|yBx2oq?U2b zKKEceJ%~?Jj~Tx!tT!2miB3AEgAD8BER8EPaK3<=ihBm%7B{x0zEu6l-2lgzKE#&> zT|>5`ekGngA_Oos52Cwpo0=6X@lmc;cNrXK>q_*GvdWg4vV7pCLGt~r>GcwuCms+= zeKRga6rO0Do27`ADtgvPS$+e4-pF zj=AOm7~8SJ^z|uFbEjTK8MX%R5&Iv+ltK`I1r#X;ghH}HOv1eDuZ+=oFAJ#yiY!B2 zLUTSL&B_b#NfSxR#TLem6{GxCHX31(C3b%sEt2taT%zd>QzR*{KV$6f#Nm>hkk}nv zC>(0Pm9LVFIY*#>V3`<@)Ri?|CVNGa${lLK9Xo#Y$6wPL% zsU)`r*gLuLQUjWG965DEPvQ}FN>H8H^5TMIWJU~ik`}#s?Ol^4nZeeK3j)p>P?nlh zQdraJXVJpo4~3rweB}hELu~m=KOvBH)Tu>=KEXlZ!c&FD&W;(bXW$uzc&jMrGXL@H zu-B!ER&*Tlcr|7wc<;aklQZ%W_`RrJXJnTYdn-Kp!`-U?%^~ebvpU^pN1=#6ljHYW zjPw@0)P|!xUi?yOFIMviT1W8SpOw9OnJ=Sb)q-Qfkk|TYRBeh6VNl(*Zyll~e<;G) zvCoPHdV%(fa^Js2^;{j+QP0LR98#C10yni>K6QRoo{AgxolgH(R3E^=AU?hwHPBQl z50CO3>*4CHV%Xe-G%r{q4U-O+x8zLVBm7dR+2g>)jL=)e1hPnrl#`B-bWVT|TxBv0 z&>&E)kiLZ+_C&{G9I^|Q7eclYh5Ph=t9N%e6wG$)0QGQGl{!F+y)XW0mVqqjXzT2q-c(tFoZaE-h(#SrGU5gON$&54Cmenjasg!c{~G-+26ZE3m! zFc-Kb1T$Xj4eM{u$cucaRJ>-cw(e8%XtPDZC(Koqg@psP#(!VPzK_mVNSW`XQpP(( z?$r1_O2ds;(Vqwl&{a9x-j68*>BuGS`Hz`hc-Gc;p5#lU3WZ9#F25+N*PNMS2mqrWc4XXE^Wc54ng~$lOq&U^Le#q;_5H;ZcOVBhB=)Ae(s_#S?odUao6e=6 zMnE|^#9Brs>B7%F+um~Nx(u7~#d|Lg5eB|su_NUJv6SKX7ces+XC4Q(z!{x2Ca*;$2Lm6NFspP7(LAu!Lc=Sx!Cy|QkEow2R zD4$VsvfnZiK@OB$Wuk`@5n^j;(UZhkxPpyk>KMqD$*?hHt%tkzXdlYx;>|hskVo=v zzdo?PK8rC`#z;zg2tjw9SIB!iRy58q_Em@}!Rbs3=zt{4NXsk>L#ETlqer15P@Noe zy;{Dil}4^WFN-$u6f5Vh#rwEJm9vKD0REI?@U|q(2h!;q4!;jbjA%Sd>Q`Gr-qh+h z3A0i$B4{={Pfa^B6!DTFYry4k;Y3QH%>kGb2Ox7Wadi-qpp6nB!kRh)#W#5aVyJVZ zR^#cz5qUpujrEHY z>saxSgUL^&DeTS>%qwp52CSrLtJUXbwkKy)9rK{88}*VP*-p@G;7zlKEJQq0glB1` zGbYi{vd1_htMDe}rDDnJ-czL6_O@JF1I&sEUFIzD;&?>d0K+2M7QW+KTxPZ|jg!OYBtSN9iB&`u|c+6OH*L|Bn101wKl{Q|&OD{V^wfLVwEP@ooeV^EE^ z)UYuT07|X<+a*K*KUBkJ3i|#HH4IPmS@8MI8bAOFww#9cn^OY>p}Xd7&tsv*ICNK! z8X#1Qs(*?G5Q1KtO+cA+si9J~C{QKcA*it(4wP1}uNG)OGYpV|AqxVe0md+SK>$Bu z5Hk!c2oMG+z-pc+#IG!{13`c|;v@^KQwTr;%V7mz!jy#o?1+P`|B{bF00G2qw!eW2 zpcU331R#Zd;CNPX2|ugqIsR3-3O}nVIR6a-xc*Io2b&QFP#_j@!OnyMDu^yxFbNR= z)8DJ0K=jvv1^o?dp94TNtW5;K{CsRY?B`Mv0sw*bc{DLf6$LOoAN+qIzX?p{FWuGq zU%GAz3;j!>A8XPPvH!9BK^F{93YHD;@Ok|AndgS zKncm32LOA?3!wUI2p+6g;`yd@VCxb9Am#sGef#g$1Yqov07=AfJJ`GD8GsKfkpxIQ zyS@8&LW40$0VEK6s9@Go0C7MbEcZElHepo?AOg^Ukx2t&0ctQ4X#gwbfBhwdf9iYx otsn@?mVVCs1Y4GVemDanFiM%{J^vPg>B<0DP$dMOd$$Px2b+^2QUCw| diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 86f1e9751..60ff942cd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -216,6 +216,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String designInitiator; /**设计符合性确认-发起人id*/ + @TableField(updateStrategy = FieldStrategy.IGNORED) @ApiModelProperty(value = "设计符合性确认-发起人id") private String designInitiatorId; @@ -231,6 +232,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**设计符合性确认-责任人id*/ @ApiModelProperty(value = "设计符合性确认-责任人id") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String designDutyId; /**设计符合性确认-责任人名称*/ @@ -274,6 +276,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**prehomo确认-发起人id*/ @ApiModelProperty(value = "prehomo确认-发起人id") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String prehomoInitiatorId; /**prehomo确认-发起人名称*/ @@ -288,6 +291,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**prehomo确认-责任人id*/ @ApiModelProperty(value = "prehomo确认-责任人id") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String prehomoDutyId; /**prehomo确认-责任人名称*/ @@ -331,6 +335,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**验证符合性确认-发起人id*/ @ApiModelProperty(value = "验证符合性确认-发起人id") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String verifyInitiatorId; /**验证符合性确认-发起人名称*/ @@ -345,6 +350,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**验证符合性确认-责任人id*/ @ApiModelProperty(value = "验证符合性确认-责任人id") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String verifyDutyId; /**验证符合性确认-责任人名称*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index c4dbb661c..88dc8747e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1436,11 +1436,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl lawsInventoryQueryWrapper = new QueryWrapper<>(); lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId,id); @@ -4415,16 +4415,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dutyTerritoryDictItemList = sysDictItemServiceImpl.selectItemsByDictCode("duty_territory"); String dutyTerritoryName = ""; - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - dutyTerritoryName = dutyTerritoryDictItemList.stream() - .filter(e -> finalDutyTerritory.contains(e.getItemValue())) - .map(SysDictItem::getItemText) - .collect(Collectors.joining(",")); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - dutyTerritoryName = dutyTerritoryDictItemList.stream() - .filter(e -> finalDutyTerritory.contains(e.getItemValue())) - .map(SysDictItem::getEnName) - .collect(Collectors.joining(",")); + if(StringUtils.isNotEmpty(finalDutyTerritory)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + dutyTerritoryName = dutyTerritoryDictItemList.stream() + .filter(e -> finalDutyTerritory.contains(e.getItemValue())) + .map(SysDictItem::getItemText) + .collect(Collectors.joining(",")); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + dutyTerritoryName = dutyTerritoryDictItemList.stream() + .filter(e -> finalDutyTerritory.contains(e.getItemValue())) + .map(SysDictItem::getEnName) + .collect(Collectors.joining(",")); + } } dataMap.put("RESPONSIBLE_FIELD", StringUtils.isNotEmpty(dutyTerritoryName) ? dutyTerritoryName : ""); @@ -4435,24 +4437,39 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryEngineeringInterfaceUserWrapper = new QueryWrapper<>(); - queryEngineeringInterfaceUserWrapper.lambda().eq(SysUser::getId,engineeringInterfacePerson); - SysUser engineeringInterfaceInfo = sysUserMapper.selectOne(queryEngineeringInterfaceUserWrapper); - dataMap.put("ENGINEERING", StringUtils.isNotEmpty(engineeringInterfaceInfo.getUsername()) ? engineeringInterfaceInfo.getUsername() : ""); + String engineeringInterfaceName = ""; + if(StringUtils.isNotEmpty(engineeringInterfacePerson)){ + QueryWrapper queryEngineeringInterfaceUserWrapper = new QueryWrapper<>(); + queryEngineeringInterfaceUserWrapper.lambda().eq(SysUser::getId,engineeringInterfacePerson); + SysUser engineeringInterfaceInfo = sysUserMapper.selectOne(queryEngineeringInterfaceUserWrapper); + engineeringInterfaceName = engineeringInterfaceInfo.getUsername(); + } + + dataMap.put("ENGINEERING", StringUtils.isNotEmpty(engineeringInterfaceName) ? engineeringInterfaceName : ""); String homologationEngineerId = projectLawsInventoryEO.getHomologationEngineerId(); - QueryWrapper queryHomologationEngineerUserWrapper = new QueryWrapper<>(); - queryHomologationEngineerUserWrapper.lambda().eq(SysUser::getId,homologationEngineerId); - SysUser homologationEngineerInfo = sysUserMapper.selectOne(queryHomologationEngineerUserWrapper); - dataMap.put("HOMOLOGATION", StringUtils.isNotEmpty(homologationEngineerInfo.getUsername()) ? homologationEngineerInfo.getUsername() : ""); + String homologationEngineerName = ""; + if(StringUtils.isNotEmpty(homologationEngineerId)){ + QueryWrapper queryHomologationEngineerUserWrapper = new QueryWrapper<>(); + queryHomologationEngineerUserWrapper.lambda().eq(SysUser::getId,homologationEngineerId); + SysUser homologationEngineerInfo = sysUserMapper.selectOne(queryHomologationEngineerUserWrapper); + homologationEngineerName = homologationEngineerInfo.getUsername(); + } + dataMap.put("HOMOLOGATION", StringUtils.isNotEmpty(homologationEngineerName) ? homologationEngineerName : ""); String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId(); - QueryWrapper queryRegulationOwnerUserWrapper = new QueryWrapper<>(); - queryRegulationOwnerUserWrapper.lambda().eq(SysUser::getId,regulationOwnerId); - SysUser regulationOwnerInfo = sysUserMapper.selectOne(queryRegulationOwnerUserWrapper); - dataMap.put("REGULATION", StringUtils.isNotEmpty(regulationOwnerInfo.getUsername()) ? regulationOwnerInfo.getUsername() : ""); - + String regulationOwnerName = ""; + if(StringUtils.isNotEmpty(regulationOwnerId)){ + QueryWrapper queryRegulationOwnerUserWrapper = new QueryWrapper<>(); + queryRegulationOwnerUserWrapper.lambda().eq(SysUser::getId,regulationOwnerId); + SysUser regulationOwnerInfo = sysUserMapper.selectOne(queryRegulationOwnerUserWrapper); + regulationOwnerName = regulationOwnerInfo.getUsername(); + } + dataMap.put("REGULATION_ENG", StringUtils.isNotEmpty(regulationOwnerName) ? regulationOwnerName : ""); + log.debug("导出word报告，查询数据结束 ============================================================================="); + log.debug("导出word报告，获取模板开始 ============================================================================="); templateFile = new File(exportPdfTempPath + "temp/ComplianceReportTemplate.docx"); + log.debug("导出word报告，获取模板结束 ============================================================================="); if(templateFile != null){ try { String uuid = UUID.randomUUID().toString(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java index 7fdcf6a2d..57113bcd0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java @@ -55,6 +55,15 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl updateFeedbackHistoryDataStatusWrapper = new QueryWrapper<>(); + updateFeedbackHistoryDataStatusWrapper.lambda().eq(FeedbackHistory::getFeedbackId,projectTaskInventoryFeedbackEO.getId()); + updateFeedbackHistoryDataStatusWrapper.lambda().eq(FeedbackHistory::getDataStatus,FeedBackHistoryDataStatusEnum.CUTTENT.getValue()); + feedbackHistoryMapper.update(updateFeedbackHistory,updateFeedbackHistoryDataStatusWrapper); + + //设置历史表数据 + FeedbackHistory feedbackHistory = new FeedbackHistory(); + BeanUtils.copyProperties(projectTaskInventoryFeedbackEO, feedbackHistory); + String id = UUID.randomUUID().toString().replace("-", ""); + feedbackHistory.setId(id); + feedbackHistory.setFeedbackId(projectTaskInventoryFeedbackEO.getId()); + feedbackHistory.setDataStatus(FeedBackHistoryDataStatusEnum.CUTTENT.getValue()); + feedbackHistory.setCreateTime(new Date()); + feedbackHistoryMapper.insert(feedbackHistory); + Date now = new Date(); projectTaskInventoryFeedbackEO.setUpdateTime(now); saveOrUpdate(projectTaskInventoryFeedbackEO); @@ -162,6 +189,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl