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

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

@@ -343,6 +343,7 @@ ORDER by t1.departmentName
 	SUM( m.yearFollowNo )as yearFollowNo,
 	SUM( m.yearFollowNo )as yearFollowNo,
 	SUM( m.yearVisitNo )as yearVisitNo,
 	SUM( m.yearVisitNo )as yearVisitNo,
 	SUM( m.yearTelNo )as yearTelNo
 	SUM( m.yearTelNo )as yearTelNo
+	
 from( 
 from( 
 select a.id,sum(e.privateCustomersCount) as privateCustomersCount
 select a.id,sum(e.privateCustomersCount) as privateCustomersCount
 	from admin a left join user_role b
 	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,
 select x.aid,x.yearFollowNo,x.yearVisitNo,x.yearTelNo,
 			 y.monthFollowNo,y.monthVisitNo,y.monthTelNo,
 			 y.monthFollowNo,y.monthVisitNo,y.monthTelNo,
 			 z.weeklyFollowNo,z.weeklyVisitNo,z.weeklyTelNo,
 			 z.weeklyFollowNo,z.weeklyVisitNo,z.weeklyTelNo,
-			 w.dayFollowNo,w.dayVisitNo,dayTelNo
+			 w.dayFollowNo,w.dayVisitNo,w.dayTelNo
 			 from (
 			 from (
 select
 select
 			aid,
 			aid,
@@ -404,7 +405,7 @@ select
 )m on n.id=m.aid	
 )m on n.id=m.aid	
 	</select>
 	</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,
 	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.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,
 			 sum(t2.monthFollowNo) as monthFollowNo,sum(t2.monthVisitNo) as monthVisitNo,sum(t2.monthTelNo) as monthTelNo,

+ 1 - 1
src/main/java/com/goafanti/report/bo/marketingESBo.java

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

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

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