From bcdf9ba69c4a82828a2ea4dedbcbe12f288fdebb Mon Sep 17 00:00:00 2001 From: yqy Date: Mon, 11 Dec 2023 17:22:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../easyexcel/listener/CustomListener.java | 4 +--- .../distribute/entity/CustomEntity.java | 2 +- .../service/impl/CustomServiceImpl.java | 2 +- .../com/baiye/utils/ClueFileTestingUtil.java | 12 ++++++------ admin/src/main/resources/file/template.xlsx | Bin 9896 -> 10034 bytes 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/admin/src/main/java/com/baiye/easyexcel/listener/CustomListener.java b/admin/src/main/java/com/baiye/easyexcel/listener/CustomListener.java index cb48162..74a5c4d 100644 --- a/admin/src/main/java/com/baiye/easyexcel/listener/CustomListener.java +++ b/admin/src/main/java/com/baiye/easyexcel/listener/CustomListener.java @@ -46,14 +46,12 @@ public class CustomListener extends AnalysisEventListener> String param = data.get(i); if (str.equals(UploadTemplateHeadConstant.HEAD_NID)) customDTO.setCustomNid(param); else if (str.equals(UploadTemplateHeadConstant.HEAD_REMARK)) customDTO.setRemark(param); + else return; } customDTO.setDistributorId(userIdList.get(index)); customDTO.setCreateBy(clueRecordEntity.getCreateBy()); customDTO.setChannelType(2); customDTO.setChannelName(readFileDTO.getChannelName()); - customDTO.setEnrollStatus(1); - customDTO.setCustomType(1); - customDTO.setType(2); customService.add(customDTO); index = (index < userIdList.size() - 1) ? index + 1 : 0; } diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java index f946a94..529d56d 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java +++ b/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java @@ -87,7 +87,7 @@ public class CustomEntity extends BaseEntity { @Schema(title = "备注") private String remark; - @Schema(title = "客户类型 0:地理 1:基本") + @Schema(title = "客户类型 0:地理 1:基础") private Integer customType; @Schema(title = "复审员id") diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java index 1fd582e..a851539 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java @@ -284,7 +284,7 @@ public class CustomServiceImpl extends ExtendServiceImplU5Nd=70wI9(CN;Dmy@wKd73ocSGZ7I4DGCWFNRuKUO$Z9ol%f>r zNRb}8fFOvpP*&gD-M4#xoNwlyGk0db@6L}ir3STzuX9OAvl8`mumvO{m|z99X#(fL zvg+%CBXC-i$Yc?BLJ0A|^-Vd`WzG)y!_Yw`fh+J?KF)>a4gFYmO=F;DkV&RNY;M+V z1+4_ojP_gznP46HWALwID*<7qoEY*6D}O|^5ws_a&pY-lw`E+-6`P?Mw_&G(hVATC zZsl1r8_~HVGJnHv-f{W{%yRV7CGj^*49VI8d_{LdzXP5CZ&E|_e>`(##zbC{`+mXB zieoB4Ir%La+?p|c%j~eYJQps_Mr<8CagJyBX?j}Qh+#K0NS6=d1&lpJTW@y=qTZpn z{0@G-`O=F!syEh^P`}kq0^-6pB;D133l4t#ZiiP7Hr#{q;&H3A^2JF5tlZVS%8j3n zBY+!sh#2*(5}eHPBbLArWH$ZddlB7dKRY&!jP)*&G6Mhr3cy3dMOBtG8ah1LB_$FX z(?=LQqQol)V-*F!l5j$>9;67WtISQ`<$(Y|CMi~#oDJJgN{*TKoffCL%lR5ZziK&3_giFP1Rz&T~={)?hf7w%ped*Kt%LfrIQT>vZ-~| z92r2?5|F$-A$_rXcCgOl#&COHdnuyym`NR76LsM$(eQ&F4sdxe)Rh$)j}}!oWdm8f^JWT$?fUZ`vuXoSPvMf>=+Sg$tZaeLHS=P`;cwg>5sW@W-W~=To z)6}h>e9e5_(VjU+?8eP(N|DVQ%a>Kk&HabpSYCJgsQvwR`r6`YoKC}GjTM+X z%zSn&u+IcoGw9!tTRXe@;vIEGG|HF89{y8Lc5>`A+vu&I?-6OlEH_eKRM~%3#ytq+ z;7A<@WW?OmEz0ILJCQ6Oy%*@Zveb=M&(2|ydW5pdx62R+NaEg>k2~)WUEP243~NVo z=8(w1^HEsab0~me=7W1!g4e#JU8ScokB7OWeOkJ1O5MEZ=h(?KwC7rr!oGQA9#^x@ zibV8NuOq<@>%&wwcgkwv0Xgcz?C|6PHz6H-fVK)=>bpW?yQ+Hc;xqiXe6|cMq`ifF zCTz9%p?~$oP$EJk5HWhYKeTRj?lO(Zt&IVSkmtw|vn|f_6{$b1ho#|z;MK{ws3?1X zJ$bi42>>KweHdUE{l%xv{e~tAnKgAI_fejyPXOkbotZWMTUK3VuBzIxzHF9eFthyE z)(N*Qilg!`3CCAv_#6)2@K|NSLhjJ3&;lw0A9(4yjOXp-PM%MED}az@KC7 zKku5obSjw`C@7ksLW|3N^(3}nQS0mqRZO`^yH_J#JI&$C$B50L%cUgm7`Q`W1!BYp!YL&JWTX4DrLj#|!h?v|lYNGBmXPA?nG}exaxY|#*^~Ee! zes&)YSbDoBy)rdXZ6`E`n&X)demYEzXBfN7W}Xo$qqoKiHgbgL_~MH}Zgbg;%`tPGt6^ei7LmsgNO8 zo9yP7bjA~(+^#LDnZ9@tP_oi4KCB%#)w)TpOX2-ccvQ*0+zrnYcjbN5@hP{`Mgz;f z(-Uz-2aLE*pOCU8uWDI~|KR=l{iOh0r?r2OrG-d2g-V7-(Q1~kXs06!4XW&w23t0P z1wS_j*8uDqoe8W=F!2-~quPN;<^ zCELRznl493v51V1RMJ@15G7cF$`vB?G-C&2g{z8XbXfi3?13nuzWXdwuIjnIHf>Cw zxuemoD|}rqIKseD#s%MP-1x;!cO9=8#o0!4$gZsy<_Ew0R#)P}v`(xV<-VSh6@+G< z0JCoN^VLMM-X(-_5WmDx24)T0xU@q4AJIMrI<%)HWvk@i<)?Wtk>=`x5%I7eW(I&E<5_=AG!HHYZ;WE~ zqlW!Uz)wE#NdYg)FK{gb4Y(9$r{=*!E4e6eQt6D^uJ3eJBo_B|CkRXBo5qNq(x9I5FDJ3u zf_bgFFo~LJKCiIFgOX=6Hrd0Krek=`;1oGBR`+~5w4PUH<%aNo$qGt{$h9vH4p_{! za?G=K%L4!}>a^hW7g0Q)+Cp16j$X{teXC@0Nyi-Z8h`UV)Krb7Q&F)xrVwnoaOS!1 zIbx$A0~CZ*z*_g(diO3W5j#V4!V&WzPNDHv$RTr(ASv)%e!l|$12BgqeWok3D$A8wL8KqYX z@1{=jzdR~rR@uGJ3&E~~1u!EDTxQSM@+(-z6)Z^%-9au(cVbAguf&&jA!Ot`zrJzt zJLY#Qjc_lmM1%xVF$T+Y`xzn%#z~~*OSq8rTpAIVjMc^l1axu!26E{=V}P#fv6O06 z#?JOs{qptKV|{akaB@q>K8mcj(QwczFV}zvZ~Jv8c*%9-Cqhr50Y)`*elA9`YOVgz z5qJDu>DklY@LL-R8VLIhntxa+y6LONW878p8VQoV%l{U}Km9ZnX+%=pjsF#1ccZ#x zytg@Es->M#Ndq7=+)uJtNkXX>t7va!@o+FVIj@--^g|1U>xf=zHwfwDn=zE&{jo6j zc@2b#Q@QxMLVTa_kwU3~H4-J=D$89fbv}V5;PX0xFjL!m%Bm6`Yh#@D_fm)F8F`A_ z0@+S(d?@OpcOv@k5^JPKwBEs5+M-O-+HOh~mEU2DsNci&z29+Aj*>VTTbiW%CSe<= zbfL%)M<~fl5^HUU3fkQ`3+=-06`cfzM;KvNiu#9DE&{^O?Y*BcJBtD)jA6$Rm9w8e zCU%n1p~@!<)ivw_$=WGO1q#tY`-I~at@n?4*MG6WptKi9JzW6bpu+@r+G|T)tGXs= z@jxo}-e=lk&Rj7g6&h+EUTSME$MYH3z(^lzszH@*c+5e$ilaw9QslD&b4RK2&1u(Z~*>pV78jAKPdq_T_E zBA(U~_O^{2lq0j^<86nEZCTOhUol5Jhxe8`N*;@8sVZ?em6c;pbwfm6dVXpHHc8J823AxSLOy|{tJCHP-$|)CRM)3# z{8H*K4c(y;*fA+=ANv4?48~=rjN0l@fgT`?xmMgf%^D!7_&6NC3`y|BsINjyR$pqy zmNR5}>1GNMbWN;iQ}I8t^2+^x=j5sD@9BIg`irKPRnq-E89M2 zUG~w6_kQ`ink~UoeIUzZ;J?M5Ls+WF7GrYKBrO)mK5;jR;6*_-s7Z{EUUn4Byx zUku=V@Kgc0&hLlxItBf|tJvY+9eexRV+;bY$g2>HMvBBEAc9^aunm4A-Rm(KR4?=@ zMXoAns1Ik@5%f#WoM)R7{MAv+(cRIPD~xlEeV|r2ZbwNu3NQCbm*X|zNq4(TcC=cr zDTBM46W%^~HQ!Q^rB(LM8vfcNSWC57j-cu8F+ti zOzVOXBhtCJ#7bs#m>ig1lF`}DY^LWlzqpr|Ls&>^*xsMb;T+6s8eU8~Psb3#k2icL z>c`Hw4}t%GCw-WR;xY*U04K#dvV$?Ec79Xh%y;wZE*y_JvOy*kP_rWXN|Q3d-t~hU z;R!b@_(EKs$9ha*=7WKCOry9GVsKQ{cFV!mfo1wSxoMUjgH!0bW2d^Hl;{D&d9wi- zQ&QavXkjt4aJx$8r~03dIbD;@s^^QNG*r2Q9#G%f5a3o2vDElwJg%?G`}7s2fK2TT ze6;97SRPqE%2J%oZl7CbjXS_p`Y{(&6Yk9@w@rO zKecBy*6n5dYgsxi)v*<2iB>ThOw!oTuILq>9l0q4z``rl-CTK^&>()tYX?Db*LVS_CEg%WoHA_5fB;WkFD^~cu=(z3vNqUMLZubh*@Mf zXCcQyn(2tR21@DQ)@WpL zXaR?+O^qgH#oX7D%M124eQsd*RZnt#5@Zv3;k- z?yyt2;_bYBTI<3`1$)txr7O?-7dJzGtwdcuUQ?yqV!yT>{&V?sXASe05ylU4Sd)^h zUS{j)-`NCH0|%N2N@nX=^q!34d#g_NyMJ>$dJ@xrC}mh|9J!ez#qf? zCrAKXzflu=7sh|}zy8Mn0HFOt{*J$SIQBhE0k}zpCBmdh7_kz(d{_VJJ^%ppxAxy+ hQEULO{r?*EDP9x_HCBR814yL6hVcoKB|!fy_!s@BH&p-t delta 4273 zcmZ9PXFMEUm&a#xf(cPVqW4jwMem)NAc#7mB!baP5KN-aKL}>j7+sJcdQ9{#dKb}4 zl<0MIEBoy3v%BZTx##mazjM#M_uMz%3TPpuECWaolCVpQ$^i-@>||7@7g%5TUG9Q2M9YM`f z8(;58fqn&I?*G#JUd5E#ocKv;^+E_5)iQEB;hHS$U{0Hw$E-}hYT$Q@ z8q4}aiiPwz{$e(F#1H%~;^$79?2K`S(OMUaY0RvI5k%rC3y=DFuTO~Ff89tA@jF0E zTIV`HM%1ps`C^yW=lmrY>q>jSYqM~y7M%K=oz7&YfxXss0G}zZ#AhO36nmB^&24|N zC`#npbIXp)`Oq1L&#c7l!62(4%O{Mwhzxl5Iei6%)_a;ZDUBADc@b7md%D87`h}`6 za{Gqb!7=zLDjmYHe;)0JXB4!P$pQ-k>g(bY&;S4c5sW=71F`^s^l*v9ogrbe`002TlR22a$!pd!$l_n^&>gKKA*K(Ar8OQW^QsJ*W z$mfY5xqE?3xgj=6ORi19^bZS=<}N{`5xvs5880{9uPjyUZ`@&NjXCN`Pw^T=Vz$1~ zUR`gmE-`T_>@_a-9O)0wFKqZ+of}Kvf4wXFRw*tUN4u?3rrTM+uH==;a7SLld|4b+ zi}0~nEy17Tj5C2Jt+}PHRupiwjWmR{Rh7_`N!k`bRHV&^IzOySqh5Z6V;wkx1V3 z6pLad`5@OOVjp^(x()(E$-#8wtxjv9h+$`DsgmBYcNSfLD&p5|;qo3sCPzW#mh?1( zqcJShM2G_j-u%ovJgTe~gKW;&=FXH0zx{j6zvE@CqM|Jcu#vR9v`CMCf-!5)yEt!$ zEzec2?d7$pg)cZ?R3`eT0Iu?Em|q4HB+;fBH!YNv=6@1FU3o|6WRKw_>#qJV!e2n+ zet7YzZdJ4x6uAnr19B|GHIQ0FOop7GSU@y4ptKDrGDw%Q!;*3a4BZUlyN<-lJ$J{5 zyoaB_nI$LC52GO^x(-Ak_$)y+a@S1ne{v5O3$^I4e+p?-WK7({G0%9r&05pd1>m(Qss zfG*Bq-OgDrMe^r(_Zwmx2jp+M8O&wq*LwpI9@H!mN6bcJjPwta*0Ifp$PFMM1_pbq>SpXs?Wyc%AI_@phCc_Qq-(@?XE{o%93=kM_{k70UWdQEyw z4wvq1EjvB=Bp}1Hi}b>E;jz)SlbP|uCMIvoo3iX+TvCJav&7)B16e`gJp?8q;Lp+c zrmXcnT4DSlvwLM@ij)|W zf+t}CFm2)FFZrrS%ki6O3&F0xMps+{<|cWT>-b!Vqe zh~?|(j}v`G_HrYfK1I@;{6KtUk}51B3!NaBS(tSB{h%k&4Td#rEU8znL6n8#8n1Je z?>3ZoTn~#i`dAp~BKeA+WsdcRHC`?~nr?piNukxGK*65a^PLE{a=XdbB%aG0^q7NgBe#3dfFH4y$Wo&FH1A9r$bfOdc~~)ubQsnC_W$aLryKgYD-K7oA6=C2`SVLrEl{mGc4lU|<& z3HD0uOOwb=J(~YzTsmVT9q#0`ofAiBvlBl)USCMXsQvi&(T7WS!s+6QNj)F@G;k z06M9H6!vl|ugV$?SLoBT9Mt8>i%?z#yW2Zl)Y7U$*Qd*J+Y!^>pdV~LEw#Zvl4Gf5 z-3F#2Z8nWY9iRN*83M_DQ`LVcxpB!`Bq%cW5n_vDy>3319YEsWTLok8CEi`AUl4VX z_?T49Zt=}Wm!u1fGTyDw(5-#%V^DJSeJEE$-%F0F<$cXD730+8NM`g!AZg*1Dg zIVZgsuXbvHebYmzS~Ogd{rndF-FO_R;Xh@BIhh9>R_o-$h6QHFlC1D-FZewxb4nlg zcVC;2L~niN>h~V0yd1W)@=A-ps?KAWver#=*4^><7%nW4{mqf_ip+9m=)$Sfk>adpi|OQ zM_-Nx3Izf(76$lQ($jZ2q*&iWZS&W>XOx9~6fhcS8%ssw_E8Nge{>vS%ouBEL_W$O5xx^n}3iR^;w`Ap7iaSd|ZByoKlYG_wv}b zTWYe`i%(bS{OtSQrFt;yHF9k%({zN-LM5jR!3~2R9hy-DVq7mve7Q7XFjZ#Plk9 zt@UP62Fe6`^{gsejzv9D<@y6j`epih+KIEpDG9c9W>JetYY}V_b*~NEm6puvX`R|U z{qH=^Ad9`bld4748pW?gUU^r=zdOdAaFpMur2B}A8FfO(hp3QYHA-Q~+M=D1F$F>$ zLH5fYp+HNTsKPE~N$K{fYWvq`^bUmquL?_)eeaM_`$%@XDJ$np041OE#nP$wcuX5n-!y+exN_jR!XRj6m_Nf zFJV-2=dU+UNWXSh9{X2`e{GoPsrMXdXs4D}2S^UL0he-td@AAfuqpk>!Hk&9`a8mV zT_)(zcbhGh=ss>a=p(MZg}L4}5F(=K^sM8e3DQm?Uwi+}GYNl5wi>Z(9BQ#LlN*oo zspZ>7rALly<1E&1*;a^yL9F`P>_=k?vSxd=XsL`sZkVmX7F0}T^eR7LZ?crct- z9iaOVJJxc6kIs*m+bK65Sw=M6$WcWs7Gy>bHr4uhU;nv!-Gw^HJNNQG*F*fy>mP2q z4)8dE*~Zb>3ITBXoM()RSG{|WcVmJPlIII<$cKC}TCoi|GVi>P7N|&yF+HaiJHdxh+53x&E=m<12DTM z-s&WA`?w&=`+e0l>p>+jxrAFll+zhBI^Kdj{- zQ0pmLTwdEavmGDGN8b+)$jA_`P)@E`T-q6gDZEMhC(3dt-|~L&^%UZi1^0Hjt>A-@ z!uj*d-X~Hni?q-do(& z#YtDMz;6)8kZ44K5%7pD-$kZ8^iDNcbW)pRFr0g#5&q?!pm+v_G*baKfsUCZG)t*x zu&>Zvg580F&p|A=bsQ1ZCz03JA5Hd*Lv#`?`m8mvs)CW-VbM8QsExK%V?{s?kJ|vn za2whS$sO_DhPSQ4fCazMCYstttUSf@ac;6I_G0A1)Dl6Um8I*RbZz>Dc4D}wIez=`P{3~LUU5j-FKzJ3#UNV8DuMcptS`Alq~ zNt9$Z;v97~n^yhJZPViTz%{5>JiRB$cxra~b4veggZwmj^Y^N39K(T??IcwEQ0usn zv>2W!aDuVjt1o{E+kCSZWMi`hC%@)aoX{Vp41F?`43NCg#qb`F?#fJ`vHV|hpj_OC z%-(VY9S{Y3z=)_U|JvPez^f|=9_SmaG!`8b(>K)W*ByBBqfhsnF&Tx&Xtll}uaI`1 zu6Ey#LEUQO&w7F;72lSBSMUi5836wD^Vb;n@bdAMjZ6wd2ekSj0u#N$TK)JvdB5p@ zb0-0?>Ko@Bgz7~|z7B?>A}*}-xdsu@%X2I;)nA9~#~C8upQ}cPTZb&)KQ%nRXh5V9 z1M&ETfgooq2X-91eC4<2U30B%9dbd`VLDr;dleoBl~~=(?XpI>A|jdz^*yq6O2f3FTfzZ6#j0szvtYy`S}0zbGg;4N1upR4;VWZmrUg}Vs?VMaAb&1RH^@wv{9zP2> zT#;WBcvheh?^Xt7#EkCqW)pZjhK*gM2g9v*n0Y-ioLdry<3?HBy^Uw)1Z3?%)}0SY z@Tz(pw}a}Q_a#b*&&229O+D?(Nv3x=y?16nTpM|GpDxg?lhP1}L(-h{IsR^F(Dr_@qvS^-=DO$Y zs;vAPIk~+!_w+|FxpoQ0mKh;VZePL9ckcO6;jt9ZpYNgyw(iBs^wzketI@RxZ18W6yG>!ne|Ts#l{hdCes0L9