feats

src/main/java/com/yunzhi/marketing/borker/controller/BorkerController.java

@@ -35,11 +35,12 @@ public class BorkerController  extends BaseController {
                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                       @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
                                       @ApiParam("姓名") @RequestParam(value ="name", required = false) String name,
+                                      @ApiParam("推荐人") @RequestParam(value ="recommendPersonName", required = false) String recommendPersonName,
                                       @ApiParam("排序规则") @RequestParam(value ="sortOrder", defaultValue = "DESC") String sortOrder,
                                       @ApiParam("排序字段") @RequestParam(value ="sortField", defaultValue = "create_date") String sortField) throws Exception {
 
         IPage<BorkerVO> page = new Page<>(pageNum, pageSize);
-        IPage<BorkerVO> result = iTaPersonService.getBorkerPage(page, name, phone, sortOrder, sortField);
+        IPage<BorkerVO> result = iTaPersonService.getBorkerPage(page, name, phone, recommendPersonName, sortOrder, sortField);
         return ResponseBean.success(result);
     }
 

src/main/java/com/yunzhi/marketing/mapper/TaPersonMapper.java

@@ -270,6 +270,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
                                   @Param("personType") String personType,
                                   @Param("name") String name,
                                   @Param("phone") String phone,
+                                  @Param("recommendPersonName") String recommendPersonName,
                                   @Param("sortOrder") String sortOrder,
                                   @Param("sortField") String sortField);
 }

src/main/java/com/yunzhi/marketing/service/ITaPersonService.java

@@ -132,5 +132,5 @@ public interface ITaPersonService extends IService<TaPerson> {
      */
     ResponseBean marketing(PersonMarketingDTO marketingDTO, String openid);
 
-    IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page, String name, String phone, String sortOrder, String sortField);
+    IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page, String name, String phone, String recommendPersonName, String sortOrder, String sortField);
 }

src/main/java/com/yunzhi/marketing/service/impl/TaPersonServiceImpl.java

@@ -1347,7 +1347,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page, String name, String phone, String sortOrder, String sortField) {
-        return baseMapper.getBorkerPage(page, CommConstant.PERSON_BORKER, name, phone, sortOrder, sortField);
+    public IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page, String name, String phone, String recommendPersonName, String sortOrder, String sortField) {
+        return baseMapper.getBorkerPage(page, CommConstant.PERSON_BORKER, name, phone, recommendPersonName, sortOrder, sortField);
     }
 }

src/main/resources/mapper/TaPersonMapper.xml

@@ -679,11 +679,14 @@ FROM
             t.person_type = #{personType}
           AND t.`status` > -1
           <if test="name != null and name != ''">
-              AND ( t.NAME LIKE CONCAT( '%', #{name}, '%' ) OR t.nickname LIKE CONCAT( '%', #{name}, '%' ) )
+              AND ( t.`name` LIKE CONCAT( '%', #{name}, '%' ) OR t.nickname LIKE CONCAT( '%', #{name}, '%' ) )
           </if>
           <if test="phone != null and phone != ''">
               AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
           </if>
+        <if test="recommendPersonName != null and recommendPersonName != ''">
+            AND ( m.`name` LIKE CONCAT( '%', #{recommendPersonName}, '%' ) OR m.nickname LIKE CONCAT( '%', #{recommendPersonName}, '%' ) )
+        </if>
         ORDER BY
             <if test="sortField == 'customer_num'">
                 s.customer_num