Просмотр исходного кода

Merge remote-tracking branch 'origin/test' into dev

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

+ 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);
 

+ 4 - 3
src/main/java/com/goafanti/common/mapper/DailySalesReportMapper.xml

@@ -343,6 +343,7 @@ ORDER by t1.departmentName
 	SUM( m.yearFollowNo )as yearFollowNo,
 	SUM( m.yearVisitNo )as yearVisitNo,
 	SUM( m.yearTelNo )as yearTelNo
+	
 from( 
 select a.id,sum(e.privateCustomersCount) as privateCustomersCount
 	from admin a left join user_role b
@@ -357,7 +358,7 @@ select a.id,sum(e.privateCustomersCount) as privateCustomersCount
 select x.aid,x.yearFollowNo,x.yearVisitNo,x.yearTelNo,
 			 y.monthFollowNo,y.monthVisitNo,y.monthTelNo,
 			 z.weeklyFollowNo,z.weeklyVisitNo,z.weeklyTelNo,
-			 w.dayFollowNo,w.dayVisitNo,dayTelNo
+			 w.dayFollowNo,w.dayVisitNo,w.dayTelNo
 			 from (
 select
 			aid,
@@ -404,7 +405,7 @@ select
 )m on n.id=m.aid	
 	</select>
   
-  <select id="privateCustomersDepCount" parameterType="String" resultType="com.goafanti.report.bo.CountDepMarketingStatisticsBo">
+  <select id="privateCustomersDepCount" parameterType="String" resultType="com.goafanti.report.bo.CountMarketingStatisticsBo">
 	select sum(t1.privateCustomersCount) as privateCustomersCount,sum(t1.departmentNumber) as departmentNumber,
 			sum(t2.yearFollowNo) as yearFollowNo,sum(t2.yearVisitNo) as yearVisitNo,sum(t2.yearTelNo) as yearTelNo,
 			 sum(t2.monthFollowNo) as monthFollowNo,sum(t2.monthVisitNo) as monthVisitNo,sum(t2.monthTelNo) as monthTelNo,
@@ -446,7 +447,7 @@ from admin m left join
 (select x.aid,x.yearFollowNo,x.yearVisitNo,x.yearTelNo,
 			 y.monthFollowNo,y.monthVisitNo,y.monthTelNo,
 			 z.weeklyFollowNo,z.weeklyVisitNo,z.weeklyTelNo,
-			 w.dayFollowNo,w.dayVisitNo,dayTelNo
+			 w.dayFollowNo,w.dayVisitNo,w.dayTelNo
 			 from (
 select
 			aid,

+ 17 - 1
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;
@@ -38,7 +40,7 @@ public class CountMarketingStatisticsBo {
 		}
 		return dayTelNo;
 	}
-	public void setDayTelNo(String dailyTelNo) {
+	public void setDayTelNo(String dayTelNo) {
 		this.dayTelNo = dayTelNo;
 	}
 	public String getDayFollowNo() {
@@ -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/bo/marketingESBo.java

@@ -1,6 +1,6 @@
 package com.goafanti.report.bo;
 
-import java.util.Map;
+
 
 public class marketingESBo {
 		private String id;

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

@@ -1,7 +1,6 @@
 package com.goafanti.report.service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
@@ -9,21 +8,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
-
-import com.alibaba.druid.sql.visitor.functions.If;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.DailySalesReportMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.DailySalesReport;
 import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.report.bo.CountDepMarketingStatisticsBo;
 import com.goafanti.report.bo.CountMarketingStatisticsBo;
 import com.goafanti.report.bo.DepartmentSalesReportBO;
@@ -282,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;