张延森 2 年前
父节点
当前提交
3435a409b1

+ 2
- 1
src/main/java/com/yunzhi/marketing/borker/controller/BorkerController.java 查看文件

35
                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
35
                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
36
                                       @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
36
                                       @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
37
                                       @ApiParam("姓名") @RequestParam(value ="name", required = false) String name,
37
                                       @ApiParam("姓名") @RequestParam(value ="name", required = false) String name,
38
+                                      @ApiParam("推荐人") @RequestParam(value ="recommendPersonName", required = false) String recommendPersonName,
38
                                       @ApiParam("排序规则") @RequestParam(value ="sortOrder", defaultValue = "DESC") String sortOrder,
39
                                       @ApiParam("排序规则") @RequestParam(value ="sortOrder", defaultValue = "DESC") String sortOrder,
39
                                       @ApiParam("排序字段") @RequestParam(value ="sortField", defaultValue = "create_date") String sortField) throws Exception {
40
                                       @ApiParam("排序字段") @RequestParam(value ="sortField", defaultValue = "create_date") String sortField) throws Exception {
40
 
41
 
41
         IPage<BorkerVO> page = new Page<>(pageNum, pageSize);
42
         IPage<BorkerVO> page = new Page<>(pageNum, pageSize);
42
-        IPage<BorkerVO> result = iTaPersonService.getBorkerPage(page, name, phone, sortOrder, sortField);
43
+        IPage<BorkerVO> result = iTaPersonService.getBorkerPage(page, name, phone, recommendPersonName, sortOrder, sortField);
43
         return ResponseBean.success(result);
44
         return ResponseBean.success(result);
44
     }
45
     }
45
 
46
 

+ 1
- 0
src/main/java/com/yunzhi/marketing/mapper/TaPersonMapper.java 查看文件

270
                                   @Param("personType") String personType,
270
                                   @Param("personType") String personType,
271
                                   @Param("name") String name,
271
                                   @Param("name") String name,
272
                                   @Param("phone") String phone,
272
                                   @Param("phone") String phone,
273
+                                  @Param("recommendPersonName") String recommendPersonName,
273
                                   @Param("sortOrder") String sortOrder,
274
                                   @Param("sortOrder") String sortOrder,
274
                                   @Param("sortField") String sortField);
275
                                   @Param("sortField") String sortField);
275
 }
276
 }

+ 1
- 1
src/main/java/com/yunzhi/marketing/service/ITaPersonService.java 查看文件

132
      */
132
      */
133
     ResponseBean marketing(PersonMarketingDTO marketingDTO, String openid);
133
     ResponseBean marketing(PersonMarketingDTO marketingDTO, String openid);
134
 
134
 
135
-    IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page, String name, String phone, String sortOrder, String sortField);
135
+    IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page, String name, String phone, String recommendPersonName, String sortOrder, String sortField);
136
 }
136
 }

+ 2
- 2
src/main/java/com/yunzhi/marketing/service/impl/TaPersonServiceImpl.java 查看文件

1347
     }
1347
     }
1348
 
1348
 
1349
     @Override
1349
     @Override
1350
-    public IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page, String name, String phone, String sortOrder, String sortField) {
1351
-        return baseMapper.getBorkerPage(page, CommConstant.PERSON_BORKER, name, phone, sortOrder, sortField);
1350
+    public IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page, String name, String phone, String recommendPersonName, String sortOrder, String sortField) {
1351
+        return baseMapper.getBorkerPage(page, CommConstant.PERSON_BORKER, name, phone, recommendPersonName, sortOrder, sortField);
1352
     }
1352
     }
1353
 }
1353
 }

+ 4
- 1
src/main/resources/mapper/TaPersonMapper.xml 查看文件

679
             t.person_type = #{personType}
679
             t.person_type = #{personType}
680
           AND t.`status` &gt; -1
680
           AND t.`status` &gt; -1
681
           <if test="name != null and name != ''">
681
           <if test="name != null and name != ''">
682
-              AND ( t.NAME LIKE CONCAT( '%', #{name}, '%' ) OR t.nickname LIKE CONCAT( '%', #{name}, '%' ) )
682
+              AND ( t.`name` LIKE CONCAT( '%', #{name}, '%' ) OR t.nickname LIKE CONCAT( '%', #{name}, '%' ) )
683
           </if>
683
           </if>
684
           <if test="phone != null and phone != ''">
684
           <if test="phone != null and phone != ''">
685
               AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
685
               AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
686
           </if>
686
           </if>
687
+        <if test="recommendPersonName != null and recommendPersonName != ''">
688
+            AND ( m.`name` LIKE CONCAT( '%', #{recommendPersonName}, '%' ) OR m.nickname LIKE CONCAT( '%', #{recommendPersonName}, '%' ) )
689
+        </if>
687
         ORDER BY
690
         ORDER BY
688
             <if test="sortField == 'customer_num'">
691
             <if test="sortField == 'customer_num'">
689
                 s.customer_num
692
                 s.customer_num