Merge remote-tracking branch 'origin/房屋tree_yzm'

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 keyWord;
 }

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<CustomerStaffEntity> {
      * @Description 模糊查询用户、角色信息
      * @author sun
      */
-    List<ListStaffResultDTO> selectByRealName(@Param("customerId") String customerId, @Param("realName") String realName);
+    List<ListStaffResultDTO> selectByRealName(@Param("customerId") String customerId,
+                                              @Param("realName") String realName,
+                                              @Param("keyWord") String keyWord);
 
     /**
      * @Description 分页查询排好序的工作人员Id列表

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<ListStaffResultDTO> listStaff(ListStaffFormDTO formDTO) {
         //1.模糊查询用户、角色信息
-        List<ListStaffResultDTO> resultList = customerStaffDao.selectByRealName(formDTO.getCustomerId(), formDTO.getRealName());
+        List<ListStaffResultDTO> resultList = customerStaffDao.selectByRealName(formDTO.getCustomerId(), formDTO.getRealName(),formDTO.getKeyWord());
         if (null == resultList || resultList.size() < NumConstant.ONE) {
             return new ArrayList<>();
         }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml

@@ -49,7 +49,14 @@
         WHERE
             del_flag = '0'
         AND customer_id = #{customerId}
+        <if test='null != realName and "" !=realName'>
             AND real_name LIKE CONCAT('%', #{realName}, '%')
+        </if>
+        <if test='null != keyWord and "" !=keyWord'>
+            AND (REAL_NAME LIKE CONCAT('%', #{keyWord}, '%')
+               or MOBILE LIKE CONCAT('%', #{keyWord}, '%')
+            )
+        </if>
     </select>
 
     <select id="selectOrderRole" resultType="java.lang.String">

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;
 
     /**
@@ -70,6 +73,7 @@ public class ChangeWelfareDTO implements Serializable {
     /**
      * 加入原因
      */
+    @Length(max = 250,message = "添加原因最多输入250字",groups = AddUserShowGroup.class)
 	private String joinReason;
 
     /**
@@ -80,6 +84,7 @@ public class ChangeWelfareDTO implements Serializable {
     /**
      * 移除原因
      */
+    @Length(max = 250,message = "移除原因最多输入250字",groups = RemoveWelfareShowGroup.class)
 	private String removeReason;
 
     /**

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();
     }
@@ -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);
     }
 

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<ChangeWelfareDao,
     @Override
     public PageData<ChangeWelfareDTO> page(Map<String, Object> params) {
         params.put("customerId", loginUserUtil.getLoginUserCustomerId());
-        IPage<ChangeWelfareDTO> page = getPage(params);
+        // IPage<ChangeWelfareDTO> page = getPage(params);
+        PageHelper.startPage(Integer.valueOf((String) params.get("page")), Integer.valueOf((String) params.get("limit")));
         List<ChangeWelfareDTO> list = baseDao.getWelfareList(params);
-        return new PageData<>(list, page.getTotal());
+        PageInfo<ChangeWelfareDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
     }
 
     @Override

epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml

@@ -56,13 +56,13 @@
             AND w.GRID_ID = #{gridId}
         </if>
         <if test="name != null and name != ''">
-            AND w.NAME = #{name}
+            AND w.NAME  like concat('%', #{name},'%')
         </if>
         <if test="idCard != null and idCard != ''">
-            AND w.ID_CARD = #{idCard}
+            AND w.ID_CARD like concat('%', #{idCard},'%')
         </if>
         <if test="mobile != null and mobile != ''">
-            AND w.MOBILE = #{mobile}
+            AND w.MOBILE like concat('%', #{mobile},'%')
         </if>
         <if test="startTime != null and startTime != ''">
             AND w.JOIN_DATE >= #{startTime}
@@ -73,7 +73,7 @@
         <if test="categoryName != null and categoryName != ''">
             AND w.CATEGORY_NAME  like concat('%',#{categoryName},'%')
         </if>
-        <if test="grantFlag != null">
+        <if test="grantFlag != null and grantFlag != ''">
             AND w.GRANT_FLAG = #{grantFlag}
         </if>
         order by w.CREATED_TIME desc