|
@@ -302,7 +302,11 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
|
|
|
marketingESBo day=null;
|
|
marketingESBo day=null;
|
|
|
if(null!=m.getDepartmentId())day=userMapper.marketingDepStatistics(m.getDepartmentId(),DateFormatUtils.format(rd.getDailyStart(), AFTConstants.YYYYMMDDHHMMSS),DateFormatUtils.format(rd.getDailyEnd(), AFTConstants.YYYYMMDDHHMMSS));
|
|
if(null!=m.getDepartmentId())day=userMapper.marketingDepStatistics(m.getDepartmentId(),DateFormatUtils.format(rd.getDailyStart(), AFTConstants.YYYYMMDDHHMMSS),DateFormatUtils.format(rd.getDailyEnd(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
Map<String,String> daily =valuesloading(day);
|
|
Map<String,String> daily =valuesloading(day);
|
|
|
- daily.put("AVG", calculateAVG((null==day||null==day.getYearFollowNo())?"0":day.getYearFollowNo(),(null==day||null==day.getDepartmentNumber())?"0":day.getDepartmentNumber()));
|
|
|
|
|
|
|
+ if (null==day||null==day.getYearFollowNo()||null==m.getDepartmentNumber()) {
|
|
|
|
|
+ daily.put("AVG", "0");
|
|
|
|
|
+ }else {
|
|
|
|
|
+ daily.put("AVG", calculateAVG(day.getYearFollowNo(),m.getDepartmentNumber()));
|
|
|
|
|
+ }
|
|
|
map.put("daily", daily);
|
|
map.put("daily", daily);
|
|
|
marketingESBo weekly=null;
|
|
marketingESBo weekly=null;
|
|
|
if(null!=m.getDepartmentId())weekly=userMapper.marketingDepStatistics(m.getDepartmentId(),DateFormatUtils.format(rd.getWeeklyStart(), AFTConstants.YYYYMMDDHHMMSS),DateFormatUtils.format(rd.getWeeklyEnd(), AFTConstants.YYYYMMDDHHMMSS));
|
|
if(null!=m.getDepartmentId())weekly=userMapper.marketingDepStatistics(m.getDepartmentId(),DateFormatUtils.format(rd.getWeeklyStart(), AFTConstants.YYYYMMDDHHMMSS),DateFormatUtils.format(rd.getWeeklyEnd(), AFTConstants.YYYYMMDDHHMMSS));
|