获取驻场客户列表

src/main/java/com/yunzhi/marketing/controller/TaRecommendCustomerController.java

@@ -83,6 +83,33 @@ public class TaRecommendCustomerController extends BaseController {
     private ITaUserService iTaUserService;
 
 
+
+    /**
+     * 驻场的客户列表
+     *
+     * @param pageNumber
+     * @param pageSize
+     * @param keywords
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/marking/customers")
+    @ApiOperation(value = "查询驻场的客户列表", notes = "查询驻场的客户列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNumber", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "keywords", paramType = "query", value = "搜索关键字，目前仅支持姓名"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query", value = "楼盘id必填")
+    })
+    public ResponseBean getMarkingCustList(@RequestParam int pageNumber, @RequestParam int pageSize, String keywords,@RequestParam("buildingId") String buildingId, HttpServletRequest request) {
+        if (pageNumber < 0 || pageSize < 0) {
+            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String openid = getOpenId(request);
+        return taRecommendCustomerService.getMarkingCustList(openid, keywords, pageNumber, pageSize,buildingId);
+    }
+
     /**
      * 我的客户列表
      *

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

@@ -196,4 +196,15 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @return
      */
     ResponseBean channelReportCust(ChannelReportDTO channelReportDTO) throws Exception;
+
+    /**
+     * 获取驻场的客户列表
+     * @param openid
+     * @param keywords
+     * @param pageNumber
+     * @param pageSize
+     * @param buildingId
+     * @return
+     */
+    ResponseBean getMarkingCustList(String openid, String keywords, int pageNumber, int pageSize, String buildingId);
 }

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

@@ -427,6 +427,33 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         return ResponseBean.success(channelCustomer);
     }
 
+    /**
+     * 获取驻场的客户列表
+     *
+     * @param openid
+     * @param keywords
+     * @param pageNumber
+     * @param pageSize
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public ResponseBean getMarkingCustList(String openid, String keywords, int pageNumber, int pageSize, String buildingId) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaPerson taPerson = taPersons.get(0);
+
+        IPage<TaRecommendCustomer> page = new Page<>();
+        page.setCurrent(pageNumber);
+        page.setSize(pageSize);
+
+        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.selectPage(page, null);
+        return ResponseBean.success(result);
+    }
+
     private void fillSomeFieldsOfCustomer(TaRecommendCustomer customer, TaPerson recommender, LocalDateTime now) {
         customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
         customer.setStatus(CommConstant.CUSTOMER_REPORT);

src/main/java/com/yunzhi/marketing/xlk/controller/InstitutionController.java

@@ -86,7 +86,7 @@ public class InstitutionController extends BaseController {
      * @return
      */
     @ApiOperation(value = "admin-组织机构列表查询", notes = "admin-组织机构列表查询")
-    @RequestMapping(value="/institution/save",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/institution/save",method= RequestMethod.POST)
     public ResponseBean institutionAdd(@RequestBody @Valid InstitutionDTO institutionDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -110,7 +110,7 @@ public class InstitutionController extends BaseController {
      */
     @ApiOperation(value = "admin-组织机构列表删除", notes = "admin-组织机构列表删除")
     @ResponseBody
-    @RequestMapping(value="/institution/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/institution/{id}", method= RequestMethod.DELETE)
     public ResponseBean institutionDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -130,7 +130,7 @@ public class InstitutionController extends BaseController {
      * @return
      */
     @ApiOperation(value = "admin-组织机构列表修改", notes = "admin-组织机构列表修改")
-    @RequestMapping(value="/institution/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/institution/{id}",method= RequestMethod.PUT)
     public ResponseBean institutionUpdate(@PathVariable String id,
                                           @RequestBody InstitutionDTO institutionDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -154,7 +154,7 @@ public class InstitutionController extends BaseController {
      * @param id  实体ID
      */
     @ApiOperation(value = "admin-组织机构列表查询详细", notes = "组织机构列表查询详细")
-    @RequestMapping(value="/institution/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/institution/{id}",method= RequestMethod.GET)
     public ResponseBean institutionGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {