统计

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

@@ -88,9 +88,28 @@ public class TsCustomerStatisticDailyServiceImpl extends ServiceImpl<TsCustomerS
 		//31天前的日期
 		LocalDateTime beforeDate = nowDate.plusDays(-31);
 		//获取31天的日期数据
-
 		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate,personId,userId);
-		return list;
+		//构造31天的数据
+		List<TsCustomerStatisticDaily> newList = new ArrayList<>();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+		for (int i = 0; i < 31;i++){
+			String newDate = nowDate.plusDays(-i).format(formatter);
+			TsCustomerStatisticDaily tsCustomerStatisticDaily = new TsCustomerStatisticDaily();
+			tsCustomerStatisticDaily.setOrgId(orgId);
+			tsCustomerStatisticDaily.setCustomerNum(0);
+			tsCustomerStatisticDaily.setDay(newDate);
+			tsCustomerStatisticDaily.setCustomerType(customerType);
+			tsCustomerStatisticDaily.setRealtyConsultant(personId);
+			newList.add(tsCustomerStatisticDaily);
+			//合并数据
+			list.forEach(l -> {
+				if (newDate.equals(l.getDay())){
+					tsCustomerStatisticDaily.setCustomerNum(l.getCustomerNum());
+				}
+			});
+		}
+		
+		return newList;
 	}
 	
 	/**

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

@@ -86,9 +86,28 @@ public class TsCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TsCustome
 		LocalDateTime nowDate = LocalDateTime.now();
 		//12个月前的日期
 		LocalDateTime beforeDate = nowDate.plusMonths(-12);
-		//获取31天的日期数据
+		//获取12个月数据
 		List<TsCustomerStatisticMonthly> list = customerStatisticMonthlyMapper.getMonthlyList(customerType,orgId,nowDate,beforeDate,personId,userId);
-		return list;
+		//构造12个月的数据
+		List<TsCustomerStatisticMonthly> newList = new ArrayList<>();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
+		for (int i = 0; i < 12;i++){
+			String newDate = nowDate.plusDays(-i).format(formatter);
+			TsCustomerStatisticMonthly tsCustomerStatisticMonthly = new TsCustomerStatisticMonthly();
+			tsCustomerStatisticMonthly.setCustomerType(customerType);
+			tsCustomerStatisticMonthly.setMonth(newDate);
+			tsCustomerStatisticMonthly.setCustomerNum(0);
+			tsCustomerStatisticMonthly.setOrgId(orgId);
+			tsCustomerStatisticMonthly.setRealtyConsultant(personId);
+			newList.add(tsCustomerStatisticMonthly);
+			list.forEach(l -> {
+				if (newDate.equals(l.getMonth())){
+					tsCustomerStatisticMonthly.setCustomerNum(l.getCustomerNum());
+				}
+			});
+		}
+		
+		return newList;
 	}
 	
 	/**