合并

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

@@ -289,15 +289,15 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="name",required = false) String name,
                                          @RequestParam(value ="tel",required = false) String tel,
                                          @RequestParam(value ="buildingId",required = false) String buildingId,
-                                         @RequestParam(value ="recommendName",required = false) String recommendName,
-                                         @RequestParam(value ="recommendTel",required = false) String recommendTel,
+                                         @RequestParam(value ="consultName",required = false) String consultName,
+                                         @RequestParam(value ="consultTel",required = false) String consultTel,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,recommendName,recommendTel,entryType,verifyStatus,sex, getOrgId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -345,7 +345,7 @@ FROM
             LEFT JOIN ta_person tp ON tarc.recommend_person = tp.person_id
             WHERE
               tarc.recommend_person = a.person_id and ifnull(tp.person_type, '') = 'customer'
-        ) AS recommedCount,
+        ) AS agentCount,
         (
             SELECT
               count( 1 )
@@ -354,7 +354,7 @@ FROM
             LEFT JOIN ta_person tp ON tarc.recommend_person = tp.person_id
             WHERE
               tarc.recommend_person = a.person_id and ifnull(tp.person_type, '') in ('channel agent', 'estate agent')
-        ) AS agentCount
+        ) AS recommedCount
         FROM
         ta_person a
         left join ta_channel_person tcp on a.person_id = tcp.person_id