| 
					
				 | 
			
			
				@@ -3571,10 +3571,10 @@ public class DataDashboardService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for (DailyAuditProduceExport item : result) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             item.setDateStr(dateStr); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (item.getAuditCount()!= null && item.getAuditCount()!= 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (item.getAuditCount() != null && item.getAuditCount() != 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 item.setAuditPassRate((double) item.getAuditPassCount() / item.getAuditCount()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (item.getVideoAuditCount()!= null && item.getVideoAuditCount()!= 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (item.getVideoAuditCount() != null && item.getVideoAuditCount() != 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 item.setVideoAuditPassRate((double) item.getVideoAuditPassCount() / item.getVideoAuditCount()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3667,12 +3667,13 @@ public class DataDashboardService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             export.setViewCount(export.getViewCount() + item.getViewCount()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             export.setFirstLevel(export.getFirstLevel() + item.getFirstLevel()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             export.setFansCount(export.getFansCount() + item.getFans()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            positionMap.put(articleCategory.getCategory(), export); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<CategoryGroupDataExport> result = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for (Map.Entry<String, Map<String, CategoryGroupDataExport>> entry : resultMap.entrySet()) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (Map.Entry<String, CategoryGroupDataExport> item : entry.getValue().entrySet()) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 CategoryGroupDataExport export = item.getValue(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (export.getFansCount()!= null && export.getFansCount()!= 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (export.getFansCount() != null && export.getFansCount() != 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     export.setOpenRate((double) export.getFirstLevel() / export.getFansCount()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 result.add(export); 
			 |