From f9ae2999e36bfddf2bae9cf3a998efcea8a4761f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 14 Dec 2023 09:18:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91=E8=B5=B7=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ESAnnualInitController.java | 13 +++++++++++++ .../service/ProcessEsAnnualInitService.java | 4 ++-- .../impl/ProcessEsAnnualInitServiceImpl.java | 12 +++++++----- .../entity/ProcessEsAnnualReport.java | 7 ------- ...EnterpriseStandardAuthUserServiceImpl.java | 2 +- .../excelTemplate/es-annual-init.xlsx | Bin 10387 -> 10410 bytes 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java index 7a95ece0..2d34b321 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java @@ -110,6 +110,19 @@ public class ESAnnualInitController { } + /** + * 批量驳回 + * + * @param ids + */ + @AutoLog(value = "企标年度制修订标准化发起流程-批量驳回") + @ApiOperation(value="企标年度制修订标准化发起流程-批量驳回", notes="企标年度制修订标准化发起流程-批量驳回") + @GetMapping("/batchReject") + public Result reject(AnnualInitDataVO annualInitData, String ids) { + annualInitService.batchReject(annualInitData, ids); + return Result.OK(); + } + /** * 导入模板下载 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualInitService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualInitService.java index 3ea35632..76f8ed2d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualInitService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualInitService.java @@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitDataVO; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.Map; /** @@ -29,4 +27,6 @@ public interface ProcessEsAnnualInitService extends IService importData(MultipartFile file) { List listDict = commonAPI.getDictItemAll(); @@ -425,7 +427,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl0ssIo1^@sL0001ZY%h0ja%*C5Z)+}iZEU1eyKdVs z6x|E-9|Z1-L`PO^A#&hHj2dW*pv_}35YQ5B5tc}mqGB6CrnXC_Zk;-G2#~F7ffne` z)B*Ary_78{j+ZnMY*N%E4$t8|_wMdZlh`<;GGl`K2yfZQpgeyNA>$(-9UXSf8Zt6P zct~QwsgGtfLwk*vFLozFjt4@F4FKSok0PZ~&$6;0q6x{iL`peChC(Jp!BUQ_ER~dm zSwyKyVyj}?u9XnR(E`DfkHHYbAq!|n1bITaT7XCz69x3Mh^1MHmIRN1ONbojsTqhQ z1&9HQnVJ=#$Vh(zuQ%dCl0gizr?_fNCH!3YV;hD_c@l&+j!IY{MJ9%73!tq9=?(qZ zwlH41g6ZZRJPygRBt2s~hbvaneIhG&h2`FXVf)!=7_3!z#e>UxB3gCDt%4f6Ll)EH zg>?;*rf*52GZiBvCYjm~nWCYOc3>$cbnS!8(^k%6h*p2xdc{FjV`b+9X@qo0@>m^$ zkxO`}3>S7*^-eHGGgee`qG(%i1wLHrdamaR>~5^pk1~+oKa3b3x1bjL9WmjtfFkSPb0^s>h5zs;3AAVnR4myfCE2SXXV(1LYq zJ7#o}-C08~jp+&Fp_qVkY!^h$$|bJhZCFo==m~!dRRk*Q(B#T*uP7TuKpA6DtXWqy zH6N`}>MSUA;W72FM#;Lzspz7>t(Xm7IDh`-)9uIW+ppJufBu?Z!gzUec{Ts>d;a)1dQj-Y`Eq_k9Yzrc+Rz<6>v=6J&%d>GN#3Hs++uU09 z-*@Z~*a`_ni@+JiK4;Fc$C=$9R7G}RoisY5X+NO^v@p5U>x};R{@D9WiSu0NyfPXx zdIU%B=N~`J_Qq~p3E&AbXqVB_`+CZl6D26_`lberGlj8=d;DwH%+(fn9zm*NgMTEs zV~R^n8-}Uv!eNR+3RoDiRiJ%CVxi(5^}ABmu4PlA3!UP2v#oo=s2V9&vXcH7Nhwic z`n1-@@>PYt59x>ta3jvvb!@`*nciN-O4gJd!qtryb&H#g*AUbM^UkM5F0rEU)+#1N`IbHl;VCz zM}=?5+?sog_vgiu916az{5P}z3UXZr!6V$&(3aEuxBw^cKA^4sFpvsUAp?#? z$#Ac+o%tc7h}g^AmzWt-BDM}4{W>L1um*s$5rEGVU~n67cLD@|-Abgmzp+LL+9LS+ zxuGh>K58JHjRcS;hEZHTS zG_T!p{}k*GPxbNJdEg(Gbus)EwU76L@ykEVdEMOHeR^%zw9lMPFJ^4zG$Q(~2)|@A zHsQSE^lfFDj`6l~jOL`QsWO!fR}th=Ry>7rB`dx{v1BEGP$+X*2^GprRw9KW8?nN; zmX$=IEM#S)P;6OAsbWDwnL>g3=L!WjvFMfgXrC=8%T^Hu>R&1pIiVdj;5HRC&KVoL z>4(m@pz}pL+l!yx|7(MbDEt^qN0~!!u1|`|j8n_Igm{Gbgam|yghYhIgd~J)2uTUa z2+0X42-y;UQWCNwq#6@x&-ft0X~kXTw6d@MyOkpNlJU!iSp~;w-5b{<1BQ&NH9TsV zaNc~q5@^>NYK=&1#QKFKGzg92(I|Uh55^8bH3CxE z`8&?v%PwT8>FrJj=3nIpG3)|NgaN$E*8_eZ^;gMy90a-!zvLQu@eaCTfAjC)gvP+Ed0<5fxQq-@&r?ke&F^TsFERTg zhqIUHGA!WKwsEH8bQ|f1AAjL6^BJQxGSxax|Ay5ZNf$}^h|~_=*Mx@&a<)mH?U>EP zjRdGl^6L@FbU&f8-p1R%o1JsAUwGTEI2~>m$;3%5gSA&={{WmdD$kJC!=ogwx1Ekf z7w+_N@`&u7lDvxaf^mF|t5vg}!~HmJX5aR6KtWm@C?ICmTexvPA%FIAln9EZY*PLV zT{0RyG|c`T-@H;wGI_G!At#5pze9~W9ZN2JQYPvf+pk8&if8cI3leXF8F168>qsjY zf9ZyPfV30b>Ed1qc&vJtN*PrR=ekxhZ}X2`0VPO#P0AN&FfvLlD_(|uTa^-Q$?3Rv zZH(-tkbZG(Y%C07R(~yyYb{bco-h=1Mz3j9RXo^5S{CU?GzCDZ?Qt=0G*7YKGuqh+ zf1_)=(!H>iP!o+V-cFLz&={zc0+8TD%2bEIvwWovV)LN@>TNH(DH+sSn}?{I#`#^G z+#)agwyR^eA=t~@vfC94u8z|z7J}+g!hy#UvnmS8_d%#NmVZ$;Vo*|o_(&8cCCGB` zCih+n_H7QILr&aD&p6?y^h_7f`!=T5%+4j<4~?)L@LUoX+Y}ja?SpEZQf8yxsDM0# zXgcV(--zV%NRQzq|H3@+M*u>%jaNX7h!P{M{p4j=;8}pjCQB;-H08r;77d=;#8rPZ z9ND1MrLl0xFMrAWgwMTnZybQJ5ykfv-JNaqGls)LkblZUK=1!MR&n|QjZ{~K) zWUqX1vB=jX1HSfnauzPzCXkT7$%ruxBtGbzNcEtfDk>HdoV5U^bnQc10ssIolaMA( z0lSmmCM_I0ib`+I1ONb15dZ)f0000000000000000PYKu4h$NTv?dUfQYU;0)VnFH z<^uo#4HT2uCpa4c{Y2(q0RRAH0ssIJ0000000000000000FaX_C_VuvlWHg<1{5X$ G0000<;v*pd delta 3314 zcmVCBFe`BIy~r^b!21; z^9VD+Nr28shIX4TU+heUoD7AS7y!Vt0L4nBzGY=$OcI=JiIi~gjD$?Ef~_1|St<#R zvX~H+Fw3=V&q^@mXo29%$6$!jh=!yi!aN~dEkGn;SONVkrfF89CE;V>5-cZqYK9_7 z0b)oQRc8e#GLnDL?~l2Vc*r2^nNu@n5`G^19UF{W-UP0Vs}dSYk%^Jo0%&VNdLw?v zwj5_I1+&c@JPxU9Npebc4OgtB_e56S3d_3#bL?lMIUub(&^rf+egE5(q(aHhHuRU`_~Hf+U|tbLGq+RiBhuj_x+-ECwwS90E$Mnpz9XX*fi zT*560Lg7E?rWtjM0=3Us)P>$#dMu=ipC3OC-74>^?t8VmFVv4X{+kB8Yl zRT*1EM-B_h!Y>3ZH)#?qeFMI6#%U=dQlJB6J)BXBW=t zR*GRJcS8F$ig|nRY&3^y@0RR6308mQ< z1Qe5f90`-#CJwXL2_*s!S#4_S$pioZK@k7|7yy$$CmMg8RNIc)Fc5vO)PJ!24!Lk? zi3qEzt5uQuuqwSg8)rf+Vmr0XtyTYh#}0w5kWjP;oMG&9<{W#R`NL7xWDmv)t#X5uPEgO8M0$5g>;tsti-u=HW^{@whb&DK@`jv#}wIjx*)vM92=0?F)9 zH=uB))JA_Yhkwl`vW)>&1dyzwG>)f{WJ1xFAv1kAbXf`xkDBi!DA$r0sF_3kwi1o) z*d*^mCz;vqngQ3cL5j7gg*ydON+i#g8>J0f*XaA0j2S0KgWnW?qpnQI-&B%<8*O#z zhR7VXns4pTqFKcFh3VFRFPdZ=8Q2SdfLE&YZIXYI$%QMul8xR-HocJf?K0U;6gmAH zpFab9CVq&oLpS%2F6M>66ZWo%fikC`l591h(PAF@=cj;!eH9bO)+?xiJHQ$VCB8k^ zT5tWrC8lCzY?uOaS~YmcVU5$xS18?QsB7d$!;Cwzhi6=t)3tU^OFthjfWuU2^dC?` zLnwdcwRz6}7q=uW=`#I*=-N`ygY^L@@z-}CEL~Rn?8I2v8lY^F>a#o z!mKzwg5}u$Xlpp~q+Hj?fFqH@Ut{cEcFZXv4x(@sW+s&Iokd5#&WSUu1>kG|;PVVf z?*pc1K;pN$SBV7oH`MS!R|MZScT^?VHZ3%yw-N8NgpdKXt1^mK*i z+t$ONrz?D;wh#Gf^Wbzz>#nG2DvU$9uu};~(a{Zf@>A zy|!!GXU?Vg3S}lMkwTG;SYcetN}^B}va(SqwydO7u^_pbLV*>^6$)go=#}|soh``R zRuKgd>c$hGl$w-pA?fBr;>LG z@d)t=2?z-Zi3o`aNeI~xk`j^;k`q!8vL&Q{BxFZOH73%U@kWB(io42gWncYwDMj!l zX7-qXgqwIk_7&`>j2uNw?|2Th7yO5={BXALT2z&$qf)GK3AV!cN*dRy|WC(Hu zMGr=4N2Bb)DD4QU5$MxyoPSEcvriB=3CWJb{mxRuJ#2IXU_S~neY6}*uEz(;xXnqFUe6+@Uvde63g&HNDN1X4L|$c zw`-q2W*J!t3gKW(e-wB>yT!}wlYrahlVybgTS4}-5k*OS&2e%l!pDQMM@;YntgMSt zJgC55X@ip!5+4l95uR7#F>ZNj=}Rsij0!9h5;q0K&#rvMGMhs5hfV$|6)b#Ws1lXSP!d8Bj>_(+SD-KLOe7;@w}&-X%FKy&KltF0Y5=lBAKt z+VAA>2!b_gFOfFDlQeF2-L7R1?hSGJgzTS_qKfpAae9jDb+cK(!z6C!-wg{OL0S?d zU}iQuxOF)be+~*%2tac_seX-@uYwksS8O*)bmOQKxR#iU*%niTc)# zt5vg-IehV&B-`Ky!nB$?(n`jkx}hH-?F{$&cu)ZytJ$YkMqR^&zLhT8`qNMV1ZjVe z>J=JIj7rB!R$<>(tpZzeyB^&-BL^9zU)?&J8iSeDe@Nm+hcr%S3gv<^Xd87EkM@z4 zNBRjZ0RXilE*FjVIo1b8H$T&F_3cplS2hTB(dy&fG^vb@kxC^%2~K59bqqSIH*k=f zj}6dZchyV90Bda@qka|__i=iMycyb|PQ!*|uX3wiPa?cNEwe-fx<`qIo=MEQC@9~A zq1RYOf7wbvO9|prQJA$L%e`OR2N~G6IerB-@gSUO!O!8$H_(SZ=GM&KHQf)*u$}Ni z8kf7283^s8Zkz+NS#Q6a zg2xt1Yd|#B!)hLlUfII+U_2VzqSBSAaU>|ofBa0(yYgt7fT=l}*ruv&b(_ZIqVz^fc{Vy1!4GS5DvGg#ylmHwxNUPB)GIyNZvwtbt zEWX>r$w}p>T8*Iws}xHw&BIe2x%S^IN= zGtCyPF;eQ7le*KDi*%)#su+6XL0ob0VJ+}ClW`ms1<5Ev;$5?&AS3~QjFL@G!!Q(t z_ek6!@;-5Xnu4q(6+fzkL`5ZvKOcGWpn5s&G zGC63+l7uEqrf6x5Bp7RdwuF*u&pLz^=anj{u}8JQlCmed037=M5SL&mr-tGh=*o_W zc1X@Tq522va~!rLr^Ib_ve(<|@IxalOJ=f@(9d+n(pZ&o|lj z<9+-2;e5TmCHS{$nN5Wj4BWAyNLyjA+(#FevoXp-KaAYKcf-NVk4bz&qTsQ9{NR2a zvK^GW2>&C75g80g9QTNOK-T0w{219clW`mslV&ImvqK|W0}0WZ*b>$P001$QrzTDT zzmxVREgM;FYU;@Z002P|000;O000000000000000@{>L%rwR(3E4|VK005U0lkX=u w8_6g_;#~m%0A&II01*HH00000000000001dlR_vy0T7dcC?f{_B>(^b0Ob7|Qvd(}