From 7d5c787387afde2fd8b12f170b57e55bb74fd755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Sun, 7 Apr 2024 13:34:22 +0800 Subject: [PATCH] 'commit' --- .../30f163d0-58c3-47c6-abbe-a329719748a9.xlsx | Bin 0 -> 18122 bytes .../54aa3aee-9a89-4763-adf8-bc3ef174098e.xlsx | Bin 0 -> 18122 bytes .../Collect/Controller/CollectController.java | 6 +-- .../QingLong/Collect/Model/CollectModel.java | 38 ++++++++++++++++-- 4 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 WebRoot/Excel/30f163d0-58c3-47c6-abbe-a329719748a9.xlsx create mode 100644 WebRoot/Excel/54aa3aee-9a89-4763-adf8-bc3ef174098e.xlsx diff --git a/WebRoot/Excel/30f163d0-58c3-47c6-abbe-a329719748a9.xlsx b/WebRoot/Excel/30f163d0-58c3-47c6-abbe-a329719748a9.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..798dba6cba1e760e35616bdca2b4203d760934b4 GIT binary patch literal 18122 zcmeIagLfrwwmyDh+eyc^olerRZQFLzv2EM#*fu-1opfyLmzlZWJ2Rg;C`S{uloOm5JjveGG`gk4Y~Gam~sGfAY(zfFpR5X%&tk zS{?$`o=B(ocP>vcOUtRi2$u&WcpRrD2G|QmSJMr^kQ!ZCaa2H5d=qrc*{fHE&x$%s z!Q$;CFfVgWaQNA;Ksj`=juNTEZ11jCt(OoLj!w@5r{o@t898M65){)BR(=2Ni zfNbO8hJHeAOn&-mZ)svn&qIfoh2BwF)%7j~`#iTi-FeI7q95BIXNXA3>CjoH^9K?7 z%Pj-PvMTFPQ#Y)=^7c#(j@&YJ)Wlu9*IgmuCw8%4d4As#Nah3)svVDSt6^CA6L~5D-KCy{sbkyrTu|IaZ0 z7hB`Myn1E4v?K^4V(_K^C*ki-?lmf+Su1+sKhj3;K#XbcdhBVjg>CPTB0rq+n(#a_ zt6j6*)9y{`3fu}1f4U$i3q$#5n#{GU^hv(Av_K#wIEX}@iS_vrS(Tqw+%rc}9po+F z^M+UM<_FS|e)?iMi>eIze{az|^>tKqx2GN;<#|-olofU>TeggXDGu$>)9Q zc8FgdE71Kl^fV2w!)&S<$=NI#?Rm+FJh2pA{<0+s<*JdW-Jz33*Q;mxwQkjLWUD z7|aG2GqS~!N$c#=Eyi;!Pp(2;|Hk1Vz7DObs&evkCGmy>@dh6jpOX)l!;&``<|WVR zcAPXdJ>8_4ij<@x*%S7?3XX!+7~s(#boa%>6){1;QivlW#G*Izttu6IY`WZBNq4Zf zA9@Y~0tCUzl`9=X}Z`iVNV1pCG~K-6H)2zci?MNiLJkHvKaKnwrUI3Phuv;1rS(#Hy&12#JXmqEL#> zkaMLmZzwy{u3`zx9n@-JE2GzrIYw4>M%;CK02X{BsAypFP6IGt3K@!@n(7P71&INn zQ6Mi32L64UKu|w8rsJ2%O&xMd=SzjqbK`t&!~_D#14vB45+o1@2gSt>f_4u^5s*nL zJU&5?;?<6N{9ABrCSIpF0pWeNK~2?xK$qM*bR@5Yt%37`ehJT$>wfFIljcY;_&L0e z9-R}>A%c!(kHf{>F4m454{e8lpEko#5dAgG9`L=PRrrnyWllQEaJU2*5-kR+#Py5* z*4+l9a8afYZ%odgigT;kr@r^k&I5mxHs^H_qE;BGk$K@_!*C%_EZjMMMGe!)Q$m*7 zwr|h=-Y7Za0UKIAeQaC}Do6t}3zJ`F2;XLMt{)hA@l)_p0B&q!57*dO!q?IM{G3{n zrSI-=xAp#b+PXjW>F#`WdVc`RoPE(-a1TMzeDYAQP1tU$qE(QpbJN9atALpwZkk)d zb1HTzD*uUy2QnmB&ECN6HS9$EEsgF%a5PwZ>8`JI&wAI6<$*|>$?NHrIf|q8Ap1i7 zekrjOnk`@x;(mF_nk7eDN+vzboh=#l0zZ%|@p-A+(G!xdIkM{b8}6@T4v!kwmgeHi zi>IqQ4vi)E8g^KS(^mv|cyL+x;g~hjN?o#f|MY$~TWZ_J&)f6M|7d)Eyoo8dUsu|` z{1r9;66nkL{^7Fz)dc^a`vUr!SAO}n|J_@qg0$oS17au4M+k#!h6@_fiW5E2ner(D zd2a44tH<<0j?F0y< z!TB#de^D?L1u>24^M<$7$R# zY4y$VhJD|cK*h6P{teB|1nHC}2cNBiYY*T#{_glQw^&f(JaF!SnLqP{)K9&_50Ez< zZzj_2la{>&FR%ySDkSmBS-*P*I}wD8h~oQD#ycM5r?o3z?l=j&j!|~6-O!BRU7GBV z4ln%YDNYz9j}s~y0ASz<0APOU!hi9#qnWX>lOz4#4~%~!?##rs=nRH0KSzC!OS1*R zKuC^SSMJh&BGFmu(cuyarNU6$IzC(v`Nw%;2*;4sG4aCa{1- z_9GCfI&Dn2bL^_QdMbcYWN4PFB&pmz7-4-oWN?lBHfz>W(ZL1@(IR1Ic9jfHuwR0% z3`(ir@~K2lLjfkn11(*|G5sgGdXPP8l%Tk9l%_y=wSH+nVk94BQ(Q+AtiG; zKBH*5(b6`_!l^W~o&=k(TDZh=K!^c}`b%ATQt>#n)1|lo)~e;xpdCVt{@aHz31zB^ z2pSu}VfoOL(g%G~V9aB-=%a#x1d4SFTD1p-s*9eK=|ue+imd~M?Lz;e#i=x%Z+ggOli4HARPnCTXZ%i0Wu__)i(Fi|MK?=wtCxJAN3?n2mvVZ zQjTQN;^Y-r6A?eQ?RIRUdhJ0>M>*45wy()p-rB$3DrarODQ&SCfI z^7(_e>G{4?vejMe^V+D%*YSM5_8Q{-dUbf)-R=FlmqV}nas4Fu-V7zw)CHGN7EKJF z5F!ZmCI+oU+KEeS_>>?HCAzMvU&ake0| z@%|!ZM};!=4Otqhq$oEa@;#MN@%iaPzf+^SZNZ{ZxA&FDSgH9oj-eKW0{zGe>H7_FOhK?o3WwizJdt52(_ZhlD6pusQITp=_}Lx1Tw-ha-Nf8M=Ph&Du(PF-D6mLP**$ zH{_zntzYVS7QA*~coWfKDoKO>{W@Dd&Xoo|Tz<2jv;zS>;>K;yD~j`6GqmHVo7J8E zV(jPji~(VxolHqfwSoIh1dXYrkvl;$GgTdI<7F<^PqMs zE$`T`*uHfa^94_cR%V_$>S6&~_G+?J9Y0}jePC`(F(~u|)0Pl_?^!aIS#}l_&SX9| z@kPK`od@MaP&V`wYf-b&_a$SbM0BSEO8mhFgwy6>w3GPVG!L~D|L+~odA?k5KB$U% z-wbj)wMlZ?L$R1b^K@F(AJdj0`qq7P2YEunmJPNIF>;;+47L|(@v%j3i|=!4BJ zIBmu1oD8W1o6*a2sp<>HtQw<qzwokhEa0d`g^tc?(c+;cwfrC@u2l$POjjqjksA-y%s5O|mV2xSz#J=_wYdz+uy$3Vh^#S zaDNCBH9+u(=^gNDdO~nWp84i}_t68?P-P_tX@o3RoOk3Uxft35l$?%(olsyDp)R@g z2sQ?0oqR#v;3o=!YWOoP0DC$6WqNK%-S9Ve_it17`8H^Z*$_=-cTyk(VXEJN{9(|{ zdcu16xqt^yxd7zA)&YuUPD9M{3=^usST*=0GLGN=)HmSIOOgZIhC$f;==$L2t4Y^3 zRXh&SzX)+6^DD7(!2FYv1tJ5AJYF3#fZ7K1B}AYCM}k?Kogde;Y~a|A7cmko2S#1Q zHf#ft!l#$z$Z&8To`DJ|)n~S0 z_n;WWHtY>TI^)SUqVm`XOXbsGtm3ooMQiRvQ7`Y0mHoXf0X5fiSoR@p)yLp3&hzBt zpYk0+`Hu=9j9bEJnk$6z)P7V4e4(rOBd#j##{_A{J=jy>*`S9C&ppKjslew-r_aj? zD%{AX)(`{qR$P{IQ3}X4{$+C5pp|lMM#K(W3PVN@*!F60^@+PtSl5xGu!_sQ{K>y* zjGN`IWp@t~++j!`)fsQy**9ZG5X@z>4!%d(HAKE3&dZ$=7zbSuYHziEwn0a%aJnJY z7eUN2fs;>#r*7<0=@IM1X9 zinLd%D;UbltUg{877h+NS*7j~;K1jHp+WozEx`q6>T`VJ=g4+3L(vF)H9_7H)@@SA zbSmdrq?f8Xp1+r!Epz-fEv{2CNu6x|iaWKPJ-~b;`?#%E5}uR8g?~);?Nn*CG>$`E zWLm`Uqj3RfV)S3m$W%uZlmy`?Uu|mXCa&K0!4AXW*?irW*LYg7Pb(CUrHa4 z%m2l7;QVG}@PKE-`du@?FOHKU-~~;hPd@S72O7CSrKhcZI70;y;E1=qZoy2wrBb|5f|pWf%{A>ouZ7Qe!bPNb z*IYTeEl{*-d$iM_O+>|G6mGR5B1=g8?S(~Y7qd5#EOoy_&ztvq&nTEaL?-D<)n4(; z?keaJUc0J2!x@E59aV8xzO4qT>`+3_%?N7OZa*pK7~exQo~oHoO)3z>2c^4cFQQed z{PbbdY=V0ltLiC!hxzWcx`Wi>S4q7u#hyfT+s|xgEm%RXwtrJYVbI8kaavzVFJY7c zLp9a5h`~DZ^Oa6uDqdAeUrLEC0g5IXYMqQZ))`cC6W1oe97W?@?#|p&ibk&MhK3Id zmHreW+R<5RzTpa4o8g@doDF{f)n%4zQ=B^6TkOo9e1d-wg~sc#C4tPwTUqc_p;t>i z#Uk)#-I0_`W(MO1n_5Tp6|is>MVU@&mm?khTnIT!;42N`7j!E7lZS&bmT?N%EhfW! z7u_ZAdS8O!{*@yM(19$_`%|7?^25K@uc=v_Mh22qzQamDPkH@ktGbfJ!vNp}4yr)gpimNzC#*gulRdwkRtwJaftEI^Vw^qRESGu;J2t zSWS=dTpS`4(FMbGV5(Z`u@FQJlKDWV8sz{6-l~YuMRl79y_=-7IDox0U~R!Tcv!h4 zm1qLQ*yS4585hjgkEMQa-@JHyj2!4$+jzA?Rmxgc@ndO*p2zm|?|R>tQ+%Gi6R}3DN|}E+NA(cRaG2u38Vl8LpK;A|?qVol z`zXCt=2FeUG!%ngNhK`arH(jBtJ7&{*{W%Tk4i@!`&J9Ixdn%B$PcO{#!ar)?dgiA zFwX`5P6^hbT!xucX7!bha;l(^p;koqh_a}VMo(n zxlRK18@vQ}B5_w!4>wGevd{8Cmdm(JZm0y+o0J6XeM8U|4XY=)4>`#@jgP>sC-*GQ zTd&VLq+c<(d=f}?6LF7u4FjJYz)(B`%`^j>PZSI<^X?<;4xGq4k`P;!MU9+$v}o=8 z#kyW1WXi#yJD^Xkqy*%%mPHevXPFPhZ0V6o7H29ckRSpiC_>O*&pdy=`Y6xRXX8jW7@Mls1&v* z3iR`ug8!Q9g(L21mGSiaw$P8XBGu*Aw)Lny!6C=8y9f9jjj=5l>xsg<*4C~KO)kTQ z*Qn^V=Y@{caVlv+@p#eCxgwQlqhpLFTi?BYs7ytU9l1N-=okbXxoiW( zbA9x?@9bSAz2|$)eLiLd2c68BpLpDRAbug7`pUDVj6t||e@a+H$uCL-gBx};E^wo3o zmx)p_X6bIU_qDmZcK%O^xl;|PtqS`oe#SNe(l67jMUng5d}6|k*fbv#8(vL&xxs0G z({@2los)-P6wWrE{bjb9O}3G5it`G4!;*7*hr{BPg1$lFM1Nx3SVENdYMEnFVZJ5I zWTkgZU99HoCR^|J0-P8yIO(hYK;f<5l#4(BS*q>ZaZ{90^@9G(hTynDXAuq_r5>;7 zGOE(FlN)v7C?&n@uxB)(M_|!(il4-<@D_^nUIDa-7|S#@@w z@LIe+JP51hX{)x@0TEdWD6J6|Zz_`#8>$EcsFplAgXpq+@D4Q`@V-X{PlNWpj}&0@ z7m@j@CHDM9qFVw%Dx_pdcsJOcqz>L&@@L7;zfyr`=1O+19J6+@Ab{}@C2B^#m(~{e z0zcjjf&jT+aCfX~4{pQPcjY+uo-3}wxJP|?R6yg!Y-bj2g%0E3?Vn-2D{E4Uas0JZjyx^WHu>QCD!T_;gkxK&598v zB^^XcwTSqG^a|14QD}19D-r3x6l9p1(Bm=5u_}zFks*w&e$uuYUsDyA<~|(}4bI*E zmO%62cR*#AWq#KXV#qdbqb^SM;GCkpuD7UdSY-XfN`*0LS+g0|>Yd}VQRjlD_}i|_ zPlM~K@60BP@K);BOzDyWOh9MJj7T{NlYpy;1SvDAmk%`Na&_gX#Ze1glI30n?!EnBc}o1Cc|TNEx$K1m(gZnhw(O_msu;fMfTvR#To~cZU>0I-X2riLT$oJ8Uu0fzOdo>75a^$23X2ez>+EUf|#gUJ1fSXoRll((Mg zU}4iozCDVp2q3b~u;3zae;ugc694_(SsiStUvJM7^pB`n>>xh{kbfONqNcHbL|tLG zKshV6Q2u?OU_!DYex0LK;^tY3Zj;SRe+@WLB>5vs*Q;~ zkk9NZ&Y39mSDKARgDH=$1-EgdOP0;r>!hKD;it1#zDBLg2jh{so#!Pr>v4wf9Sv3X z3wJJKzi=d|`nPzp5sX_pmd)$O`Pla^7&0piH+MhTK4<2uuo2qdmqwLjexay-Pco;f z#t(Vza39?}u+ZwDHGbjg{cid>_Vn5@<*w27mEZcG$>I~TshshzN)9%xzg2VmJ(B8V zW^8Rt|M&ghgQ#cfvN1TUsNKZZxFU`v;x4x(>a3dQhq4%LYbqNJrJ|-oY4&?qF;=F{ zt$7cjfq@jEFv#rikfrkyT4N>Z6#hi_)K_O|zn5`BtjATTN=Hfeo;#0@9rdpkz zbp$$ze}n0pPuXgfzT(M%pvSYEJU0&&Ake*J$5Ox{8B<<7!_d5quU&S#LRpVuk}rci zD_P}b<4dMlFIW)y>XXpbz?NLujJf%f@Z6N5J2=65plGa>F0D0!#?3z}B>JwN&QU_u zbayIo7v^#&3BZ9S;!_p5q2WwoLldIs%eJ}(noWgZ3ApeKJr-WdlaO@$d3Jukwp>fG zFsne!cZjMaWS`9us6vD^#qp5AlO7Y#m{6(jR6JP%P^sGYPu6_5N_k-cfB{vqG!M?N zte#)MYk(~R4)}1}AhLQ*`ulKR*j24I&C9BTmU6Xx9Krao?|UQAbpjkb$9EDYMY_#* zSSf~^Rj;yMCUaM6udq=S<0n<7?^S-*cWYTgr7^V~1-fcZ$eR|(>EsdMjGZYcN~u#V z9ccJpF!2KW0xOV+pNt9zmr(e=ofAutWxBnRgcqfQTk9KjOoaf~G8LNK3H6AR{rnKc z^2e1o_qx6d!H~uONuSNj)%v-=|1m|5fS0-cNx5VUb&Y7w04Bh z?X(vZ_IW-m>+^m9!;bhMZ#+|9jrabs|8?Md-Fppze}Wf9LE$BXLf>TdJlimWs+8s) zYWgPoR3RQ|C`1E=8esD^DT<`sZUoDxTc>Nva?JnP3Ku_0Q9wz|UuazR3u^p2@%vYAVfMA1i?ob54e zg2}Do8iF`p4MDOkRa16%foO|?R3bTKWI(Dw+8~M?I^JhY5V(3X(Q9p+BEM7)@iZdR z7tBAe|AwhJ9;G_1l|NAA5Q%KT<%vJKY`nkY4?$)_K_bM}m+0P)2(uI4I;r0&GF=Vq z)za_Hj}aENAOBm6>k-M2%%R8R9g{R|&Ln<_>_Lz*09AMsj!gRs#N-n39@d`!c-3x; zY#I7-MaT{&b&jP>0`cBt61TR)KdloV!zsMR1dG5Wq8cSWTYU4Pua5G+Tg8{3E7wK zCbB<_|0&0x1`BP5Nb-QlgSlvMMRG%G4*uz6MDQXNbB>#658u za~tX03|(fN?J(%Tu4Ljw*A=Eljm$X+$HJQCU%Y8QWoz5CZ9~nkK9wWz2+x-Q>mXX1 zK%0-GtHvSJ=zzU5^-Cbn*o~NIPMObdr7U$X3o36Ql|ft`{7RLXL3LRfHeHCYQBGP zzoV18m9gXBQfFuCk}+#+h+P6nMrg^3mZn8D!` zw(UGv#-GugYQ5WH;r9^HWD;7@HBPMF$lJ9;+uDnygSYRIENA8Nat1 zSq&MWt3c;Kqfd!$Qi}{q9^^qeB{f{<$vm8x7v9GagFqN>cx}^(J;0-@FMh;Q;80*r zNE|b4iyjHXGX=0PZ|7i>Si^{x4-XF8>>MO7soe&XJ;0h~bx)s7T@S`d^$Xj>CC&B3 zCS7BuJqkW6;)sj4gm#cldY*QQcOZiyKC~ng1Wlgni{4`V$QC{!ud(y8;G*QkT;d48 z#YvkJ|IJJX3snp2 zVi%UJ7-d8u9umE`uQaEcjXIPG9I7!K&C6!$IH(6_?Hb-EZyQS*HGI&WyGh$ftb8`W z`GE-1Kkht6q@V|PwW?ynO$Wb(hLBWTVE>eYUDKfSiWl@I1=8X%>@Ej+A5$lt)XaTS z82F%E+<{k2&03lqOPo{=&8b%DlT?=yPfJ4Vcurj4+MhYI>}Q_3)gK z+o?t?MbM2obJnO8RfSS;O_K#$U4Dfi)}7pZS_l9V-3kF=hSlTt241dHzV_8(* zrC=o$SP6}xYc~&7?QI!dM9A&g#_k{?wc}R^_BZ0Kk8#`@$JokUD>RxxK)cv&&@NS@ z!n;9h_Wiv9dbC-tnt3p&N(CZd@Jud4U<)i%U1k0rU>1sQ-8?v$hN}+^pl?#2Ol${N2ur2RrgDk3E!Ut@UbS z#ghI;W4RN>R+DzFsp6+5*d~r-dO~E~kV;h0YP%kZnzt}yeQjWCyJF4<%zt9CQ+$Ul z^{>J$GEx8l^}m?ROy9xSNYTl`+{X0pgjT7cDT^bH?yYP731XmYQkbQeF&--)Kcm%f zTN9I!_DG>mJ_ApJle%z`0fo8t1kI)jGQ_6mcpaqIW3xse{V{5#>inqq(dS)KzTu)Z zAw>KOl~Z}ane%AA)$<4yq3iAOPFC^;CRa^TiKzu9w^O#aylJh(7^<_A2MYXyln#3ZQt~lb&u-Y9_1QT5z4~ECk1>{OkqxFGj8D-n7nqTqit@;o@-r0ta zDom>G^o%ZM0+7;aFw{P*iM6q3a46r{pW=d&BX5&8sW4w}$C{0PQ!IjuPV5qG+17VL zN@~>~RJKmbFAgr=$w*->%&HI!Em^2A;Ja)^oqzQ;5JN7~ zpf5WdE?wmt=Ta~#^|JUIR!$| zv2tl@SM&43i8WYIkZa6i$AV>paniHjlkbZHVI}%q!X=gsF||;#JK(N=IBKD|Wor)8 zzZq3HW#*>slen5>v7)!-OEdjkMuZ`~^!z^JI(b#myuXA){LQINJU_=VbKp_bFAgtp&DJFC_Dt<%d!aLR|`{OJkpR@?5lWu@aq z{s|3Ya6o{pUsjaBTIcjU1=g1IXefk!fwtgPROi~0r-8zX_b>1zQ_ygc;vE5wH+V1f ztv}hLC_&(7TkK?!k(0Exb?l_*<2yS1@q2_FC|h2$#9(+^wWG3VuH=dRn`V;t*1Mp+ zHZ!kkXr;T*za=J1ty5I-O7-#0uq1oqRi{5bY;|v+2qjS&cGmE_2G8|zVH$J09V~BJj=qmR zcRUVFjBr-4B}TxMsKMs#*mU17V9FC_X0|;gk|Wcd+$~^Qg6maJN;v${ChZ$^-?ZLt z`hFEWrPFC=A8c|F$%+mh6M#eZKIGw0h@}JBuR!}NNVl_A^6M$MT1?KoOfNsSb6Ir> zsut^W*%a?YuyFp4PCq-ef}Uvyjn@w(Yk-G2i=Q9&Y#MkNdqX42Yf-*EV4~q zFHnE2ds%6@QJ=t0-tELP9z^!>JYpc_S1yK2COW9K&~w-oXbT_-k!EXRuV)Ft{sNT_ z(7g!2+-iCCa-B|Qz@3C2Q&1Tqo_UV zSvh?e(2?}lXoh7Os1ap&e;jYlOV1PXb+mH47^*><_WHt-adp<#w_=MXL``r}wb98VtrAVXhvU$0NguJWlEN|3+7dtU z?^}IQa@V5Tq+^w?zZ5p%5`;XvEV~ePgH1!Ix+<&IZbr*0wb5~x{@amy@34#vTjV)3 zKZ0MIiS{bW7NwtD$#@@m@M5l7T?PbQku)8=x=m1OH2yeJ1tL4QC`&%;4-{#-fhZ-PCuM(*LoMYKBc^t3jSeqoKaVxTQQkFMsC(?A0#mP=tR{~kROpaT}#+!A=I_72;Fu$J*6DWEX}PP89jRS;n*L`H<4pt?Hf z@s;r?kk6vVIYCr^p4zeq1mTM|JXUtV!x)u%!Q4q#MI07S`K9Ld+YMGZ|u?AX!g(L``ob8ZN(!+@NPwlaE zu8Kq1w#}fC)$r8|B0cOwvrRxFbl+8WIN-OG<1$UUW~13CaSV@BFPg9qV+G6Pghy$` zB^h!}upz^5^%FYJJhx7$tmoIPgDu0Sh<}lQT{v;Tp2v7RjO3=omlUFWMV8D(ae)7Y ztVBHAf89X!6-2)^BS0g4MLo`W69P7~MsYMd+XQ~*%m@A;?uGQz*Mj~HhPp~w4jE48 zEg~X`zJSQVFih*X8sgm#)OB-YLX;Pt!Lc8} zhC~;K@u$qc#`TjU;t=W@YXw%LIzqgAePF}=v@t|=d9(phDg9%bAHI)wL^SglT@xH% zv{r>^?zN4LeA5O6!TCo4_yT`eJ)@b%-Zvkry~>aa1`G@pLm@hFWrvWOSRzEtY6Z&_ zf_(8X$i78%55l=NCKaJz%nBAZUYI~MChH-FS_-OHt^=Lr^`e-wrJDHsV!xe^b7)?kASPsE-5;6`L)M%~?G9bvk!*SrY zv^RU-`m$R~m3p^r7xcIgt`2vN-CU>m9u-tEIwH2oq43w2AsC`~tgYTK;Fg$no`nrZ zg&j_y!Dvb0h%3`=TF2pk#5!!m`mDp#nwmRxyyGUCiWuMdE-|1tRnB+3XA%85ghsIS zQ1|Z(c9KGM4P?U@b^g&!nip-!REOchQn$Bg>Vlc^l#V{Ids9`^e+RTc^=0sjxNl;j z9?1_1HV3aLxY4vDtP3Z0qgNC7-h|eCxl)jRx+;5SyitqDB83wbB^%!CpvzueT|Y8L zM|q?ee_xD@1g9E`&e`}Ryo6haR8d4ZDO-_auihlr&PCr&PPn)GbvN1kYHCwe)sBB$ z?W6*w9nl{0$R?|}phF4sOR8FBp4n}0wV#(8{n(R>QMhdT<ISdVD< z^F!Pg$i!W$@1P`a2VO>;U0^k+I4|;!FSXn}DSJJ1!uck;1n{3_^qNoblF0gpu6am) zK?AJMI92V50+m^E{{>H3-Y2n^<&{zBe2?xBoU_sKWqM>d8_GP$C$W$orf#)%!3D7L z^h9W}=*IN=%jOcho35yLYdNc1@>&&L)9Q$q%Enwo!3YN&DM8^9>R+B^FerwN*#?r4 zyQ~V~7!F{Fn={wu>W=B?r1C(xkb;3S?Pf%^XV9c1W3f=zm;I=-kCb>qZbB&%xF@cL zVn0T;*+81MA{W#k!xBukxZ2D37xvjBWqPKh+B!#CG#U&Wa`;>29Z{d6wYscsolz6b z^O)5w=|088y^?7J(_J}130&ZAM?}N3e@8GiP9tqcN8SpN|cqT(=L*k!YAT-%(HB#&Vw@# z2Y51lxkI)d@lNq-LI~fa^#!x(vYm`@k__7kk66$FlN-oN`n|bhhZxY(1lS$dm9Rt(qCA2-q`-63C~ud*4Aq3^*I zf<9`2wnGwUJznx-B)VE&LXsCLqzWQv1YJ(Eu(@ZS@_TmG!s|)`6X~^Yq)a$eG{reb zp$0i~9ZPmrT9Mm0j3Rw-nUU z3_ewI-@BRI z;ATDftwY}o|1MtPtbbdfzxb&WBQ@vPF7;K}SsS*~yCKY>6y3oQDCi2;d>7x}kAxC) z!tD*P&lVfwL2hk!+nd^^o}vTpn0b%jyg2~#2t;Ntj%rT?id+Q#J$=5y-aSrL8iygouB?KA4#S+d{L$FnzFlKk`kN4(ozkuzu}^@;Y$;rP zS#k!Ba~Y1e8dc(fa2krhXywAR=xK1`Ug6ad*xe&FU1NYB1i8nl;92V_r)B=|4dln< z@ytI8rvKV~$X$lxFZUI0H2mu3K>F(DFtRn2bFj5@q&Kv6F#fOR;Qwpl_=-_@#%oLV zGoS`vf_(~(dSx_hq~x7n1!!|3R#I#R?OVaHnTzLdd~}*OFTe|rNKd|IlV5U@XkI9z zdHU7XEpmnv`vXsRpexuq-YHb|fk9UqYSff3#uk96HPBR5Gi}Q0;J7h4gA9q+_>r4S zx+fH5Il>Jt-{4Z15MNH~tj~)u9#xw};0*CCquU9Lz*5^uF$~*5z-IV`%82zs7~Pte z;}LKKL!+9R+J75-8b0lzcr_KQj?9#36WlZ98pN#!;|mY?X?vh&wZ>*K#~VC_zt?=f z=g4P4;oM9OUpfL>vJP-;q?|pT$TV_OI&M;BJYDpj!GYSnkXwf)ZEToyqQ&~Kz8diM zB}Nz8CZ5>?m>#fp`cSBriiyPs8zGU2i<_{BQxINmykfj-4;cQ)Qh1Zi3>?UD7ca&W zC7(mOhNXB}Pua?U0{>4Dp&~TnlA13yMEuHnBL1ry>f71S>1TQSoYr}ue z=%m>bQJT}9MRI&TtZM61*9!d+qg=6Y?i7=K=Xlv|(rf!i>o-x7g_P)27r954k%`vg z5b#6guSh{z5K-#v7!8>R97f#dnNus4$yeeOo)}cctWzCyQAPT@mWCbeMw(}xGWvmg z4`Lt38VN0NL(o2|%`coMFk;BY<9&;kX(cTi1lo!`^_{L}Fj9H6&1(Ezg?~61P7n8P zD-`>?YBDa4_2FTS3#>r;Z@~=!m2x%2F%e40@6-TC@siARgMQo8T;ZK2*cV@8~yEbZO3_DEI$kn#0;WT_Bu|k%C)d;1Jh=YDY z*#3dhqHkvZN$}y;{qpjB^0sj>`nWk*O<#dvy0kT^nzOknXd{r@|H*aHYG1vl&w2d{ zy~8#!k%u{@v{omzlPt4uLa-qdR&m0-N=mcc0oOk z^YwrI&kRlnyVon-mzE=ak?q%74F5v5&W=vD*8ivI|4+>UfWo+`FS^D2Tg$WH==X`3 z##5%%=;9529*WX-3GumK(d^0O0cg0RLl}_gDD8JLG?b7xVrL{J-4uU(x?gbpMKu{P8bn!~do|IZ3cD U_4wNY7%+g|FLt~Y{M*_82Nht(>Hq)$ literal 0 HcmV?d00001 diff --git a/WebRoot/Excel/54aa3aee-9a89-4763-adf8-bc3ef174098e.xlsx b/WebRoot/Excel/54aa3aee-9a89-4763-adf8-bc3ef174098e.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..798dba6cba1e760e35616bdca2b4203d760934b4 GIT binary patch literal 18122 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 U_4wNY7%+g|FLt~Y{M*_82Nht(>Hq)$ 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 b64e51bc..0fd97cb3 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -1739,10 +1739,10 @@ public class CollectController extends Controller { Record rs = personModel.getLoginInfoByPersonId(person_id); String bureau_id = rs.get("bureau_id"); List schoolStageList = cm.getSchoolStage(bureau_id);//有4,5,6哪几个学段 - //查一下,这个任务的相关模板与学段的关系表,哪些表不是当前单位需要填写的,删除掉 - File reduceExcel = cm.getHiddenExcel(job_id, excelPath, schoolStageList); + //查一下,这个任务的相关模板与学段的关系表,哪些表不是当前单位需要填写的,隐藏掉 + File fillExcel = cm.getFillExcelTemplate(job_id, excelPath, schoolStageList); //提供下载 - renderFile(reduceExcel, job_name + ".xlsx"); + renderFile(fillExcel, job_name + ".xlsx"); } /** 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 09ac4741..11342e86 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -663,7 +663,9 @@ public class CollectModel { for (int colNum = 0; colNum < ed.getLastCellNum(); colNum++) { if (StrKit.isBlank(ed.getCell(colNum).toString())) {//下面没有,应该听上面的 original_name = CommonUtil.removeKuoHao(st.getCell(colNum).toString().replace("\n", "")); - if (StrKit.isBlank(original_name)) continue; + if (StrKit.isBlank(original_name)) { + continue; + } column_name = ChineseCharacterUtil.getColumnNameByMemo(CommonUtil.removeKuoHao(st.getCell(colNum).toString())); Record record = new Record(); record.set("original_name", original_name); @@ -3096,7 +3098,7 @@ public class CollectModel { * @return 时间:2024-04-07 */ public List getSchoolStage(String org_id) { - String sql = "select school_type_id from t_base_organization as t1 where t1.org_id=?"; + String sql = "select t1.school_type_id from t_base_organization as t1 where t1.org_id=?"; int school_type_id = Db.queryInt(sql, org_id); List stage_ids = new ArrayList<>(); //如果不是学校,那么默认是全部保留 @@ -3148,7 +3150,9 @@ public class CollectModel { for (Record record : tList) { int sheet_index = record.getInt("sheet_index"); String sheet_name = record.getStr("sheet_name"); + Record r = new Record(); + r.set("sheet_index", sheet_index); r.set("sheet_name", sheet_name); r.set("xiaoxue", _map.get(sheet_index + "_" + 4)); r.set("chuzhong", _map.get(sheet_index + "_" + 5)); @@ -3233,7 +3237,7 @@ public class CollectModel { * @param schoolStageList * @return */ - public File getHiddenExcel(int job_id, String excelPath, List schoolStageList) { + public File getFillExcelTemplate(int job_id, String excelPath, List schoolStageList) { //哪些Sheet需要隐藏 List hiddenSheetList = getHiddenSheetList(job_id, schoolStageList); @@ -3253,6 +3257,34 @@ public class CollectModel { for (Integer x : hiddenSheetList) { workbook.setSheetHidden(x, true); } + + // 设置单元格保护策略 + CellStyle lockedStyle = workbook.createCellStyle(); + lockedStyle.setLocked(true); // 设置单元格为锁定(即只读) + + CellStyle unlockedStyle = workbook.createCellStyle(); + unlockedStyle.setLocked(false); // 设置单元格为解锁(即可编辑) + + //哪个Sheet表+哪一列是需要只读的? + String sql = "select sheet_index,column_index from t_collect_job_sheet_col where job_id=? and readonly=1"; + List listSheetColumn = Db.find(sql, job_id); + for (Record record : listSheetColumn) { + int sheet_index = record.getInt("sheet_index"); + int column_index = record.getInt("column_index"); + XSSFSheet sheet = workbook.getSheetAt(sheet_index); + // 假设我们要将某一列设置为只读 + for (Row row : sheet) { + for (Cell cell : row) { + if (cell.getColumnIndex() == column_index) { + cell.setCellStyle(lockedStyle); + } else { + cell.setCellStyle(unlockedStyle); + } + } + } + // 启用工作表保护 + sheet.protectSheet("dsideal"); // 设置工作表保护密码 + } // 将修改后的工作簿写回文件 workbook.write(fos); } catch (IOException e) {