| 
					
				 | 
			
			
				@@ -507,10 +507,10 @@ public class StatisticsServiceImpl implements IStatisticsService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Long watchCount = consumptionBalanceMapper.queryWatchCount(param); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Long completedCount = consumptionBalanceMapper.queryCompletedCount(param); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(watchCount == 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(watchCount == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             watchCount = 0L; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(completedCount == 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(completedCount == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             completedCount = 0L; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -524,18 +524,18 @@ public class StatisticsServiceImpl implements IStatisticsService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     .divide(BigDecimal.valueOf(watchCount),4,BigDecimal.ROUND_HALF_UP) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     .multiply(BigDecimal.valueOf(100)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            dto.setCompletedRate(multiply.setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            dto.setWatchRate(multiply.setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            dto.setCompletedRate("0"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            dto.setWatchRate("0"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Long answerMemberCount = consumptionBalanceMapper.queryAnswerMemberCount(param); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Long correctUserCount = consumptionBalanceMapper.queryCorrectUserCount(param); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(answerMemberCount == 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(answerMemberCount == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             answerMemberCount = 0L; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(correctUserCount == 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(correctUserCount == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             correctUserCount = 0L; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 答题人数 
			 |