统计

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.activity.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.activity.service.ActivityServiceI;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
@@ -66,17 +67,20 @@ public class ActivityController extends BaseController {
 		queryWrapper.eq("customer_id",customerId);
 		TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getOne(queryWrapper);
 		if (null == taRecommendCustomer){
-			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+			//验证人员信息失败小程序端希望是空数组对象
+			return ResponseBean.success(new Page(pageNumber,pageSize));
 		}
 		if (null == taRecommendCustomer.getPersonId()){
-			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+			//验证人员信息失败小程序端希望是空数组对象
+			return ResponseBean.success(new Page(pageNumber,pageSize));
 		}
 		
 		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);
+			//验证人员信息失败小程序端希望是空数组对象
+			return ResponseBean.success(new Page(pageNumber,pageSize));
 		}
 		responseBean = activityService.getCustomerActivityList(pageNumber,pageSize,orgId,person);
 		return responseBean;

src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerStatisticDailyServiceImpl.java

@@ -104,7 +104,7 @@ public class TsCustomerStatisticDailyServiceImpl extends ServiceImpl<TsCustomerS
 			//合并数据
 			list.forEach(l -> {
 				if (newDate.equals(l.getDay())){
-					tsCustomerStatisticDaily.setCustomerNum(l.getCustomerNum());
+					tsCustomerStatisticDaily.setCustomerNum(tsCustomerStatisticDaily.getCustomerNum() + l.getCustomerNum());
 				}
 			});
 			newList.add(tsCustomerStatisticDaily);

src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerStatisticMonthlyServiceImpl.java

@@ -101,7 +101,7 @@ public class TsCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TsCustome
 			tsCustomerStatisticMonthly.setRealtyConsultant(personId);
 			list.forEach(l -> {
 				if (newDate.equals(l.getMonth())){
-					tsCustomerStatisticMonthly.setCustomerNum(l.getCustomerNum());
+					tsCustomerStatisticMonthly.setCustomerNum(tsCustomerStatisticMonthly.getCustomerNum() + l.getCustomerNum());
 				}
 			});
 			newList.add(tsCustomerStatisticMonthly);