From f8ade32067c7b2de5fb16de1463aa37698fcc7bf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 21 Feb 2023 09:54:59 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/ChangeWelfareServiceImpl.java | 9 ++++++--- .../src/main/resources/mapper/ChangeWelfareDao.xml | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) 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 9fd94f7a7f..1e6e5f6e01 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 @@ -3,7 +3,6 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -38,6 +37,8 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.redis.ChangeWelfareRedis; import com.epmet.service.ChangeWelfareService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.fileupload.FileItem; @@ -96,9 +97,11 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl page(Map params) { params.put("customerId", loginUserUtil.getLoginUserCustomerId()); - IPage page = getPage(params); + // IPage page = getPage(params); + PageHelper.startPage((Integer) params.get("page"), (Integer) params.get("limit")); List list = baseDao.getWelfareList(params); - return new PageData<>(list, page.getTotal()); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); } @Override diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml index 6953f24a98..c163416934 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml @@ -56,13 +56,13 @@ AND w.GRID_ID = #{gridId} - AND w.NAME = #{name} + AND w.NAME like concat('%', #{name},'%'） - AND w.ID_CARD = #{idCard} + AND w.ID_CARD like concat('%', #{idCard},'%') - AND w.MOBILE = #{mobile} + AND w.MOBILE like concat('%', #{mobile},'%') AND w.JOIN_DATE >= #{startTime} From e820c536fa8abf4493eb4cec4b4686e3ffbf47f5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 21 Feb 2023 10:08:33 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ChangeWelfareServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1e6e5f6e01..85ff254bc4 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 @@ -98,7 +98,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl page(Map params) { params.put("customerId", loginUserUtil.getLoginUserCustomerId()); // IPage page = getPage(params); - PageHelper.startPage((Integer) params.get("page"), (Integer) params.get("limit")); + PageHelper.startPage(Integer.valueOf((String) params.get("page")), Integer.valueOf((String) params.get("limit"))); List list = baseDao.getWelfareList(params); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); From 6cb92e429160f7376edc6bfe504a0ff2f0e00a27 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 21 Feb 2023 10:09:34 +0800 Subject: [PATCH 3/8] ) --- .../src/main/resources/mapper/ChangeWelfareDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml index c163416934..f45370a95f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml @@ -56,7 +56,7 @@ AND w.GRID_ID = #{gridId} - AND w.NAME like concat('%', #{name},'%'） + AND w.NAME like concat('%', #{name},'%') AND w.ID_CARD like concat('%', #{idCard},'%') From 58bf5a27340d09c0eef89bd21839310ef036c3a0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 21 Feb 2023 10:43:30 +0800 Subject: [PATCH 4/8] page --- .../src/main/java/com/epmet/dto/ChangeWelfareDTO.java | 2 ++ .../java/com/epmet/controller/ChangeWelfareController.java | 4 ++-- .../src/main/resources/mapper/ChangeWelfareDao.xml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) 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 ef8ec9ae08..f04be7b82e 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 @@ -70,6 +70,7 @@ public class ChangeWelfareDTO implements Serializable { /** * 加入原因 */ + @Length(max = 250,message = "添加原因最多输入250字",groups = AddUserShowGroup.class) private String joinReason; /** @@ -80,6 +81,7 @@ public class ChangeWelfareDTO implements Serializable { /** * 移除原因 */ + @Length(max = 250,message = "移除原因最多输入250字",groups = AddUserShowGroup.class) private String removeReason; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java index 671c4c8681..c3ea057e9b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java @@ -70,7 +70,7 @@ public class ChangeWelfareController { @PostMapping("save") public Result save(@RequestBody ChangeWelfareDTO dto){ //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class,ChangeWelfareDTO.AddUserShowGroup.class); return changeWelfareService.save(dto); } @@ -78,7 +78,7 @@ public class ChangeWelfareController { @PostMapping("update") public Result update(@RequestBody ChangeWelfareDTO dto){ //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class,ChangeWelfareDTO.AddUserShowGroup.class); changeWelfareService.update(dto); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml index f45370a95f..9c4a45bc10 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml @@ -73,7 +73,7 @@ AND w.CATEGORY_NAME like concat('%',#{categoryName},'%') - + AND w.GRANT_FLAG = #{grantFlag} order by w.CREATED_TIME desc From 2d1777f8fc3f5c322f0f7a476a73c2f762874418 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 21 Feb 2023 11:04:04 +0800 Subject: [PATCH 5/8] RemoveWelfareShowGroup --- .../src/main/java/com/epmet/dto/ChangeWelfareDTO.java | 5 ++++- .../java/com/epmet/controller/ChangeWelfareController.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) 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 f04be7b82e..e3fbf74e1f 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 @@ -21,9 +21,12 @@ public class ChangeWelfareDTO implements Serializable { private static final long serialVersionUID = 1L; public interface AddUserShowGroup extends CustomerClientShowGroup {} + + public interface RemoveWelfareShowGroup extends CustomerClientShowGroup {} /** * 主键 */ + @NotBlank(message = "id不能为空",groups = RemoveWelfareShowGroup.class) private String id; /** @@ -81,7 +84,7 @@ public class ChangeWelfareDTO implements Serializable { /** * 移除原因 */ - @Length(max = 250,message = "移除原因最多输入250字",groups = AddUserShowGroup.class) + @Length(max = 250,message = "移除原因最多输入250字",groups = RemoveWelfareShowGroup.class) private String removeReason; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java index c3ea057e9b..730347fabc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java @@ -108,6 +108,7 @@ public class ChangeWelfareController { @NoRepeatSubmit @PostMapping("removeWelfare") public Result removeWelfare(@RequestBody ChangeWelfareDTO dto){ + ValidatorUtils.validateEntity(dto,ChangeWelfareDTO.RemoveWelfareShowGroup.class); return changeWelfareService.removeWelfare(dto); } From 44e912aba00c86c0148b8f7aa63e33b80c7ca954 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 21 Feb 2023 13:10:11 +0800 Subject: [PATCH 6/8] =?UTF-8?q?/data/aggregator/epmetuser/stafflistbyrealn?= =?UTF-8?q?ame=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82mobile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/epmetuser/form/ListStaffFormDTO.java | 5 +++++ .../epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java | 4 +++- .../service/epmetuser/impl/EpmetUserServiceImpl.java | 2 +- .../main/resources/mapper/epmetuser/CustomerStaffDao.xml | 7 ++++++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ListStaffFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ListStaffFormDTO.java index e7569b16d1..4a2bd9687d 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ListStaffFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ListStaffFormDTO.java @@ -25,4 +25,9 @@ public class ListStaffFormDTO implements Serializable { private String customerId; public interface Staff extends CustomerClientShowGroup {} + /** + * 手机号 + * 可以不填 + */ + private String mobile; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java index 2319248c83..c6f991e732 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java @@ -53,7 +53,9 @@ public interface CustomerStaffDao extends BaseDao { * @Description 模糊查询用户、角色信息 * @author sun */ - List selectByRealName(@Param("customerId") String customerId, @Param("realName") String realName); + List selectByRealName(@Param("customerId") String customerId, + @Param("realName") String realName, + @Param("mobile") String mobile); /** * @Description 分页查询排好序的工作人员Id列表 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index d81bb9b1e7..34e0b45ad2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -537,7 +537,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { @Override public List listStaff(ListStaffFormDTO formDTO) { //1.模糊查询用户、角色信息 - List resultList = customerStaffDao.selectByRealName(formDTO.getCustomerId(), formDTO.getRealName()); + List resultList = customerStaffDao.selectByRealName(formDTO.getCustomerId(), formDTO.getRealName(),formDTO.getMobile()); if (null == resultList || resultList.size() < NumConstant.ONE) { return new ArrayList<>(); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml index 2ee923a736..fe3eb13354 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml @@ -49,7 +49,12 @@ WHERE del_flag = '0' AND customer_id = #{customerId} - AND real_name LIKE CONCAT('%', #{realName}, '%') + + AND real_name LIKE CONCAT('%', #{realName}, '%') + + + and MOBILE LIKE CONCAT('%', #{mobile}, '%') + From d1aeedeba31b44e8739569379a93cd5276704e7b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 21 Feb 2023 15:01:27 +0800 Subject: [PATCH 8/8] test --- .../templates/icpartyactivity_import_tem.xlsx | Bin 9051 -> 9049 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/icpartyactivity_import_tem.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/icpartyactivity_import_tem.xlsx index a21f2da6ccbfdcf1c9256336eaddcfcf5ccfec61..143cdaa637a7013aed8475a160f06aa52c6c1931 100644 GIT binary patch delta 1089 zcmV-H1it&*M%hNNlK};6)1#eAlb8W5f2IL8QL`sEF%hHj*0i&`L|RB&W%1+-c=R=V zE8}ZeU>Diw!Q=G*=bL{fP3Bu!de5LuQK=M#0YM%pUWr1jQ*@gz{4?Yk%amYcr65Hu z7&On0j}l%}UTL`2RSnt}U_3`shVnW^8*6KdvEdt#%mmJ%oVcpAWY(2>jcdjqf7u#v zM93+YV3}Z+;ST86BN6S8f{)1hNtZo9a113#P}blu2=R~Cf|lmbhF+OCWntUe?X-(K zWeYxtqkC(L(bzOi(8PTVmp{b!%d4AyRliW(tvH}85u9=j%vL&UUu1$Ob$7dx8M}06 zUKJqD+wAM(_4DmL!M_y;>T?e?I}n~rLWkUY_8i#nw+LlLJ2fn6{6YX^w-bT^#@9fWlh1PY9Oc2VCci_ z{kv(W^pmLoEJ1|E71Yc`s)YtmN~LRNajQ46X*ICI2h}pplH@k7nP_N0 znCMF|R9OlROU1V}G&X=}kjx@~Q-6up^l1CyBD_Mg4r}fC98p|`lL0RspYf{&*UG5U zMqJf#pmtv6eSCjXXU)%mUTId%^wYMzM&K5UTMH@dvoE(N1oj1|>$<3GO~ji6i=zgm zcQM$-)>u_9nPqe~^%Hp1@oZWM?4lbz(NN}eo=!fc6z$&Qw}8$Z{S(X9KYu_1w@{!| zC~*>4EA`|Yzo02`*xtb*GH%5V79b@8XQ-loKF8HOn_T@}Ek~J46c3q>|NE>fFP=wD z3MkoD+J%yTL}9C(-qYUpU3H&9Y$}VCM$ru=YHOuv;4ADvVn9yEE)iD}QSnP^;e<{} z&Gw;+fH*?s8~ZF#<4BhKet#X3`IZc!c-?acfM!#zI)axAdx+N_zkzQUmN&RzWJ4jt zc+kIP?x{#8Hz*bEK;{7j>%ka<*4-?b#yeC4KX`mR_ef7Y7QqAS7*H^>Q;+32#^}@o zb?>S<<}n^TVyw8=XJ|poHt>z)Wwb7B64u3_gH>Whbud zrBb%vphPQww(>@IHHH^<_8+rR2NxItq?2hMKmiPssvk1}Fq7UNlLc(kqn%2Vb|6#% z{*%ifKmk^h3?VQ9Sd%>=HUfVflbswKlaV1R0X~zwAwdCxll~z(0Z)@TA~peblW-zH z0l1T~B0K?ilkOrR9O`Bob#?*(0Hy^102lxO000000096X0001^1e3r78k0pM5C%LS H00000rfTsM(VyCSo++ns#=VNDFDJES`J;kG_U) zWqb__>>?XIc%1(KeDlww$$TSA?-{fyDwU!zAjkv7D^aLbif;3Te}X(?nG&q56r`vH zgXY=cLBeawD-GAWszKWVjOR$oP+q5KZEa04Hhc||nZP-e6PJ~i%(_yqaLxE5e_H{L z2sy?QEECK!+yVW1B%&=+@DW)*>9Pk1j-dnz${HL7A^!1N(9-hh*v)h|?cD-I}21gBgBvz5-;7n$Hm-QBKa#$LHI zFAET7ZT9u?`uX;r;NOY^^|=QcJP6Mvp+oMSau=UpP_;u~6CaBqdJ&ew1Xp2~re&u`G%_JS2}azdO{D>_Ho$nw+LlLJ2fn6{6YZ^w-bz zJoA3(FI;?fz zb3}0!PDZ?Rdd9C7Tq~nW8*x>~f!cYMxAE;soi#rLdZAf0(~rCM5`kMRZX=|yPrlrN z5ZGs&uIr+%H4$%m7Do+AZ(^{^ow2H3G0W&;?kDh|3ur;lv1>N zkKY11bM#Lv+x!3t+(Lm;p~OjGqtv5w{DP*$VS5LM$hZ}ISb~%YoS};T`5YJb+3e!) zdX-IFqIk@7{6Az}d+|JIQb5Ue(k_+!BMMvP^p*~`@2dL@Vq00HG>NV#Q9CO|17Bee z5(9ENb&0r=h>BlQe+wscN@{ipRRqKdD&N>Ai5f?;-1n-?acfEIJDI)axA zdx+N_zkzQUmN&Rz;C%aoaXjeXGWS%Zvn!MecOdrx1?#~WW`oxKBALf~R0HolKAwA| zryk4Tfpv@+*{R3s9Ak3ofx36q9P^lt9x+xt=rgpSWn1{h^j0*6NGLIH61gGjpv17T zs`c&ID2tabbOs+lz_Jt9^-?K2Y*3<=KU;gFyBgyQyZ8@~9RsIss9WHzGCxc$01-KmodwuOd7Fc$4fR zAsmQE{dac)005>1000;O0000000031AOHXWqy&?{1R54lO9ci10000H01*HO1ONa& I9{>OV05-M_k^lez