|
|
@@ -1,6 +1,7 @@
|
|
|
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;
|
|
|
@@ -10,13 +11,13 @@ 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.goafanti.achievement.bo.AchievementListBo;
|
|
|
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;
|
|
|
@@ -34,6 +35,8 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
|
|
|
|
|
|
@Autowired
|
|
|
DailySalesReportMapper salesReportMapper;
|
|
|
+ @Autowired
|
|
|
+ UserMapper userMapper;
|
|
|
|
|
|
public int insertDailyReports(Date startTime, Date endTime) {
|
|
|
List<DailySalesReport> list = salesReportMapper.selectAdmins();
|
|
|
@@ -247,7 +250,7 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
- public Pagination<marketingESBo> marketingStatistics(String depId, Integer type,Integer pNo,Integer pSize) {
|
|
|
+ public Pagination<marketingESBo> marketingStatistics(String depId,Integer pNo,Integer pSize) {
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
}
|
|
|
@@ -259,24 +262,124 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
|
|
|
if (StringUtils.isNotBlank(depId)) {
|
|
|
params.put("depId", depId);
|
|
|
}
|
|
|
- if (null!=type) {
|
|
|
- params.put("type", type);
|
|
|
- }
|
|
|
-
|
|
|
Pagination<marketingESBo> p=(Pagination<marketingESBo>) findPage("findmarketingStatisticsListByPage",
|
|
|
"findmarketingStatisticsCount",params,
|
|
|
pNo, pSize);
|
|
|
List<marketingESBo> list=(List<marketingESBo>) p.getList();
|
|
|
+ List<marketingESBo> l=new ArrayList<>();
|
|
|
|
|
|
- if (type==0) {
|
|
|
+ ReportDate rd = new ReportDate(new Date());
|
|
|
+
|
|
|
for (marketingESBo m : list) {
|
|
|
- ReportDate rd = new ReportDate(new Date());
|
|
|
- //salesReportMapper.get(m.getId(),rd.getDailyStart(), rd.getDailyStart());
|
|
|
+ marketingESBo day=userMapper.marketingStatistics(m.getId(),DateFormatUtils.format(rd.getDailyStart(), AFTConstants.YYYYMMDDHHMMSS),DateFormatUtils.format(rd.getDailyEnd(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ if (day!=null&&StringUtils.isBlank(day.getYearFollowNo())) {
|
|
|
+ m.setDailyFollowNo(day.getYearFollowNo());
|
|
|
+ }
|
|
|
+ if (day!=null&&StringUtils.isBlank(day.getYearTelNo())) {
|
|
|
+ m.setDailyTelNo(day.getYearTelNo());
|
|
|
+ }
|
|
|
+ if (day!=null&&StringUtils.isBlank(day.getYearVisitNo())) {
|
|
|
+ m.setDailyVisitNo(day.getYearVisitNo());
|
|
|
+ }
|
|
|
+ marketingESBo weekly=userMapper.marketingStatistics(m.getId(),DateFormatUtils.format(rd.getWeeklyStart(), AFTConstants.YYYYMMDDHHMMSS),DateFormatUtils.format(rd.getWeeklyEnd(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ if (weekly!=null&&StringUtils.isNotBlank(weekly.getYearFollowNo())) {
|
|
|
+ m.setWeeklyFollowNo(weekly.getYearFollowNo());
|
|
|
+ }
|
|
|
+ if (weekly!=null&&StringUtils.isNotBlank(weekly.getYearTelNo())) {
|
|
|
+ m.setWeeklyTelNo(weekly.getYearTelNo());
|
|
|
+ }
|
|
|
+ if (weekly!=null&&StringUtils.isNotBlank(weekly.getYearVisitNo())) {
|
|
|
+ m.setWeeklyVisitNo(weekly.getYearVisitNo());
|
|
|
+ }
|
|
|
+ marketingESBo month=userMapper.marketingStatistics(m.getId(),DateFormatUtils.format(rd.getMonthStart(), AFTConstants.YYYYMMDDHHMMSS),DateFormatUtils.format(rd.getMonthEnd(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ if (month!=null&&StringUtils.isNotBlank(month.getYearFollowNo())) {
|
|
|
+ m.setMonthFollowNo(month.getYearFollowNo());
|
|
|
+ }
|
|
|
+ if (month!=null&&StringUtils.isNotBlank(month.getYearTelNo())) {
|
|
|
+ m.setMonthTelNo(month.getYearTelNo());
|
|
|
+ }
|
|
|
+ if (month!=null&&StringUtils.isNotBlank(month.getYearVisitNo())) {
|
|
|
+ m.setMonthVisitNo(month.getYearVisitNo());
|
|
|
+ }
|
|
|
+ marketingESBo year=userMapper.marketingStatistics(m.getId(),DateFormatUtils.format(rd.getYearStart(), AFTConstants.YYYYMMDDHHMMSS),DateFormatUtils.format(rd.getYearEnd(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ if (year!=null&&StringUtils.isNotBlank(year.getYearFollowNo())) {
|
|
|
+ m.setYearFollowNo(year.getYearFollowNo());
|
|
|
+ }
|
|
|
+ if (year!=null&&StringUtils.isNotBlank(year.getYearTelNo())) {
|
|
|
+ m.setYearTelNo(year.getYearTelNo());
|
|
|
+ }
|
|
|
+ if (year!=null&&StringUtils.isNotBlank(year.getYearVisitNo())) {
|
|
|
+ m.setYearVisitNo(year.getYearVisitNo());
|
|
|
+ }
|
|
|
+ l.add(m);
|
|
|
}
|
|
|
-
|
|
|
- }else {
|
|
|
-
|
|
|
+ p.setList(l);
|
|
|
+ return p;
|
|
|
+ }
|
|
|
+
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
+ public Pagination<marketingESBo> marketingDepStatistics(String depId, Integer pNo, Integer pSize) {
|
|
|
+ if (pNo == null || pNo < 0) {
|
|
|
+ pNo = 1;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (pSize == null || pSize < 0 || pSize > 10) {
|
|
|
+ pSize = 10;
|
|
|
+ }
|
|
|
+ Map<String, Object> params=new HashMap<>();
|
|
|
+ if (StringUtils.isNotBlank(depId)) {
|
|
|
+ params.put("depId", depId);
|
|
|
}
|
|
|
+ Pagination<marketingESBo> p=(Pagination<marketingESBo>) findPage("findmarketingDepStatisticsListByPage","findmarketingDepStatisticsCount",params,pNo, pSize);
|
|
|
+ List<marketingESBo> list=(List<marketingESBo>) p.getList();
|
|
|
+ List<marketingESBo> l=new ArrayList<>();
|
|
|
+ ReportDate rd = new ReportDate(new Date());
|
|
|
+ for (marketingESBo m : list) {
|
|
|
+ marketingESBo day=userMapper.marketingDepStatistics(m.getDepartmentId(),DateFormatUtils.format(rd.getDailyStart(), AFTConstants.YYYYMMDDHHMMSS),DateFormatUtils.format(rd.getDailyEnd(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ if (day!=null&&StringUtils.isNotBlank(day.getYearFollowNo())) {
|
|
|
+ m.setDailyFollowNo(day.getYearFollowNo());
|
|
|
+ System.out.println(day.getYearFollowNo());
|
|
|
+ System.out.println(m.getDailyFollowNo());
|
|
|
+ }
|
|
|
+ if (day!=null&&StringUtils.isNotBlank(day.getYearTelNo())) {
|
|
|
+ m.setDailyTelNo(day.getYearTelNo());
|
|
|
+ }
|
|
|
+ if (day!=null&&StringUtils.isNotBlank(day.getYearVisitNo())) {
|
|
|
+ m.setDailyVisitNo(day.getYearVisitNo());
|
|
|
+ }
|
|
|
+ marketingESBo weekly=userMapper.marketingDepStatistics(m.getDepartmentId(),DateFormatUtils.format(rd.getWeeklyStart(), AFTConstants.YYYYMMDDHHMMSS),DateFormatUtils.format(rd.getWeeklyEnd(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ if (weekly!=null&&StringUtils.isNotBlank(weekly.getYearFollowNo())) {
|
|
|
+ m.setWeeklyFollowNo(weekly.getYearFollowNo());
|
|
|
+ }
|
|
|
+ if (weekly!=null&&StringUtils.isNotBlank(weekly.getYearTelNo())) {
|
|
|
+ m.setWeeklyTelNo(weekly.getYearTelNo());
|
|
|
+ }
|
|
|
+ if (weekly!=null&&StringUtils.isNotBlank(weekly.getYearVisitNo())) {
|
|
|
+ m.setWeeklyVisitNo(weekly.getYearVisitNo());
|
|
|
+ }
|
|
|
+ marketingESBo month=userMapper.marketingDepStatistics(m.getDepartmentId(),DateFormatUtils.format(rd.getMonthStart(), AFTConstants.YYYYMMDDHHMMSS),DateFormatUtils.format(rd.getMonthEnd(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ if (month!=null&&StringUtils.isNotBlank(month.getYearFollowNo())) {
|
|
|
+ m.setMonthFollowNo(month.getYearFollowNo());
|
|
|
+ }
|
|
|
+ if (month!=null&&StringUtils.isNotBlank(month.getYearTelNo())) {
|
|
|
+ m.setMonthTelNo(month.getYearTelNo());
|
|
|
+ }
|
|
|
+ if (month!=null&&StringUtils.isNotBlank(month.getYearVisitNo())) {
|
|
|
+ m.setMonthVisitNo(month.getYearVisitNo());
|
|
|
+ }
|
|
|
+ marketingESBo year=userMapper.marketingDepStatistics(m.getDepartmentId(),DateFormatUtils.format(rd.getYearStart(), AFTConstants.YYYYMMDDHHMMSS),DateFormatUtils.format(rd.getYearEnd(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ if (year!=null&&StringUtils.isNotBlank(year.getYearFollowNo())) {
|
|
|
+ m.setYearFollowNo(year.getYearFollowNo());
|
|
|
+ }
|
|
|
+ if (year!=null&&StringUtils.isNotBlank(year.getYearTelNo())) {
|
|
|
+ m.setYearTelNo(year.getYearTelNo());
|
|
|
+ }
|
|
|
+ if (year!=null&&StringUtils.isNotBlank(year.getYearVisitNo())) {
|
|
|
+ m.setYearVisitNo(year.getYearVisitNo());
|
|
|
+ }
|
|
|
+ l.add(m);
|
|
|
+ }
|
|
|
+ p.setList(l);
|
|
|
return p;
|
|
|
}
|
|
|
|