feats

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

@@ -57,7 +57,7 @@ public class BkFirstScreenController extends BaseController {
                                           @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                           @ApiParam("城市") @RequestParam(value ="cityId", required = false) String cityId,
-                                          HttpServletRequest request) throws Exception{
+                                          HttpServletRequest request) throws Exception {
 
         IPage<BkFirstScreen> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<BkFirstScreen> queryWrapper = new QueryWrapper<>();

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

@@ -1,5 +1,7 @@
 package com.yunzhi.marketing.borker.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.borker.entity.BkBankCard;
@@ -13,10 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -30,6 +29,21 @@ public class BorkerController  extends BaseController {
     IBkBankCardService iBkBankCardService;
 
 
+    @RequestMapping(value="/admin/borker",method= RequestMethod.GET)
+    @ApiOperation(value="经纪人列表", notes = "经纪人列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getBorkerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @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 ="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);
+        return ResponseBean.success(result);
+    }
+
+
     @RequestMapping(value="/wx/bindBorker",method= RequestMethod.PUT)
     @ApiOperation(value="成为经纪人", notes = "成为经纪人", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean bindBorker(@ApiParam("经纪人信息") @RequestBody BorkerVO borkerVO,

src/main/java/com/yunzhi/marketing/borker/vo/BorkerVO.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -58,6 +59,17 @@ public class BorkerVO {
     @ApiModelProperty("待结算佣金")
     private Integer unsettledCommission;
 
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createDate;
+
+    @TableField(exist = false)
+    @ApiModelProperty("推荐人名称(上家)")
+    String recommendPersonName;
+
+    @TableField(exist = false)
+    @ApiModelProperty("客户数")
+    List<BkBankCard> customerNum;
+
     @TableField(exist = false)
     @ApiModelProperty("银行卡列表")
     List<BkBankCard> bankCardList;

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

@@ -3,6 +3,7 @@ package com.yunzhi.marketing.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.borker.vo.BorkerVO;
 import com.yunzhi.marketing.entity.TaBuildingDynamic;
 import com.yunzhi.marketing.entity.TaChannel;
 import com.yunzhi.marketing.entity.TaPerson;
@@ -264,4 +265,11 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     IPage<TaPerson> getMarketingList(Page<TaBuildingDynamic> page,@Param("buildingId") String buildingId);
 
     TaPerson getByPhone(@Param("phone") String phone);
+
+    IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page,
+                                  @Param("personType") String personType,
+                                  @Param("name") String name,
+                                  @Param("phone") String phone,
+                                  @Param("sortOrder") String sortOrder,
+                                  @Param("sortField") String sortField);
 }

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

@@ -3,7 +3,7 @@ package com.yunzhi.marketing.service;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.base.ResponseBean;
-import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.borker.vo.BorkerVO;
 import com.yunzhi.marketing.center.taUser.entity.TaUserVO;
 import com.yunzhi.marketing.dto.PersonMarketingDTO;
 import com.yunzhi.marketing.entity.TaCustomerFrom;
@@ -131,4 +131,6 @@ public interface ITaPersonService extends IService<TaPerson> {
      * @return
      */
     ResponseBean marketing(PersonMarketingDTO marketingDTO, String openid);
+
+    IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page, String name, String phone, String sortOrder, String sortField);
 }

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.borker.vo.BorkerVO;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
 import com.yunzhi.marketing.center.taUser.entity.TaUserVO;
 import com.yunzhi.marketing.center.taUser.mapper.TaUserMapper;
@@ -1344,4 +1345,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         // 返回刚刚绑定的楼盘ID
         return ResponseBean.success(taBuilding.getBuildingId());
     }
+
+    @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);
+    }
 }

src/main/resources/mapper/TaPersonMapper.xml

@@ -658,6 +658,41 @@ FROM
             t.phone = #{phone}
           AND t.`status` > -1
     </select>
+    <select id="getBorkerPage" resultType="com.yunzhi.marketing.borker.vo.BorkerVO">
+        SELECT
+            t.*,
+            IFNULL(m.`name`, m.nickname) AS recommend_person_name,
+            s.customer_num
+        FROM
+            ta_person t
+            LEFT JOIN (
+                SELECT
+                    a.recommend_person,
+                    count( 1 ) as customer_num
+                FROM xlk_channel_customer a
+                WHERE a.recommend_person_type = #{personType}
+                    AND a.status = 2
+                GROUP BY a.recommend_person
+                ) s ON s.recommend_person = t.person_id
+            LEFT JOIN ta_person m ON m.person_id = t.recommend_agent
+        WHERE
+            t.person_type = #{personType}
+          AND t.`status` &gt; -1
+          <if test="name != null and 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>
+        ORDER BY
+            <if test="sortField == 'customer_num'">
+                s.customer_num
+            </if>
+            <if test="sortField != 'customer_num'">
+                t.${sortField}
+            </if>
+            ${sortOrder}
+    </select>
 
     <insert id="savePersonPosition" parameterType="com.yunzhi.marketing.entity.TaPersonPositon">
         insert into ta_person_position