From b2b7181667fa96df38134da867099b757ec81a75 Mon Sep 17 00:00:00 2001 From: LegnaYet <1023868505@qq.com> Date: Tue, 14 Apr 2020 14:27:16 +0800 Subject: [PATCH 1/2] excel --- src/main/resources/门店号批量开通模板.xlsx | Bin 0 -> 10824 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/门店号批量开通模板.xlsx diff --git a/src/main/resources/门店号批量开通模板.xlsx b/src/main/resources/门店号批量开通模板.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..89fc8f21be5587696e4e85a94c1ca0a03b3055ae GIT binary patch literal 10824 zcmeHtWmKG7vnH;=Ap~~<1a}SExI4k!wQ*?N2`<4s1a}DTP7>UMySoGe3?$z@=Y)Ia zu9=^+*6bhs_UbO#Z&mGQ*QzRcDM%;;u%{I)yDISX{I3Q7_{GT9P~O4T4#*(?NQU|N z1KcmNABb)bJm6qpwh&-osQ)C>x3i;nwYEx+{VEB`gc*3{cZ6D1z7rJ^pNuKk6QN$w z7?sRptw#ypFr9s&@x30^6H=`;!Y@kS1j31?(cUE%$m#i-JhgN$j16^!Gxcn=BbudR z4y%_Q=vB>0gbxhLv&yD1CE3CgcpG=?G0V$|;`@R)9P1^pmGo4JM7}&r)fLqmFMTZV zodR#rM>}J4)--OAu0I76A#xN{3A`0}PrEImn?)M?`O;YDP9lmeHXf0$vGXd(xF)Aw zQ3sa*zcF@Z_MLD-Xlt^zk44{b0z6f9P(G5GgKxH5$XQ?70(C$g`&I;ks7Ba@H7xqRSCwxnS-L*2LCcXO zE0k$_SYQ!1o|uf~o#gawWt?hF6}lS41Xe;cRgQt_?D!O^GwpozB{F_coIT8URwO`$ zp7{g6?fsYd>h!WW4m%yTd?7bcc?eNf#blX4!VhPTVdzBlG0iqFl+92Gzs_s`sA;hx z{5_`C?F4=0NC#YLtODyu)Wa&VHAlXij_T*s+oWxhyj_6Nq}REIu@mgannJB#_g#Zz ztc66o5T}O8135XtMnecA;YuHK4mJUi3@m+T`kCHXfVGX2l!u5Q0l3AkjgLg(M z2>eeYHD3wSXEXr)r+SqRI&sa2dj*qB9>HK5b8 z;L)EiKdOYM~CR-3kzo^&E_X1e4`X|a*7&5v=ql-8~TZr zjwK~L7O;+@w7#%;QS3yw?$6Df&&L=~Ln>BUtb$r_-j7h^sZfc|;z5E~bfQKGp&}v5 zvZuV>;mVo<3%x;M{z~=Ko3q<%Sm|Z>xpIXf2YKv+>(*^)w>)Q!vKflbYp)x3z4kBbJ8ub)oheGo4k?qzTY#% zmz#G4L ztE}*M$ARMG;TXN_V?TSuQEh>pGotRZ@Q5bqjCC=T_p6)SP+xK9v{{{MHKY_gwz+8Y zXJb!htU`+lxbQkB@oQsJcCL~*;7;`Nd@?w4o$N%>^032EN&{!9)~cL*XP}+wqtAW7 zI=P)@N=+yA7ZtF%ci)A}rXzOKR{(wUU|&pR(`KjyyNNB#C``X|+|?p>_Dx45=hMqV zzPKvk{=&0M8QD0MqqGH4iMX#tyaNvDR8VI+nQVbSwJ`CVgTQz)!gG9|V-5l)I=FLt z&S0~@sV)hHu5S8ecsAg>x}JX%m2L3LCdY_xJ+)>=<`*Re3*#-3BvsR7XJG7 zDQE-inFg@3(#V>ak?#y&2b3AzDmY?J742zaZePI41;5qyx(skRIYGD!OR+l{KuC9h z%q)}7QEP46BDIn1T3GmrK1VYu{jLvWm~-GS!L^~ z@F63@Ys41%?2X!eyvPJ9Y7SGCUOZ`YZC*LVj9ptW%9KJY448;@uvTU>3N>aTZMs_6 zB>EE}*F7)u8XwWo{PCpzZ%!%muTvT~WHbMC8$sWoKwY72En@P0}I(%!NnxUFc_}O>0&?EK@ zLSkM#;-%z0l<$(N?Gh&0jqo;j2*3}C;wbcc1ZwtSM}KrSBpwf)I~jF;D@KP~v<$aV zjq8UkqJWse(`36f-LCdJ6*j9%!WZf(B!o421^nlOfq|DZ&0*87T%zUS85p7S4Z!u% z#mpU+qRUqmA4^2ZOw70Frw#6+eO8Vn z#Rt`4ap0w8&?6>r0VZ!GPK(4j?6v?ZtTeLrjqaP-bU!{}MfFVF7wWxu&6IlR5#^eM ztD6$Lg#pJpF}|MsJ`;AvXDYO_^9Uo06TNtqLT9_FhQuX||^Dq5{IKnj=b0VzOS0ZyG%d{WpNS>Zjz|Fyqa z{=dKfU-$RF-`G!S|KpYJXl86}{4DLizQ;$6fB^$b!uy>l{YCbR_}4vsps{3&$A<4M zw(4DR2(lcb)K;QPPhr*2-&19q9U)8)2X6Jayq%S8YL=N_BPZ_`@DLPgKKAjENQFXQ z%gi=3dtv?np*!#L0SL@KQ1$fzr~pm9f8O2Q-B@m|e&j(Dz7-K4T+3JE(>*~A1-;F) zA33)kPC7|qZJ~}?{1|by)D$wUB2Mb32cn&}A4g1(ocfTMhtj2~Kh zZ_^D3z-kWDGp9NRABmV5bNE=*h^de3LDh>E-SQS!Av0@>|Ni{6Sgh?k2+Vs?v^TfQ zN1-H-@Hlzf9JyP=tfI?ag=}59E?M9V;vUcAm$dLU#OR}qw=LsbFRKVV0s)N zO{cD@KFyZtsNJZ?sl(0-VC+v;ZK~}JEKO?#XJm`obL2jdW&30bHghGY^hPSiq_j!Z z+L#rQ_?AFPk5Vj0^&tfrb)|AY!IjjjoXLf<|9j5Qq_wk6&P!9{ceXJgYYj%^Z z;%fcvwUC`ZOr&@<*eDBz!s^ga0ME&MY84t~{-A(_3yqV=S{u#$d!dCo{KbTW{Lk>I z>Kdn3MATE^b`PECErG93=zU9)mU0$Vwq3C1Zim&j0S%s)PHw7U*^+xf-IsIuXOS=2 z7s&?IC z0g+l^d8ja#XuHuSB<}F(wWj5JC17lgV(qJSQkTY+u1+)#4%q3lYdbb3?xfXh# z`KTr0Lls3(O-WRIs~~dTxdM(`5jxYg>_t$NH5@Hjf5M0**w%iL zR#%to5DrXn?2%&fuU<={Adwv^l^vyxqx+7Trv-DSii+a+CSiff#a%^uFf)dxhw(nM zFy{)R-cKFJ0_ECHf|hYCdF;Gio+OwiK49Vq!3nqL?SvfnhL5KrRqNT?CX+p%jKfQc|J^` zf>evxL~wr|T<=4V6hVIh4z3V`KS$=FLTNIO~B5m75 zQx97OG(INFY6}fjucS0Ec6}|;;P4Q6j5c3G|1=fsUtr^V~r)tdi@=6n}r%b=^Yz3pMKbXxVR?U9^`Bqfrn{ci z>x{3dK{8vD`!lH_&i{D;8P|usdZpG-;49`HtPYhL+@7p zOX79@hY5$5LoXS#2oT62VM+kRQt>iAqO!<1pq~&gBR!MH>^nwA~A$ z+fF&p48{C0ejmu^BDNUr7{4u=Lxoo%5jH%3^kV_&(wtjYhJU5Kkxvj1dBmn{U0p&` zH+|9+=`tek?bTANpp?L9;jvJ+=iw~OS1Eikcqzp{gOH0c-Rf*M9|J+tT#-#EIy$AaGYPa~o^e&qLtBmP5z6o0E@p{KALG(lTsN9NtO8YI8FvH#C5m!IoF zIf>{>%{m}O2DF*kK=|F z$1aUbTOv4-{GhGDVBtmTF=;;O~e-jD9dvC*Sg>mDS#S&|+T#;=L} ztuxX96;jx*0Yj;(1YYmowd71&zH^)1|750k3zJm-PW9{9Ze!sF6brAD_^NK`U7FtJ zm=<)B<-3on#gj6^L!l-rFlUncz>}@iO`~fRjAav+atHu*ODv^zrB->jSNg0j{B-^G z*#_MGB&a6kpoztSdD(G zHKZZ2(T=j7xa3d|ap$MMDnTi2d3BeCD5WXcT%;U~L(x#vvN6{Jw;AILvp_P@C4q=6EFHVc@&x6Z?!FfITFONXM!E8_x7-eL@AQZ?Uz;vN@XUAcq4Kn)TzAm7 z5MIYDgdX3AGY7aRsBuBD*4PjU`$W3E2r1{sJHI-}3cNC6#CEuhmBKv#@kQeJl`xfy z1N=y`>v+#Qqhu>D4Ma61IQTQ~M2mV;(W0{rGHHfbQKb@g!<I4_3VAbj%OrM%^$a<}hLc#FnzPRsEPzT>jQe56iZRc=evz6)Z zU@u#>PGX|5!<<6A-CQi=)SAviw9b1f`~O&nQ7d^g!J1<5c}=KG;1z4#Q+Qm=Cg zulu9Ew3}ftj>6r>Y4JuU{A|$v=(cPOl5k)Zt_FI?5z$8CJWc}1%>d=|8Z~mVErscK zAYAhbne`{|4{-zWw2QCA#y9YULk2V4T2bF8v9)8^$OYHu`d3K`+V-(etgQ8|1s~Zb z&l7RdTj@~p`qGidL9BW6;lI7VU>LHcWG-N3#%X@-qA1GnAU`V~wB*Hde|s<*{HaUq zYPjvEv?JIdsHSZ_IrSBc?PR2O^rIrL-ab|O!lz)n*rUHN@Gel{&(G4n7I zHJxZ?W`_5V7>J4RKoOc4muAW}0{)w`-)>d&~9`~Ws$sS${y#R z$8UU09QRfNxMD;T#MdsQY+n{FDLpnn~sNuY?SfoUg{0dVWk%`R6#@LZi z5NcgrMCJgynTnpRJkMHqd_co{qF)>*f>fmQX^C8ZrGpEI-TWam4RrEz|1B0;A>?o; zIcaXWO~hLd#^&2kE9vvO!)+g{NIly1L#-?lU{>lS!{1ls(TOQ;YE%KDGs3JijXSA?IL{)CpnGq z+#4{emA(inOx8r8Q1HR7~PbJ>tUx@Ytp2w8JLh(e; zLgZWLB1b5$1ZRAy*=PLe@l-_trMst}Qxw&eh8UE{9H!#g1tmCZN|H%6^|z{_q9*K; zaAQgnSqBPN7}-cQ>C%kY@dC0z6G0sM$6nUlb+BGe2Ra_hqSHIUNC^aOLAnIK&3!H{ zhu_c1N^-KR*3?GdaOcg}MdhjqyJo`NzwvK3FR(p2P~L0upabQqE*4rR1zA6KPSO{U zhO7?v59@Y~TfTe3?&918H4gQqa9z+jfj(heXD@}b^BiwRE$wj;c-(mG?tXMXm2t{i zci8UK7R0yO|Hq9=%Z(LWhl)Rr~rJ)u> zsVV5C(C9JKHX(8_DNK zcGQ%mnFRD?ijp7JwphWR<7YT-d(4{DY} zIbfM}E4vM7S9PPuMOQq$y@I2~ZpYi7+N>LJOaihKQ5DPE#_IrlINZBuS(Elg(STTh zDeJ$|2SqrYqftl5Emvo&>wUs@G5j*u1&T1dkGTVol9;I@A5ocZ7NO zEFPEcE$0Ou3;JA-F^Teb+s(k%*78?fH%42kixD&E2>L;|zeQ@^I>+!pK>2&biwQS^ z)NwXiUGn7ghsC&;O&vDPgFjr|T$kcDb_=k6z!2rJQG9)kL!oE!CT}+3eC_VXW@IdC z1DciwB*mStfZF86WL34-gYiKIaeF{)9aAH;VYZFn8Dk~#3me=$wy2pK0>p2S*xAq_ z?ioy`WJCGugZ-83TQW_cjVE6@tW`>we@1V#OZk-OI0iQll0=)2ed*%n zTcCdl;V>=AYsr*p9NPEo)g4LnWLx(+{nD7dL$j;B9TTeSLhZ9m3}kak*OCE;Yt z10q{5;jDVpuK7`!ZuZBNV)r!(cXy2HS$tuN2k$nWyI_dz{4 zotqyX|66)=2;yHf^iPzfvBQ$xjHtawkHZw3tuiiHXtRzCr28^PAfF`ZhY?DQSdD|$ z7C{BtiALC{OS){_HI_@-~B~qP>}f@-nn~O)&PHfz3Z`ZHxB4E%PPk3J1^krzJ}iMv?XPhrsywR%b`dsAkQOIClU=&fWt#b6@v* zqT5?GU2%s~x?-0nApLh+{-;v?Z{{SvKE%0wG~>i0-r_z!AMy4#*;6C>zoPt?bz9hoDm91`((6ICLyA7>iA> zPiz}(&WWT;xp5LZ!loL7@;i&0rkdHZYp%szx=8&dDZA>g;Q9;@cUjL@f40>z3{m!B zXL>ttUxx+e&%w|xa`n5Dcd{$@!8-3Rcwt=DgaYxb0&*&|vNy0MTB! zQcAr@Wy5I&aVkahWAuFl#3o9!OEK<5=#Nn(t@kp1NIKtVFlqbqin4WsCIvo10>NX5 zK21Sr3ftN^8rwMPD!bVk1GS%Ep*DWVrt_)2mvDm;^BIdtzOaY}BK&P4o#GB`{bhhi zH;UVfz_z1q0SZ*;u@M>az6_5;Eq<8Xk7cpYuC%2C>I?@}Q15GsSjXRkq;tK>y8O=wy^>~K&bGeS}0r50zxU`bN z97g^p{sHcrF75e;5jiIx{fuZmU9nQE?2I>NG=tM#eC$&}o~d!uktB|2$cIxb&{WOh zjwJ60M)%?+GM3uQ=JHHc&|XO5?9+1sZt8R~52nHEs^TNA2)4k=y++p@A9X`TK=jEf zb`kn-;-C*z4YiPFmN#9$In}` zfA!gK0snr0p1|n$dK%(VA^97c{#5!LoSt}oD|P#e=htESpOihF*5B(%+0**RaM_>w zo{yJ35&zcr`k!q788&-vqUSSHe{)AahWB4e|7(KkIs5ZzpugEK9{->9I zgrEPcrk?)9e1bOa8P{Ht9d0>-k2XW89OX-&X4XC)^>;Gh|Ki~c8@f!TA!T4O`^G@X78VO(ggYECW Date: Tue, 14 Apr 2020 14:35:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8B=E8=BD=BDexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EmployeeController.java | 22 +++++++++---------- .../ic/employee/service/EmployeeService.java | 4 +--- .../controller/StoreEmployeeController.java | 9 ++++---- .../store/service/StoreEmployeeService.java | 10 +-------- 4 files changed, 16 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java index 48dd763..736f1ae 100644 --- a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java +++ b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java @@ -30,9 +30,8 @@ public class EmployeeController extends BaseController { /** * 新增成员 - * @param employee 成员实体 * @return - * @throws WxErrorException + * @throws Exception */ @RequestMapping(value = "list",method = RequestMethod.POST) @ResponseBody @@ -47,24 +46,23 @@ public class EmployeeController extends BaseController { } /** * 新增成员 - * @param employee 成员实体 + * @param response 请求响应 * @return - * @throws WxErrorException + * @throws Exception */ @RequestMapping(value = "qrCode",method = RequestMethod.GET) public void downLoadQrCode(HttpServletResponse response){ try { employeeService.downLoadQrCode(response); }catch (Exception e){ - log.error("添加用户失败",e); + log.error("下载二维码",e); } } /** - * 新增成员 - * @param employee 成员实体 + * 同步成员 * @return - * @throws WxErrorException + * @throws Exception */ @RequestMapping(value = "sync",method = RequestMethod.GET) @ResponseBody @@ -82,7 +80,7 @@ public class EmployeeController extends BaseController { * 新增成员 * @param employee 成员实体 * @return - * @throws WxErrorException + * @throws Exception */ @RequestMapping(value = "add",method = RequestMethod.POST) @ResponseBody @@ -100,7 +98,7 @@ public class EmployeeController extends BaseController { * 修改成员 * @param employee 成员实体 * @return - * @throws WxErrorException + * @throws Exception */ @RequestMapping(value = "update",method = RequestMethod.POST) @ResponseBody @@ -116,9 +114,9 @@ public class EmployeeController extends BaseController { /** * 删除成员 - * @param employee 成员实体 + * @param cpUserId 成员id * @return - * @throws WxErrorException + * @throws Exception */ @RequestMapping(value = "delete",method = RequestMethod.POST) @ResponseBody diff --git a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java index 680ad35..7259735 100644 --- a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java +++ b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java @@ -64,7 +64,6 @@ public class EmployeeService { /** * 查询成员 * - * @param employee 成员实体 * @return * @throws WxErrorException */ @@ -144,7 +143,6 @@ public class EmployeeService { /** * 同步成员 * - * @param employee 成员实体 * @return * @throws WxErrorException */ @@ -242,7 +240,7 @@ public class EmployeeService { /** * 删除成员 * - * @param employee 成员实体 + * @param cpUserId 成员id * @return * @throws WxErrorException */ diff --git a/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java b/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java index b53e164..01172b4 100644 --- a/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java +++ b/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java @@ -29,12 +29,11 @@ public class StoreEmployeeController extends BaseController { * * @return */ - @RequestMapping(value = "list",method = RequestMethod.POST) + @RequestMapping(value = "list/excel",method = RequestMethod.POST) @ResponseBody - public Map listStoreUser(@RequestParam("storeId")Long storeId, @RequestParam("regionId")Long regionId, - @RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize){ + public Map listStoreUser(@RequestParam("storeId")Long storeId, @RequestParam("regionId")Long regionId){ try { - storeEmployeeService.listStoreUser(storeId,regionId,pageNum, pageSize); + storeEmployeeService.listStoreUser(storeId,regionId); return data(null); }catch (Exception e){ log.error("添加用户失败",e); @@ -46,7 +45,7 @@ public class StoreEmployeeController extends BaseController { * * @return */ - @RequestMapping(value = "list",method = RequestMethod.POST) + @RequestMapping(value = "import",method = RequestMethod.POST) @ResponseBody public Map importShopEmpByExcel(@RequestParam("file") MultipartFile file) { try { diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index d6e6e57..e791aa5 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -63,13 +63,10 @@ public class StoreEmployeeService { * 查询门店号 * @param storeId 门店id * @param regionId 区域id - * @param pageNum 页码 - * @param pageSize 每页显示条数 */ - public void listStoreUser(Long storeId, Long regionId, Integer pageNum, Integer pageSize) { + public void listStoreUser(Long storeId, Long regionId) { Map result = new HashMap<>(); List poiStores = null; - PageHelper.startPage(pageNum, pageSize); if (storeId != null){ QueryWrapper storeParams = new QueryWrapper<>(); poiStores = poiStoreDOMapper.selectList(storeParams); @@ -80,12 +77,9 @@ public class StoreEmployeeService { } List storeUserDTOS = new ArrayList<>(); if (CollectionUtils.isNotEmpty(poiStores)){ - int orderNum = (pageNum -1) * pageSize; for(PoiStore store : poiStores) { StoreUserDTO storeUserDTO = new StoreUserDTO(); BeanUtils.copyProperties(store,storeUserDTO); - //设置序号 - storeUserDTO.setOrderNum(++orderNum); //查询店铺绑定的企业微信 QueryWrapper relationParams = new QueryWrapper<>(); relationParams.eq(DATABASE_STORE_ID_KEY,storeUserDTO.getId()); @@ -102,8 +96,6 @@ public class StoreEmployeeService { } } - Page pageList = (Page)storeUserDTOS; - } /**