统计

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

@@ -100,13 +100,14 @@ public class TsCustomerStatisticDailyServiceImpl extends ServiceImpl<TsCustomerS
 			tsCustomerStatisticDaily.setDay(newDate);
 			tsCustomerStatisticDaily.setCustomerType(customerType);
 			tsCustomerStatisticDaily.setRealtyConsultant(personId);
-			newList.add(tsCustomerStatisticDaily);
+			
 			//合并数据
 			list.forEach(l -> {
 				if (newDate.equals(l.getDay())){
 					tsCustomerStatisticDaily.setCustomerNum(l.getCustomerNum());
 				}
 			});
+			newList.add(tsCustomerStatisticDaily);
 		}
 		
 		return newList;

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

@@ -92,19 +92,19 @@ public class TsCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TsCustome
 		List<TsCustomerStatisticMonthly> newList = new ArrayList<>();
 		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
 		for (int i = 0; i < 12;i++){
-			String newDate = nowDate.plusDays(-i).format(formatter);
+			String newDate = nowDate.plusMonths(-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());
 				}
 			});
+			newList.add(tsCustomerStatisticMonthly);
 		}
 		
 		return newList;