From 7fd0c5a19044f1fa61ed1df105ce1fc708674d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 7 Feb 2024 14:12:48 +0800 Subject: [PATCH] 'commit' --- .../fc1a15f9-a246-4878-8f8d-d9c18d66022d.xlsx | Bin 0 -> 3779 bytes src/main/resource/Sql/Collect.sql | 7 +++---- src/main/resource/application.properties | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 WebRoot/Excel/fc1a15f9-a246-4878-8f8d-d9c18d66022d.xlsx diff --git a/WebRoot/Excel/fc1a15f9-a246-4878-8f8d-d9c18d66022d.xlsx b/WebRoot/Excel/fc1a15f9-a246-4878-8f8d-d9c18d66022d.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..9858082d69e587b70ad11a7f0f64ac345039ce95 GIT binary patch literal 3779 zcmai12{e>#8>YdGE&G-vqO4gOS&A5I4L)ni8fF+7GqyBLh>;p1jL|}5D=Aw^**{IT z>`V47d^BmZC4}D_(&zs=-E+=7=gfKUd!GAxujjh2#{>?dlcj;Ie|84f`VThRSd1?c zi zmCl~;$=8_twx2G0Uy{x~Q5>u}p;V%Z{S*85CbLeVRn;^nAnJ}Ag~P=IwU zg14_rqE#zrFWFNfdylUW7l--L{1(-ll9i|QLqqF)V5Tw9%2&(sygZyq$TQdYRQFwo zR0!$p0U=yfzbb|VwGiz)KC=r-2eIegI)MF1l#HhVc{ee(zP<}xjbFAhXlP+i=$@6^ zO<9#&rqxl98PndaaOpEu*#r)T#L7sN9i!dAT8M6AHTms3U|xT~!5fM8kvj~0=fqW= z0x7VEJBT-yCwkCxxb;Os%88v|ep2sXexjj)-e5&}Rb&xbt7=UC$ncs%z2AweC(F$b zC#Q#8=mf^w-Cl-~zSv&-4zWsiLWt?C`P;>fplBJQfI&!>1@rF@#SB+#F z7FIk}mI*GxhNQ_L91Jhp`}JNbRVn)G_SC`qbHj>IW?g*@`TQ>A^!%vRbqw!y8P}!6 z_Idrb5IP~IAXB-pxnAL(z+C`J7)1#DpAB$mPVM>=O6=5+8&D{FcF)}z!olGPJBneDRTRdOVEmJ`9Wsyru zVt3Vtx3xVb-&oF6du@zWK5ro6J8U|^DtL1KY zc{)qQKKtx59`eR_f|h861Kgz=y(2jI-7K+vOed5|(FD_LFC`StfOs^t{_Zb{kA_b< ze$D|2;~^6Mh9m8kFCyE#V4)v0BV!J|%=q#qK-Q^bDM3YKScf^|p05#9Csl_V!Rdlg z7=3D1uS*?Tk!Owukb}3Dz>d5JXh7Ztfwq~y!*S@cQqRa zhfJ87=JM5kqD?Y<=E1}g7XaoQ?7>@x&9hXnx&9tZ?sYJ6XgMF0qc;*^?(6M_arFW4 zRKKnTFoouGXfOo-oVZUX!;LLet`!{S>#?ippo{Y8Y*YQ1JmvbVvd4P@+4&%IZPjJi zj6bo^8mIB;Dsy8;kg{UrOmXa)cPG=oVQ|YnDeN{7(SNd)mM_;&$1s~I=h>1-(HGv> zN|jszrDYhUTvweM7Y#`c0$M=jJ&*R^T7J2i>fhytLYPxRtw#_)HNI;Y?1= z7I5*hhw;3xURrd=x+#fgdWlt~7gB>#vHn3(HCNx#hLuH zIVEK{cx~zJS?86&tYC=wqZ__W%@GqX`^ENv+d|%gL54Mpoe}E0H4_S7S!W}6b3tDz z2g1!|$QfESlj?DHoGTwm2Un;pd2DCr$qqTWY?95hH@qrZ0$tPTXDy7>U9 zP4Can%TtkWzQ?6FI6>|;(Eszj4;h$q|1>uBjop=(tgE&q4Uq!{LfSnkA}orIqjNXU zYvDyo@o_Tmvrh&`mEY|x6~~`=%Hd`+R5|%LAyiFy)ek&JI5a>QAeOOZ5#z-X@mf*s zA9mXpC)(3!D*2^YH$>2ns&!aSeH|lLuQ>-hI=xw>h->tEK+(cFvne9W%mAI9C{|u% z+0;v8h7CUb{zR~C(CH%9+uaF^bq5YZRCIwcMV>wUqS#PX$=yClh!*z)=IqX>)O?4J zaA&2W1O0^`APhsHA;jDI=Tit`mP`jasNI1JgAR?!9+V>Pv}t45QI5asB=e$d;J7o* za+q_clT&z(2_KdIto(S)F5cup=R}geC8=6vTDBNtzIaaIg2H2eG$=J%$@B?p3X@lp z>>jYb_P*7zFP2E|LH~I~eP+6t3E`o;pnHd vLHKpnRvN_ng}rO=|Za*;u^C=_3C zm4>24J=%>Z&6qa%P1y6@apQ^BxUiMl?zbzmUuH^zml=4y)5XKCRL~tYi9GB=a6LXT zRyqR)Ae-qaul=-n@(_O%kv$ubZOr6ff!mnRu}1C`c^1vJh_*nl_A35#jGS|;`-z~- z`D7JnK~(0mhRVEBN|z@1*qqq)FL<^>+u$gIn(2fF1IWmdkajM8O51fLe+?HvUmaTY zmK`K;>zZS^HO5U-(xGR8Xz56IbVRp3u?wvpRcC3){rY~Czm8&u!`@bd(rLXLjtP?6tuF@L5adzNU z9kg{!y5eClH6?g{^45(H#BpnTz1eqh!c|IoExF|-KgO2pR9e=XO^~2}oX7kdAOZ0B zppZykpLNk)Ulag>T_H7KxD>d<7sxnp1AY`CbuZiHzEnAc*WjA>*<(jsT^={~9OxI3 z;Sdz-EY!`)VixPvtq-LuV2MquFg%!w4N=cL$x-~FxnN~wb)}(pFo2Z#PRXE}ZoxCh ztQvyb536xztHf0VUj$(nFLn(i#ITZSPzajb<4LHySkAOiI>l@$Q830&ROCpuk+gG~ zHzQOgRYu(SSwIRR-s?lDNWJabuibkY)b{A)$I9sL|!g)TYl46E2Spw z{yfM)r1e~YY~ne$8Q}_t5`QUE2#3f0rQ0a=UA%|-D9z!4=UXkT5z6kF?Ahk@$3z3G zVRv!3ay6wQxYB&Lt)#WVovi$aARCWvc{4v+0oEGxnzx$pSwojgs7jR*ncd*(llb;U zDyPS#z6+e+y5}f7zRSK)v|Pr;)2)-kwZez>2wKzAkKbKVRP=%R-E=pM#*?&MQwind z)!-E2=o6K~!PHea7uUFqu`BNbb0)P&x?q;bJpF@h{$~&C=NZe@y7K9+4QBKU%@0Q} zm8UIu*k?)aWx-ojMo-fFQwF15ixW_dtXCQ}k`g=klT8GUrx@%A$}5-g*^oWFjm(yq&TJoxOf!yU0-*M4xOFvxlL#O8rw_~~?McgfOl|GaN( zxnaNw1NV)8$A8>DOyK`6uw@hhlL(mQ?Fd`{>tC$%&crPv2AD9wKW<0%da0dma%c9I z^8j22VA8gO0Qx0+%d+iE-C4@BkWAw z5VFB{~2gc5^MgRZ+ literal 0 HcmV?d00001 diff --git a/src/main/resource/Sql/Collect.sql b/src/main/resource/Sql/Collect.sql index 25459161..461a941b 100644 --- a/src/main/resource/Sql/Collect.sql +++ b/src/main/resource/Sql/Collect.sql @@ -131,17 +131,16 @@ -- 查看面向人员的任务情况 #sql("viewPersonJob") - select t1.*,t2.person_name as target_name,t4.job_type,t4.target_type_id from t_collect_job_target as t1 - inner join t_sys_loginperson as t2 on t1.target_id=t2.person_id + select t1.*,t4.job_type,t4.target_type_id,t1.target_name as person_name from t_collect_job_target as t1 inner join t_collect_job as t4 on t1.job_id=t4.job_id where t1.job_id=#para(job_id) and t1.status_code in #para(idList, "in") #if(keyword) - and t2.person_name like #para(keyword, "like") + and t1.target_name like #para(keyword, "like") #end and t4.bureau_id=#para(creatorBureauId) and t1.bureau_id=#para(bureau_id) - order by t1.status_code desc,t2.person_name + order by t1.status_code desc,t1.target_name #end -- 获取组内单位ids diff --git a/src/main/resource/application.properties b/src/main/resource/application.properties index f9581f37..fc8ce368 100644 --- a/src/main/resource/application.properties +++ b/src/main/resource/application.properties @@ -100,4 +100,4 @@ Secret=SECd1f1038b6958ab37b8ac8fd61e9e154106d72d7d4ef4dd435d10a11ffdf27215 publishPath=http://10.10.21.20/QingLong/Logs/ # 数据采集系统是否对接第三方基础数据 -third_party_base_data=1 \ No newline at end of file +third_party_base_data=0 \ No newline at end of file