Browse Source

平均值显示BUG修复

anderx 7 years ago
parent
commit
61a5063452

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

@@ -317,8 +317,10 @@ select a.id,a.name,d.name as departmentName,role_name as roleName,ifnull(e.telNo
 	d.manager_id,
 	ifnull(e.telNo,0) as countTelNo,
 	ifnull(e.visitNo,0) as countVisitNo,
-	ifnull(e.followNo,0) as countFollowNo,
-	a.department_id
+	ifnull(e.followNo,0) as countFollowNo
+	<if test="startTime !=null and endTime !=null">
+			,e.followNo/datediff(#{endTime,jdbcType=VARCHAR},#{startTime,jdbcType=VARCHAR}) as AVG
+			</if>
 	from admin a left join user_role b on
 	a.id = b.uid left join role c on
 	b.rid = c.id left join department_management d on

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

@@ -302,7 +302,11 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 				marketingESBo day=null;
 				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);
-					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);
 				marketingESBo weekly=null;
 				if(null!=m.getDepartmentId())weekly=userMapper.marketingDepStatistics(m.getDepartmentId(),DateFormatUtils.format(rd.getWeeklyStart(), AFTConstants.YYYYMMDDHHMMSS),DateFormatUtils.format(rd.getWeeklyEnd(), AFTConstants.YYYYMMDDHHMMSS));