合并

src/main/java/com/huiju/estateagents/activity/controller/ActivityController.java

@@ -75,6 +75,9 @@ public class ActivityController extends BaseController {
 		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
 		taPersonQueryWrapper.eq("person_id",taRecommendCustomer.getPersonId());
 		TaPerson person = taPersonService.getOne(taPersonQueryWrapper);
+		if (null == person){
+			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+		}
 		responseBean = activityService.getCustomerActivityList(pageNumber,pageSize,orgId,person);
 		return responseBean;
 	}

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

@@ -203,17 +203,17 @@ public class TaPersonVisitRecordController extends BaseController {
     
     /**
      * 盘客工具分页获取访问记录
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @return
      */
     @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.GET)
-    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                 @RequestParam(value = "customerId") String customerId){
         try {
             //使用分页插件
-            IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
+            IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getPersonVisitRecordList(pg, customerId);
             return ResponseBean.success(result);
         }catch (Exception e){

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerFollowUpRecordController.java

@@ -186,14 +186,14 @@ public class TaCustomerFollowUpRecordController extends BaseController {
     
     /**
      * 分页查询跟进记录列表
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @return
      */
     @RequestMapping(value="/wx/taCustomerFollowUpRecord",method= RequestMethod.GET)
-    public ResponseBean wxCustomerFollowUpRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean wxCustomerFollowUpRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                     @RequestParam(value ="customerId",required = true) Integer customerId,
+                                                     @RequestParam(value ="customerId",required = true) String customerId,
                                                      HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
@@ -205,7 +205,7 @@ public class TaCustomerFollowUpRecordController extends BaseController {
         TaPerson person = taPersons.get(0);
         try {
             //使用分页插件
-            IPage<TaCustomerFollowUpRecord> pg = new Page<>(pageNum, pageSize);
+            IPage<TaCustomerFollowUpRecord> pg = new Page<>(pageNumber, pageSize);
             QueryWrapper<TaCustomerFollowUpRecord> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("follower_id",person.getPersonId());
             queryWrapper.eq("org_id",orgId);
@@ -222,3 +222,4 @@ public class TaCustomerFollowUpRecordController extends BaseController {
         return responseBean;
     }
 }
+

src/main/resources/mapper/Activity.xml

@@ -30,9 +30,10 @@
             t.enlist_id AS id,
             t.dynamic_id AS activityId,
             t.create_date AS createDate,
-            IF( t.is_checkin = 1, "已签到", "未签到" ) AS `status`,
+            IF( t.is_checkin = 1, "已签到", "未签到" ) AS `joinStatus`,
             d.list_img_url AS mainImg,
             d.title,
+            d.status,
             d.start_date AS startDate,
             d.enlist_end AS endDate,
             'dynamic' AS type
@@ -58,9 +59,10 @@
         "成功未核销"
         WHEN t.STATUS = 2 THEN
         "失败"
-        END `status`,
+        END `joinStatus`,
             d.list_img AS mainImg,
             d.activity_name AS title,
+            d.status,
             d.start_time AS startDate,
             d.end_time AS endDate,
             'group' AS type
@@ -86,9 +88,10 @@
                         "成功未核销"
                         WHEN t.STATUS = 2 THEN
                         "失败"
-                    END `status`,
+                    END `joinStatus`,
             d.list_img AS mainImg,
             d.title,
+            d.status,
             d.start_date AS startDate,
             d.end_date AS endDate,
             'help' AS type

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -607,8 +607,8 @@ FROM
 
     <select id="getMyCustStatistics" resultType="java.util.Map">
         SELECT
-            sum( IF ( STATUS = 4, 1, 0 ) ) AS followSum,
-            sum( IF ( STATUS != 4 AND STATUS != 4, 1, 0 ) ) AS clinchSum
+            sum( IF ( STATUS = 4, 1, 0 ) ) AS clinchSum,
+            sum( IF ( STATUS != 4 AND STATUS != 4, 1, 0 ) ) AS followSum
         FROM
             ta_recommend_customer
         WHERE