anderx лет назад: 7
Родитель
Сommit
8f49d82625

+ 1 - 1
src/main/java/com/goafanti/common/dao/DailySalesReportMapper.java

@@ -63,7 +63,7 @@ public interface DailySalesReportMapper {
 			@Param("weeklyStart")String weeklyStart, @Param("weeklyEnd")String weeklyEnd, @Param("monthStart")String monthStart, @Param("monthEnd")String monthEnd,
 			@Param("yearStart")String yearStart, @Param("yearEnd")String yearEnd);
 
-	CountDepMarketingStatisticsBo privateCustomersDepCount(@Param("depId")String depId, @Param("dayStart")String dayStart, @Param("dayEnd")String dayEnd,
+	CountMarketingStatisticsBo privateCustomersDepCount(@Param("depId")String depId, @Param("dayStart")String dayStart, @Param("dayEnd")String dayEnd,
 			@Param("weeklyStart")String weeklyStart, @Param("weeklyEnd")String weeklyEnd, @Param("monthStart")String monthStart, @Param("monthEnd")String monthEnd,
 			@Param("yearStart")String yearStart, @Param("yearEnd")String yearEnd);
 

+ 16 - 0
src/main/java/com/goafanti/report/bo/CountMarketingStatisticsBo.java

@@ -2,9 +2,11 @@ package com.goafanti.report.bo;
 
 public class CountMarketingStatisticsBo {
 	private String privateCustomersCount;
+	private String departmentNumber;
 	private String dayVisitNo;
 	private String dayTelNo;
 	private String dayFollowNo;
+	private String dayAVG;
 	private String weeklyVisitNo;
 	private String weeklyTelNo;
 	private String weeklyFollowNo;
@@ -131,5 +133,19 @@ public class CountMarketingStatisticsBo {
 	public void setYearFollowNo(String yearFollowNo) {
 		this.yearFollowNo = yearFollowNo;
 	}
+	public String getDayAVG() {
+		if (null==dayAVG)return "0";
+		return dayAVG;
+	}
+	public void setDayAVG(String dayAVG) {
+		this.dayAVG = dayAVG;
+	}
+	public String getDepartmentNumber() {
+		if (null==departmentNumber)return "0";
+		return departmentNumber;
+	}
+	public void setDepartmentNumber(String departmentNumber) {
+		this.departmentNumber = departmentNumber;
+	}
 
 }

+ 1 - 1
src/main/java/com/goafanti/report/service/SalesReportServiceImpl.java

@@ -276,7 +276,7 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 
 	public CountMarketingStatisticsBo countMarketingDepStatistics(String depId) {
 		ReportDate rd = new ReportDate(new Date());
-		CountDepMarketingStatisticsBo count=salesReportMapper.privateCustomersDepCount(depId,rd.getStringDailyStart(),rd.getStringDailyEnd(),rd.getStringWeeklyStart(),rd.getStringWeeklyEnd(),
+		CountMarketingStatisticsBo count=salesReportMapper.privateCustomersDepCount(depId,rd.getStringDailyStart(),rd.getStringDailyEnd(),rd.getStringWeeklyStart(),rd.getStringWeeklyEnd(),
 				rd.getStringMonthStart(),rd.getStringMonthEnd(),rd.getStringYearStart(),rd.getStringYearEnd());
 		
 		return count;