From 5fe95c558d92e36f9a42f8523440319ae2015798 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Feb 2023 12:55:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E4=BA=BA=E5=91=98=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=91=E6=94=BE=E6=A0=87=E8=AF=86=E3=80=81=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E7=B1=BB=E5=88=AB=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ChangeWelfareDTO.java | 14 ++++++- .../com/epmet/entity/ChangeWelfareEntity.java | 8 ++++ .../com/epmet/excel/ChangeWelfareExcel.java | 18 +++++++-- .../epmet/excel/ChangeWelfareImportExcel.java | 10 +++++ .../epmet/service/ChangeWelfareService.java | 2 +- .../impl/ChangeWelfareServiceImpl.java | 35 +++++++++++++----- .../migration/V0.0.94__pli_change_welfare.sql | 4 ++ .../resources/excel/pli_change_welfare.xlsx | Bin 11358 -> 11461 bytes .../resources/mapper/ChangeWelfareDao.xml | 16 ++++++-- 9 files changed, 89 insertions(+), 18 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.94__pli_change_welfare.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java index 02ce0b34c8..7ee639d7dc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java @@ -1,6 +1,8 @@ package com.epmet.dto; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import org.hibernate.validator.constraints.Length; import java.io.Serializable; import java.util.Date; @@ -16,7 +18,7 @@ import java.util.Date; public class ChangeWelfareDTO implements Serializable { private static final long serialVersionUID = 1L; - + public interface AddUserShowGroup extends CustomerClientShowGroup {} /** * 主键 */ @@ -116,4 +118,14 @@ public class ChangeWelfareDTO implements Serializable { * 是否享受福利，1是 0否 空是 */ private String isWelfare; + + /** + * 福利发放标识：1：已发放；0：未发放 + */ + private Integer grantFlag; + /** + * 福利类别 + */ + @Length(max = 100,message = "福利类别最多输入100字",groups = AddUserShowGroup.class) + private String categoryName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeWelfareEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeWelfareEntity.java index 2ddb43582a..7f0ec9189d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeWelfareEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeWelfareEntity.java @@ -72,6 +72,14 @@ public class ChangeWelfareEntity extends BaseEpmetEntity { * 移除原因 */ private String removeReason; + /** + * 福利发放标识：1：已发放；0：未发放 + */ + private Integer grantFlag; + /** + * 福利类别 + */ + private String categoryName; /** * 客户ID diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java index acb7705b2f..5a58288ba0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java @@ -21,13 +21,13 @@ public class ChangeWelfareExcel { // @Excel(name = "epmet网格ID") // private String gridId; - @Excel(name = "姓名") + @Excel(name = "姓名",width = 20) private String name; - @Excel(name = "证件号") + @Excel(name = "证件号",width = 20) private String idCard; - @Excel(name = "手机号") + @Excel(name = "手机号",width = 20) private String mobile; @Excel(name = "性别",replace = { "男_1", "女_0", "女_2", " _null"} ) @@ -36,8 +36,18 @@ public class ChangeWelfareExcel { // @Excel(name = "类型") // private String type; // - @Excel(name = "加入时间") + @Excel(name = "加入时间",width = 25) private String joinDate; + /** + * 福利发放标识：1：已发放；0：未发放 + */ + @Excel(name = "福利发放",replace = { "已发放_1", "未发放_0", "_null"},width = 20) + private Integer grantFlag; + /** + * 福利类别 + */ + @Excel(name = "福利类别",width = 120) + private String categoryName; // // @Excel(name = "加入原因") // private String joinReason; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareImportExcel.java index 992be96b4a..07869bfb2f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareImportExcel.java @@ -33,6 +33,16 @@ public class ChangeWelfareImportExcel { // @Excel(name = "客户ID") // private String customerId; + /** + * 福利发放标识：1：已发放；0：未发放 + */ + @Excel(name = "福利发放",replace = { "已发放_1", "未发放_0", "_null"}) + private Integer grantFlag; + /** + * 福利类别 + */ + @Excel(name = "福利类别") + private String categoryName; @ExcelIgnore private Boolean addStatus = false; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeWelfareService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeWelfareService.java index 184cfd9c9a..099c7ae432 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeWelfareService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeWelfareService.java @@ -21,7 +21,7 @@ import java.util.Map; public interface ChangeWelfareService extends BaseService { /** - * 默认分页 + * 福利人员管理-分页查询 * * @param params * @return PageData diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java index f5808bdf3b..9fd94f7a7f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java @@ -16,10 +16,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.ExcelPoiUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; @@ -38,7 +35,6 @@ import com.epmet.entity.ChangeWelfareEntity; import com.epmet.excel.ChangeWelfareImportExcel; import com.epmet.excel.error.ChangeWelfareErrorExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.redis.ChangeWelfareRedis; import com.epmet.service.ChangeWelfareService; @@ -88,12 +84,15 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl page(Map params) { params.put("customerId", loginUserUtil.getLoginUserCustomerId()); @@ -137,6 +136,12 @@ public class ChangeWelfareServiceImpl extends BaseServiceImplQ9BAW9GjnI%L;U1b)qt_)$5fjL@#QrO1R&ze0oGS(NEFS_&BfF) zinRCl_bwt#OIO6alcegf*`FU?ef@g5zwXi^=!+pt9@V1fT;}Y@8qiK0c>daR5&@56 z@<^iw1Vy;JU2qxVk!uAnO_NiJDviv;#pzx8k_wAj;wC!N;_S-Lv5ATlcM?ppQc7XH zHq%U|ukTmOu7o8}3b%`PkaUrbR|Ip+bKveLP8SSXhOON3I<%zu6n zv|PTti#V{UpM#CorO!K#iBmY2t@~ZIJbxa4;MKD_f6Po3Wq&j-e5Lo9bWCKDPz!tY zt<`;R%`}K=ELf{Qbn0v+6j>!ey>NO1i5%w+-+5o?pxniN@(|w5%;xIHdW~3T)Yql} z<51svod6W8x2pUu1`7)*3KoI%ma338Gv*zSD^D$|%|OSk=a4>NDqw5-8BXU(o$Zz_fB@J6;%*DO9ZvozgSG_;XC~RXMT{@pvN3T@GgrFl?i{c%weEj( zO!eYd^TeqK-cnG%3_$Kfuq9`k05k05(%^V$|Jqg4JcW8Ea77p6M5JK;*7GE`_+hLE zruUuS{W|$P<_nk9u4B9MQ9d$0uI@nTV@(P)o7%E%TqW5}9bu)^Z};E!A(X#lI$y_R z9jVcvIW}=QDXnWuEs|efJ4KEbH!FzWfb_M&I7GJ&0^K?Y`ID3knSi4R6k!*iMBZw) z>sGUWy%*#z;%{r`?&$aLBKB9d9!VW~oyrt3`#f!3PWzMCaWUhNf{uhc)leih~ zftlacR*Ixw8%P9CL0ez;MjqxPxRl~?S-bLZRqGq~md^vO&z*^T8v4fBQwC`kJGYV% zlpDtArWQ{CebqWS$)K)9wMW4tQ|}$iZ&gP}N0h-N8W*-X*hyM()nfbcX=E_;L)0VL zKP7})l%x;MrISVYe2gLue~NM1XUKMO3itIt%N0`33i7@j>!J#gulz;7wL7etgc5AY z8TE1uTZz+Z6|i9c7|o;8Q8Gy(bf=>`AY7uJ_p{Dp0I{ju^+v~w0Cn7?YCN$%-&qEV z>VgI@>W_aV5*}@bOgPk93q+bz^@$LL@483KtnGKe$1h)sZE-n0A0&CC7u)zANY{bX zirc@rQ2EV`;>yG+*9)Jp7x|%tj|uD;2{mNLVf+a*oc+RN18~!9u0|I$cFYnu*bRU9 z$dhiu?;krMUPV|4Q{*<~XYNrL75mmOaNo5>N67kp=THPjl!w!$C`SI}#oSjUnv?nmculIWFKDYQWZK1>dSsTt@+G$6o#ct~GWJciW(08ymY*nT=jfu~W{b(ROa4 zCfnj@9||8l$I^S|m5}Qlkypj|S?1J^JjufB=o#2~?OXwC5fCqxDuu7CPVzxF=#80f z=XjAUbthhPL{h-Jd1~yfiE>p-dW!TLgS<`^>iAC8{-j0{sv`=rR;xkkO}PqU-WqPP zT%4pAnL~q~vz4Fl4;|Gd{88~aLWrY);91dTec=EbZ|k=O~v%fZK?^RaQgxdbqwl8kI^Gq?6b00}r#O z<{Ok`3O6JK6bpreF@EDokSObzpC>#Eozf!+TY5n?pyEKI%rD(G=Rk$}b^_ox0{KUfk1EC~a( z*9Ou`f#l{DKRR8R67DHMwV7HMhRPDQEuqyOVU9h{HvyE9N_K6pW_LJk_BdifyYtl& zNV6xelp^L)*^Z22+Z61dt6ghR?_LkfQfW;B($Z$7J4qk$9aMo==x1v6rjs1bs(jyD z^z&QXnMa=aS(!+-;kxyddQfV2r1rW@5jRxa2UvABeIyiSS>N&|X1=b69Pai7*7v@@ zzBnXFC~^jE_OB>m+u2-m;uaNprH)^$JHvx|BByt zr$SUf6D44lbYvh}#ON?jyr`60*)l@M;Oc+ws8>avI~pGmIyuV-)~-0*6KXydUgm?D zSl4J7!SpuZ{3!N#0?sY&RX7_uMam@#8kjf_B_7jsOfCCmW%oj0j#SR+ab7#F>tr+N z>Sb?11eI;|PI21cqFQ=-zaV;3<_O8TE7hM+4bL3C2G{lxS`q;-;_C(6Z*!)M0SH9; zZ+7(ae}0=C|E9%hE04DeW;EAtx`ArL4*YH%yT0c>f#TnJ?!7ay7}pYlKyn9>GWXsw z!8Nj;;?)`ES>n;s5I)PRwm>+VehA403lfw%E?nKy%{Z?E!u_7?!o7T%;WoQ6NOF65 zrQZseEC7=O-#dBM;K@X4wNa_aB-=K_Uy_-UWCyqYiV3=`nEdUT$vBcEP9#|6{JG7! zQLFFtqrd&-&XWZO+`h`to%RMWZpMLn#iR-alZ{B~!|z}?EMDsB!9t|h#kDsK*IRB; zJB(w7;SY$$8g(^xjrs2$aI@rzJ)Wm+(# z$IbdI$w~t^UyeND>G$&Cxjtcnish!7MUBw5E8OZ?xa|({vZ1{F*C*ITIt5=^r++Kb zIsm%SyafUamId#51BK|$iqQn-;LNN?dcf6o52t?x97g)EUDDUm_~FbT)C>ik3B1aK zfT+TGx1Tfg9Dmrxe}f@klSBuI4W(npfyZpM7R7_jtTvc3=Or)Cn`J7QH#rs~5AL z%quamY&_|x$uKn5>=$3m_vIYY1^Z@DCFQQ2OrIV6vosmq>44J{zt(J^ORV|M3Yc4x ztBYu73FZl@7++iHi`6d)(zoYCB_}$pe!qOMV>a!*r*T*GmvwQh{%+ve1%XyqyNY9= zW9`#B>IEilD5D2c#$emI0%>`hF{Mv=WL3!3SNAxCRvfOHwss{^={=;?O(m$zk)k}) z>GG2)bhm^&Gw0oX-v(5>Nx{6tHo%Z()zLjLJ~NC`ca~=5@oCr`TJJZZo(plW5F^95 z2{7X_lufc;SlmM+YpO~rGbN7)%;-+aI{svMdFEf#N+Fx;9xqGYdqm7`Jp8>O@o{6+ z$tQ17Yt6GyEFHYsO&PXoPU@bcfkv-_H46dmQ@^>}Y34{XCcfocxm3m?VAh=EvbvE% zqOCIT+O*ijaj!tMs?cGuWEI2zGNmbf3ec2Za~0Al{Qbw4Jja0V_%OjDTvPCKL+i%; z6{x7>f%6UMiu}(53D=XzcGh;4v6|D+F<*2wlUCGCBA3Eq1jekw&^zq?gG6I7H>R`W z8WsBQP|HUxboT8O5HH*`fPJtVju4}(i+-ouZE8XffU0MB>DRZdMNjiCB7;&1{dEZN)b!r0;H`) z(}=OD47z!Cf7wBT28k@Gs4QqRg)cVWgMQ7dnckfHOMX9jO-jlEon-U6dj?QD*L)od zOR6TW8T*U_Q4*1?2NrDv&L0FJ7pk8|I)4tq#`D1H`ISGL8^;q4uU<$nZQH9*cYh?cUcYPAW?3+GqFb;N9klj!U^lUM%oXzd&w;o*U+-_T>7A}OS9suErvNr z8wC;mZSGK}T=%GS+i=nCpw!9cXr^HQA9`uwwEfvkLgB9fcJ-zV+Jf{zi`Wutnd*u$ z5KgEIbI4Fl_>oXhRt;A3auOFe**QIl9+PV2qYn41NP@fCYz=-D3b~C{<|_s_`RO-I zHY19p-caRYY+nFuwCpTZPz|4oKqjTYBw`Gr76v^61+^}`E|(YvEmytxP4!AATGfrjBcc* zeRuiM-7(-aa`3Gxy=WM+173h}tQ(Y0CUyMPgQ*1;-(O!l{MtR7yURNA;v^kAhfM)$ zYZq6xKC`HqRAVc)z1aXpafn?CMz4WBHOFDhQZkiEjQaeT>~P3&nX%| z3z6U{quDYPVq^G7f-*%*CzQtPOSYHeujMHUA%2V5pZZ-IyKCqe-;Zx#zUvj+vJX*I zHTga{lKDf~m+$eN-`eN_RBAZ)eeDe=@3dX7X&>wz@3TgEAKD2~b?%=F25;2PZ2_sy zZy!AY&X(L&$~2fuEQ@b0cIE~y6SWfMK$ffXW~||Is^%@%eF>%?>e60>_?`~1Qs=VJ zKuVxCPT7rtr@JD^U6SwZ zM;`+`uv^f4d$5t9I=3&U4I9ie3UE|G=(|gBd_VXi)Z)o&%{8LmF1Yh@G5kacpIo371!pB?7Fg^s;yZLi*?8C)j_z-D%w$-}zK1YY;+Vj`S_3@er zhk2qR$Shx2N;^_?WRj!c>0}P4=8@nmM@6Y26IYqwJliK?1>PFli!tO@D{vDXbZ8WI z^r;SCC#U7*9-U^PCSgdxKBg+?{wpYy$kmXjCzw`MOMy6NWvfhEQd@!Xkkw`#!#G~} zT$C2yO`VHgMt^mEw&sl_=dTL>4}pRiFNKX0z1Hb$H)|aQ8BoJaJL?i=hS}|~5qUb8 zW(x;GFPR;Nv%wgq8<&J<2V8YzP@WUYdvT9+UqniB`qG|`X=Ws*QPt4=Y+Bm^mprid zsdj>nZW}iC7Ck||?l-rd$K~FHx{?NG!rs*FcV~2EP|jH(@nlg|Pe8+{LY8ExG6%BO=S%8)rSgg4Gg>1f5^CP1Vx@ zX5+k!=tsn=oHGw4g%>3Ydkqg7XX{N6^6UpbI9O8MViNfZaW8&(U*7y}=>JPRTG>NL zH*afHL*!SM_gI_AC#*WaO2W?jGxtHIUEeY3J$13itao?<{^0=sy=I)r@Lu;80O;HT z0P=rJ+(0j1H#;vcx4%VheA19-rznNm@01I2)ULK_*gFnLVVjW@4MfQL%W0IEOn`$t z>D8qkM3Sv$Yw)N^t~qdhW83WMY5b^w8(?_ntsTrIDrIo@@mUb?IURfy&Nxsnnbt`j zZ00y)I@H_Tm0FLl4qAK6tNM}FU|lVo`!}a$UY@R}^#Hiull6R%J+)1l0o>pSe$j}yp|>D^X7%9X*`AcgwU$lStTVb-?DFrC3{$A zjmWn(F_o5y+#U6^GAN~N#Fqa%eF(2@{KxEquKSZb(Mprc5BpzW{q5pw)!5^4v0>cE zZ#?&LlGs5YB&z@|Qs^!NRs&MwE|Ty+91*#GR|@AJlEuPHi$#x=%^eAhy2?EAlQM599y#Gk-1r9&kmv@X5(0 z;rxFBq_2&IP5sY9|1!1zWkvtJ-Hcq|Q^A%ZL$dHoVp$`N_<3;u(G?Qlr@_9%hJ42_ zkL87&yq#r``nP}P7U0Kvdb^Wi{4dM^f$sc$@OJ$BqfBI;fEqRv5%PeT26-hQg3U*A RyJbLX2vXpY-~D^;{{V&@GeiIY delta 5344 zcmY+IbyO5i*T;94?pl;sx=WC5mL-&4xAXXeg#?zv~~J#)@{`pv(Z)#d_`%FH?MY=HoPJqQ4x0ssIGp7wAb zPcL6#dru$4y&!kDXUWT&y&~X&L%ijJjZU5URvFkr*ibcu&;)!4^O1~ow@7wwdT_+n z$5^B0b*30UF(|TsJzGH7^68@U=Wrl-bR>p7@IZN|D&_tUg>Xn>J2)eIV4Iz(1!u## z_bu{KFdv(`@0fG?_d~Vz!geFCk|E-hPf)ouPKj^EaUOByyaSob(4KlHrtuiG0qy76 z%FMNxV@pXq2<7-79vyeOT{EzCDlKaIVNcV?UEOa&P%ly$Fl+ok=hiw)4bXU7iP55X zT~Ji4=DYS@vvuQ&fcIYRj+<-M-h5@RWF&IraJ}+)Cs?i`>yx7?1Wrw)+X8abObr#v zRkC5;kM=5^cN1}%kK3=~p^qvG{&8{A8T!<$^B(&j%lf{67qoX!_8izL0OL1Nc}0x} zyhKsUfmhvJcAA9yOmJ9rR#V{btf)%Zd)*`9`-E1@fiIOc$z8^ZI%-uG0m+hQ2TimO zJArU599;12)e{0<>8?S?rLp^H0UTjuwEjy5KPlKwK}5+{gf)$FV88W5yfmwM&hOqh5#cq>ky7p7I5KO%(y`l!=;!-zTiNht?~4n>0l9?KDIupf%^Qa zxS#uSM+3fMc)1k>O~0=uUiM02YWo*|>2UG9Qk?f!>ZFrHfC<3VYi*3bQIVBu;hnv> z)=bwfnCAJ#_q&7V@+Tf?G#!F|5!uvP@3MUd`l1V2a5KiJ_Eoy5k7j>T0V zBJO7lcDZd`Z!{K{38|;mD?&GL7{1K5aWL<$i>P8MB*$Ot*&&E>ZN(pd%XzpMFtMQe z2Zxz4)Mc;loRLjdx!uWMtoJit$0L1ZU~=v1!aSOazCA z5^2*S<51LtX7FSWPKEc9wN)8VW(7=d;Y>gP(4VUFlgnqrBJt?;?E*r}VW1KtCaniC z)OrLdu#fMO-D}L)>_8lw8I5#A)R_xihb$xW_OfdZwPGB6yK+GtW=s6^Fz1R#rl$s! zoRrl%Q^XFVX0`7vIjj@O2EzEoaV$I}Pa-##;Lek2)Ft3RXG>VLT%uU(UO!AjIE6$V+S)MgD9jDzWz z1N`pnkdM*y^P|kCrx-!i4;QuhqbY0-A}Nt8p4lZX;U#s-7S-nR{BU_vpq^`NYdSGF zRP>aoS#;GQTce`TRY6Qd@7!BnHdbctSzkPAKv7l9KR(?-bef_ZaT%Sp%$~InosE45=<-+qrFSDfR>P>;v_aR;r1ms16TYvZXxv z-wRQRU^n%*sVPadj0K!mt?!)5tF>nQsmJ{9hnAIjYFcb)^A=~(a19|W!FcafvZrlawoi^axHq;?1|5#F64UB}|*AK>u$pqvGT2m-f1E_~3Vo9_0o3n>?58NwKX_N z(h_GU9WXiNzuB&XdvTEl{Jw)}5EV-{|1hGq*~GgjTgJM2+J*Q*f`JfQ5))s?Z7#VG z0{{=;=rAxXa>;XHnik1YdlUAkR)G}5WiUx#IPAii1r2NDO(dnOB?AiSO9Ep~RQYSA zz#r2bJ>(p^6Fuf)KzkMrbG>WsOSO2`=xebgcBNmovn?ze9j2`*&Vz-#dp(@~qYAcN zzN0NHlhX}Fou!Kb_yvsTI>rlvl`-pq;njPGQd2C*#d=AG3TpMn<%W*#z|7tEG!-+A zU03hkiO8O2GZG}w@Qp>VNKU=vm2J1+kI2C(^?a4pQ?TAE)$wSoiKCh6`J; zIaLuBghT!q`C^u*tS8U+=R>*TcdngK{nN2e^DfeMGk#w|>@+9a7A!luoph%qjzmN1 zI%u!8Til<%P-1%e@j!0lx!>=-yQ9qcPB}PFDM85ThnSeK+*HE%Rk6A&csN`jP7u8Q zr(evf*4&x365U(h4_7uX4C(!Y?<>B%>L__)PJ2G-nlTyT@95Y@n$+s%IB9BTg`@(A z@=K@&Boy=q$68QL@>@eBLf>jL4CWTJSGef2jl{|DbSsob!;O3D5CWa3FVX;j?mA#N>PSGnVBK2d- zh!2P_B58R6TSKMvy`c$@6aDLl{TCp&>6ml~IyQ?C6*PM*2$#DE&>9_dqxavb$i-xb zdG^G^YCM@)V8v@H@$qm&_We8cUs+}cGm!~{32wM{D=pTX{m-*%UgwL)Ss4YqkrF6z znXa5tHx~0(5la$$TK|48Fo%O+_lSY7Q<|%eIQv7_!1+uVQl(OYfo!78IUP%VG10SB zH}5Wnw64srG5KX8W_>c+GTUF4XUxDCt(E026wza*budq6xWz zaj-PBnW@~yIM_^9b7NdP?PW z@QQ$e*nQtlbD`*D)Q#rJmikTVw(YQ!NYz%qW5d@CpB>Hi=(}=hX2j$9s{;eHToZxeg!d1CYXWes+To3$i3E=u1*I=1$YLPT14M$rrD1PLznr zv0%}t!hDLm)-zuzLKj{R8)#GAJV>dX!fn&kk&x|fgE_(3(G-;MR6<&M-JhcbM}^ondro|>Q^%wcc{DN8h4mcux;?N z&%)eI?%oEm`bg#A$M(S6hN-Q`Yt)z87BTL_Hd2*KqQRMY@9n3GJ&@q13$r_JI;#jb zx-{W%bG{gqnOPNPEHsx6Dee#D-j&V`#3_zrIZgI+NMBhgVs7f8aAFu^zAvlt;-1}9 zs!j5wibrFU+vw8SWdcRk=P#^2a?UEPI8EepAjMrBf7caXoVT`q;>urZ9Qi&jtCUW)}6chWk!Cwouf=ClS7z?h0dL}7y8_R!VEQ5KLS00NcNqD-s@bk+M{wZ zZfK`yA%@aOJ$+7;UOB)`sU=RUHY-d|rz#@$(@uH=rE!9Kx{8>d3R))j%iVZF9B_QC zp*|};S*WA)k`?*$gb^Z|eNYDaCD*x38da`iDt73p*{gEv?Ad7^VA#Y=Pa}judf`JR zkqQoKIa^s%`$Fp>Qa2lAr48gxM~yiopx#-LP>3vLUNA-6Wjc?QC-#zlQJmgDlM!3( z|6bHog@j$DScGS>@1%ASsJyPZ9Uk*B-u%(%F9rsVVG4DSGhGn|zM3l^F?{=DB`lFF1jVMk+BYT=l;mQi^tg z8YJMe=;oGShnMvwQ?RDCy4T);e=gBj^ed;lXQCG?BzT%^;kXXG1I;iS@r2i@aDARp zmbe3j7(O^{KW~1dZmL8Hl#8sW`w&-~M79-q){nU?Iz#%O9zV#Ap*(_cDQ+t0xCk0i zA*Xy=bJb*^8l!%B(-dkHt!`hxdtq8wDu)w0YhL+{I6{r$4Ya0f)ri zxh+yb?n1@{_zIu zsf2>kBY!lZ;3$f89d_~6w8SXNa6AU0PaDTuk1~&Q1`WTf(is;^7Y=c)GdTBJ;!ay| zlJe<4R+qm-0A57M5b0M)QGX43KGa&ivi@cwvbcS&jN|bGG)yuzaLq`*$i98GIT@*n zCmxa$N`HwzT0=+lP?$sJ>gVvpE23yZChO|et-t|fh;h!p)u`JAE=G=F+uzdB;t9`_b8CZCQc z6cx$u`&izR;Lou}rWvduRX)z?RUQ?@p_C}fG+91g>rn#ddDWA>i<>OrX+^13n9wKp zi4aJiatP2R(v*GJK(MFY#{+qm>W6+pF&!UeF5S(&qh6>RZsNBQuk|c)G9Ov)Q|qDn znZW>4Lf%!yNQH?M$K~4P>}62R%1;mvFqpDiigJFZnUh^XzNfD0N-LK!@*}_gklA~y z%FYM(td7M9XY7a4~=ao!e`>eOd84oH00_W_TUB3*L@Mr%}O- zW8r;e9#a(x3$n60qjSdZ=7!%qqRwYuvPz!cHz@>jcLAEOkbhwV-G6Dr42a?9+%0=x zxcx_i0q6w2J7`fB6tD!{#G=i}x^WWr9D@V+UqAuD51G+I3$QXFpY)1Qs+~n#zZ~m4 z=Frek`3|)e&!TqDsy23k#C}Xp+K|1vOmNu6t=rN3*$g>gs<&WaRO{@Kb@5ZiXlN2S zd!QyS!=JY+EerB`=eqQyVBupdUVhd#w(mmhDQpKIgrIr>=ly4G+SG%t&gog{cf>vT z?HM=UH(d5L+)4LBO1$tiN-o`T9~UX#fttqm z-{ZOyz)=TnhHp7Nse0glf-D%A?SBO7YBNp;5IiF5GQl-Jn$)ncPe}1u$|AXT} zEUWtalJFZk36~L5#TJhTy5L01@hAZW&`){9fO_Z}9yHN^2pw9BSCa8B9^$zz7Wpl& zqq!~IUjqVIZ%1ZyHZK$yfL`Ji0S2PU`6NNP>}WO)h#*`G2m;?$_x}mg|JMB0eQW=O zC}Y0u0B*+r{#F10vVZpfEdZlO`DB4_(8T;qjQ_zex0(D6{@4Bq(}jldD}z?a&=LF+ zKtgmIKR4uGO>>*J_N|!WAML-z7#8#uzZ}p4Eh8WY!g8Pk1fW11bd!K2 AND w.JOIN_DATE <= #{endTime} + + AND w.CATEGORY_NAME like concat('%',#{categoryName},'%') + + + AND w.GRANT_FLAG = #{grantFlag} + order by w.CREATED_TIME desc @@ -76,12 +84,14 @@ where ID_CARD=#{idCard} and del_flag='0' - + update pli_change_welfare set REMOVE_DATE=#{removeDate}, REMOVE_REASON=#{removeReason}, - del_flag='1' + del_flag='1', + UPDATED_BY = #{updatedBy}, + UPDATED_TIME = #{removeDate} where del_flag='0' AND ID = #{id}