From 0b39a1454dde4d1c090440f9bd924e311e1cbf84 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 16 May 2023 10:15:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 21 ++++++++++++++---- .../task/TodoTaskController$1.class | Bin 1573 -> 1573 bytes .../task/TodoTaskController.class | Bin 56411 -> 56568 bytes 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index be95af1..9af309c 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -827,6 +827,9 @@ public class TodoTaskController { } else { queryWrapper.isNotNull("PRC_TYPE"); } + if (taskCommonQuery.getCreatUserName() != null && !taskCommonQuery.getCreatUserName().equals("")) { + queryWrapper.like("CREATE_USER_NAME", taskCommonQuery.getCreatUserName()); + } queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.DRAFT.getValue()); queryWrapper.orderByDesc("CREAT_TIME"); @@ -917,7 +920,9 @@ public class TodoTaskController { if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) { queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); } - + if (taskCommonQuery.getCreatUserName() != null && !taskCommonQuery.getCreatUserName().equals("")) { + queryWrapper.like("CREATE_USER_NAME", taskCommonQuery.getCreatUserName()); + } queryWrapper.orderByDesc("CREAT_TIME"); queryWrapper.isNotNull("PRC_ID"); queryWrapper.isNotNull("PRC_NUM"); @@ -1112,6 +1117,9 @@ public class TodoTaskController { if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) { queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); } + if (taskCommonQuery.getCreatUserName() != null && !taskCommonQuery.getCreatUserName().equals("")) { + queryWrapper.like("CREATE_USER_NAME", taskCommonQuery.getCreatUserName()); + } queryWrapper.and((wrapper)->{ wrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue()) .or(). @@ -1284,11 +1292,16 @@ public class TodoTaskController { if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) { queryWrapper.likeRight("PRC_TYPE", taskCommonQuery.getPrcType()); } - + if (taskCommonQuery.getCreatUserName() != null && !taskCommonQuery.getCreatUserName().equals("")) { + queryWrapper.like("CREATE_USER_NAME", taskCommonQuery.getCreatUserName()); + } queryWrapper.isNotNull("PRC_ID"); queryWrapper.isNotNull("PRC_NAME"); - queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue()) - .or().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.STOP.getValue()); + queryWrapper.and((wrapper)->{ + wrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue()) + .or(). + eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.STOP.getValue()); + }); List list = iBusProcessNameService.list(queryWrapper); diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class index 6ea4d308767da25db91226235566866d3e6b443f..4c20034610446a3ea0428b6658d9286d2d50b53f 100644 GIT binary patch delta 25 fcmZ3=vy^9p5G&)($-=BLjC&>*u%-jqH&}fEYL^I( delta 25 fcmZ3=vy^9p5G&)x$-=BLj9Vrbu%-jqH&}fEX^#kY diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class index e72e48b48e0fe2f19575b228ae1671f0c36da60f..bb98d85840edde0ec9a1cb7120cb01a2581c343b 100644 GIT binary patch delta 3919 zcmai%dtl7R7RS%bIcJj1?q;)jP$YsxMI;fgYKu^$o()QnXsamos7k44)G8@TDfTv6 zv{9j=^{UjXy;54O+om4%XoXgh*7ZtgX;H6x_O}~<+&}L9YiECR<~QGSe)IXx%!%!I zV+U@UvC?)K5Db8_dsh@?dQYva7t?4fWPJ@aeLvw3Z3X*M2u%vl_Wj)oy}hb%I`)Mq zZ(d;oPa4d{w(u6Vha&6%o3JBn$8^|(kHZP<1gEhxT*5AJ9lI)n-Bcw2r1|Gkm(>;d zC$nms4gm$h3boQ2G;D|7+O8dYx+%hf|w%uC?Ju@HshAQoSS z1~?v?-~?!m6QL7M@}{rZ;+_t{_$q|r45)!KAs+L*_M+joWYHW6VD@^a7A^YUWiNKD zjW(Xs#u%IG0i-IVc4uKS0L}#m&Vz8A54CZDym}!d;UZ{>i=iueArs$%;g}EO@NJld z??@iYU==QhjrbmH!vZM574Q|l4+n4!9LFLk$F*<;Ka}saPPuTsO2G}PCvH^PxJga+ z;Kyn)ZdR-C6SWq%sLi-lmEbnD54WpJxI^8-Pt{%AsTF>%ow!R!;%*&{U+5P2rEZIR zbU*xBXXC&05d21u!f*9BEY+{ze!UzI=oNTSe}UiY@9>bmh=-Bz2s-d6Ho_mU4gQEZ zScaYn_!H*h&zOfNaUuSK1$YWe@HBpnXYe;H$LshjCE{61#&eX47pWOmPGbq*9V; zLCGeKQcM;#F;7ubGlZI%vDDm5qZVc^J!IxnOOsCzn|J9EvyL7$+o_e=Lv4KMsFC1_ zSC_zrK^P1!wH7kb zb#f^z&~4>eD4&E}jKXT*;?v-ngw>@PCJSb#m5EIm&eH=$7AqI$;seq$dI&YZ8qx|f z`H*5w!am5VJjd(}cuta87Vwon zl@e=7DXkJopv#||#M%8BNu1L!)aOlpp*prosEiE)zZ9RFSyChpeIBNAAUWK98&Z8P z78AqwU^oPOFBexYZdN>Bh1lzgfka7e8Db#u-pWsgtJl5#wut3Shz#NTmR-DmOA32Z zIg|U}_l`sGG5~duqIZOFdK_v~Cy1x6kV4(y5$XIa`uf7naeaGVCfS$Z07(ld(bS@i%7Qt>oIHKq}&wTDKj-t>YR zOrzB(dQr`#F=`#B!2l&jNds_skEbQVq5 zgXvX0l4j_!G*eHdS$Y}G)&(?2@21yvDb3XvXdWWHfp!5rkrrTUdK1UcBJ_-R4OIj^T*#aDjgZ|E!^rGN7=IwziTp3l(*zCjla(IxSc zN)thsO*CCGarC=sMt_*Lbk%gDKP{i=4s~Iq>^1c;PFCAdNU&)2IMq7%(2tyM9`FQ* znhW1qB!%d)0Z$0Q#DEjH^#zz?4R+z40O~GE3jpq>%~dVV4xk>P3y>_p9eTGuW6kEo zCE9_J9v{twYK29(i)+H`7U5x>3==HE-JB}hln?N5o)d742)zu0ErE7fH6ty+gY{q> zX8~>#PiTzsf_gCI^ArnaR;}rX1+$U$wo`{$Mi31if1u9^GVVJ;M!*R=nh>lnff~9S zjSpf2Ibr1SxBuk?R{eZf`|BrIJN#7>ghTxKO0UzOr1ZM{k_B~<+}@{I0&M}M(eiC9 zrNVkZskDN?l7b2Mr8EpUfeRA68%v_8_C4s~UG#ZuaYad#vgL~bRFjnKVgO0rmb-@i zpHsy0T?5%u&cSTI?*yCS1#yB~;sm$F3GRv$+=F=5ki-b7OzbYla3IT%K82)xV= zn9WXD%r02XVX%qAVH-z42}idAFge-GDF zQ#elLal9(z`s$zjpep4AwVxB!ac-nebCNpG$y#%Yc5q`I&rNj$Zmv_gg?^YH((SmV z?#hqo5&Wng&8_r!ZmpMa8~r|~>0R7bmvK9Nnjb^p_886`FrCw}Gk3;r+!eFA8+r!w z6F8bPa6I?G+1wMCaxYxXz42r2gWEY1cX3}V<9=Aq{jq|x@K3=tk_S*@eu@V0GcjrH@JZ3^GCdZH}IRhjTdqWFXH{Yn2$^ES$>NvINt>G5{vZq zP)8L8_;#r&0lb}ZjP`H&p{gewvFLH=b^*K{=z*%8UhfLb$jWhhdp|#e&*RrvfO4Q+WX82yPWXIZ}_-=Y8Jbflxg{S6I57 zDo(uHw}A(#1e%E{a!LqRO=yZmdWcTNT#Ix&50c|-W9fD9Heud(vYMxZRm>Xsw0EXq*r@!c*ASIBueQo4hzoqm{{kE{av2=*6H2oCj^O|W(N zGnZbMKVRu}`^EdP^-C7g1CnKgT?q0?@onms0Ex3MCZURq7ssPt7p zyjoPPk%LYVxcMWf#p|FhuZLvb0BO7lGPoFe@h8xSw?eiQ;d$N;mU&Y!_7E)gDg z6@OHkppr|$$=^W~?}J$04~cvLn({$-l)r~AdE47*_G;spni zl-mvACLC&+2#7V2kZ7uTOApSoMT67CK(wjt9r*pG8jZkalE7h-!6m=dOk=2NQlY+S z>PS*6jRJ?0OG8Kwm)| z?e(rZw%GX`MA198oh#+8R|s*q3KDU3amI0{ F{tt(5MP~p2 delta 3776 zcmZ9Pc|eub62Rx2nfdO{-RcGq?12=0StQo=WKFEh z1@#+>zG%g1w~oK7CKBreQF8#@hSnCH5*=%lPF|C!diMmv9B^PSh``=Z7yCdQ_Jw5Z z2dUT}(s2NE!GX{Z2f<(*4A0;bFd2uyEF222;4oN$!{H+w0iWVO;Q)?=gZNbG<+YEZ6<ArY@4E3YR9Zzd=2p@#ekMROU&@NtUeGZe>F)Re2K3D;0O z|4IplmlBP-)Xa#b=0-Xt867Cu$fA};KWb$>Nh!v7YHduQR3ncbFnsi&v78<BWz44QLSuA@ zWLM#;xkgQ3)&0SaP8qYJ3$nz;VY2OkkQ9N%FhLHnf=42HyLm>K1Z=T+hFc#|Sw8a+ z7mXB9+_IsI&Pp7c+i;(IQVk?vIC{Wi#6kn~Vgz{Pm3QhKbqnnB)^C^wIw(yOM#`9z zR;xEnQ(e3nmg|l(7RH~z42;4$;N~*O!@44cYu{`Ms=!TbP{s502)PNvHJ*X@iDc+3 zO2m31S&TerX&%A>gzhF3V`C_xBpI_p31v6em}vx|oGZ=LLS`Cy{;qeizIfO4scr-| zU(l)gy4=HbB{mROnl2JWckpha=m_3O^jtwh1BoYSsE)a7sI0X>(3C)~GEEUZ3?wKu z0g}9)+mI4SQPF?H7_eG&bBn+82N9)nN|!0S{iY;{D7jrLNf7b=jO}Aou7BINO?QRqV5p$9z%xs(lg)B|SF z<1n9k!ZON%*Qpn*qTaB9`oJ#g3kRq_RL}spNQ2-e4OUD;R5<-ZMbp33gEUfQ`e>Bu zL8H|;dP*&$G3pH(t9DSXI!5EvS$bNXqY0{pCaPMRq;At>9Ys@g3{BN(^qg)_c{-D( z>uh>n_oW$n7|qr*$*1!vUzgAv{VvVbhiIOzr1|=1T7V8(h|#nNd(jf?OE2O8T8_R^ z^b$TzuV5Y(U_SY=fL_J5^crrZH*hz-iDguXho}fE=`BeLZwvG*2xuk6&?;(A#Wb2q zXgsZ@skDy#w4S!m2CAS<^n*xMw2gkJo%APt%nmxtVRVE&bc`F(ac)j0xD9>f<975V zr_(9!ME~U{>1!TK-|&2@;6-$Xm(#brlD^|jbe4C}_q>yS;Qe%tzo7GcnlA8GvFpAe{O#xnLGRIrV6nN_Ey+JfwVPr>EPKd*SK{;#)e$-$$z<87OZ0gYGZ*G* zr^#{{R;ps33A3C2ge4}-;T#6fnJ|0UBb6usvzNz)l0$@^iB{7-h^>S#&cCwy@~rThR0lWLtDoNdu)F_qJ2E34(nc0Im`2 z3rbt>8_vFRx-3y~wxfTYH;tYIn> zEMkTNwn8D>pqTBjogHwHUGNo$!}s!HSJltf&*KMm2|uKFaT{I6Y5F|3)wSFX6FD7Qa0g80PME=+u?uHn4tGJ{K+eLk z+!beXH(bQs(a(=z5ocow_rP5&?FRS6W1NFub1%Hky~!ih{9*1#nLLoPc@X9DU|PUW z&^8`Q9}2B|rPA-`XQ-Sf(n+2qq)w*GJdJ92DqZDgsg|GPNY3MEp3ZG~rjOHk7H9Ho z9?tnZis$gNJXikC<7GUbU*-i|$P2lc7x7kJ%)5CBf6hz!7{ADud6^0GBM_?=gb;SC zp(etCqFxyyI83F&DH9NKr;NgEm11^C$UJc2-20HLM=*b(QH*bP|{4P8pjn7lO1*Y&;$meaakUtP2ca%PQ zxS2}c2QEp1QPKy+@Tbs%%ORCNgZ6v?y7T8Sh`)dld=SR*A(+O8{VR^FR3}R_j!smg z&dHhQp*dfG6t09c{!z}l2t)WM7{ygEo-aWjUxwLSE$96VFLMnP@fBFhzrYs01|RaT zaDZ#!IR6gc@O8Mre@G^{0XO-kBEF@<`A^9Pw@W?8yDEWne>sD@$ZXd8r!v^JOFGZpa3Ae~CbZYz{d9qAC`8dP`86C`&