| 
														
															@@ -350,7 +350,7 @@ public class ExportServiceImpl implements ExportService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         exportFuncMap.put(ExportEnum.EXPORT_STUDENT_SERVE_INFO, (info) -> exportStudentServeInfo(info)); 
														 | 
														
														 | 
														
															         exportFuncMap.put(ExportEnum.EXPORT_STUDENT_SERVE_INFO, (info) -> exportStudentServeInfo(info)); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         exportFuncMap.put(ExportEnum.EXPORT_OPERATING_REPORT_NEW, (info) -> exportOperatingNew(info)); 
														 | 
														
														 | 
														
															         exportFuncMap.put(ExportEnum.EXPORT_OPERATING_REPORT_NEW, (info) -> exportOperatingNew(info)); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         exportFuncMap.put(ExportEnum.EXPORT_INDEX_COOP, (info) -> exportIndexCoop(info)); 
														 | 
														
														 | 
														
															         exportFuncMap.put(ExportEnum.EXPORT_INDEX_COOP, (info) -> exportIndexCoop(info)); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        exportFuncMap.put(ExportEnum.EXPORT_COURSE_INCOME, (info) -> exportCourseIncome(info)); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        exportFuncMap.put(ExportEnum.EXPORT_COURSE_INCOME, (info) -> exportCourseIncome(getQueryInfo(info, ExportCourseIncomeQueryInfo.class, false))); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															         //导出到报表中心 
														 | 
														
														 | 
														
															         //导出到报表中心 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -454,9 +454,8 @@ public class ExportServiceImpl implements ExportService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return indexService.indexCoop(organId,startTime,endTime); 
														 | 
														
														 | 
														
															         return indexService.indexCoop(organId,startTime,endTime); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    private List<ExportCourseIncomeDto> exportCourseIncome(Map<String, Object> info){ 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        String month = getParam(info, "date", String.class); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        return courseScheduleService.exportCourseIncome(month); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+    private List<ExportCourseIncomeDto> exportCourseIncome(ExportCourseIncomeQueryInfo queryInfo){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        return courseScheduleService.exportCourseIncome(queryInfo.getDate()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 |