| 
														
															@@ -7,7 +7,9 @@ import com.ym.mec.biz.dal.enums.GroupType; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum; 
														 | 
														
														 | 
														
															 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.biz.dal.enums.OrderTypeEnum; 
														 | 
														
														 | 
														
															 import com.ym.mec.biz.dal.enums.OrderTypeEnum; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum; 
														 | 
														
														 | 
														
															 import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+import com.ym.mec.biz.dal.page.EndCourseScheduleQueryInfo; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo; 
														 | 
														
														 | 
														
															 import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+import com.ym.mec.biz.service.CourseScheduleService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.biz.service.ExportService; 
														 | 
														
														 | 
														
															 import com.ym.mec.biz.service.ExportService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.biz.service.StudentPaymentOrderService; 
														 | 
														
														 | 
														
															 import com.ym.mec.biz.service.StudentPaymentOrderService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.common.exception.BizException; 
														 | 
														
														 | 
														
															 import com.ym.mec.common.exception.BizException; 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -55,7 +57,7 @@ public class ExportServiceImpl implements ExportService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Autowired 
														 | 
														
														 | 
														
															     @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     private ReplacementInstrumentActivityDao replacementInstrumentActivityDao; 
														 | 
														
														 | 
														
															     private ReplacementInstrumentActivityDao replacementInstrumentActivityDao; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Autowired 
														 | 
														
														 | 
														
															     @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    private CourseScheduleDao courseScheduleDao; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+    private CourseScheduleService courseScheduleService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Override 
														 | 
														
														 | 
														
															     @Override 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Async 
														 | 
														
														 | 
														
															     @Async 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -723,8 +725,8 @@ public class ExportServiceImpl implements ExportService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Override 
														 | 
														
														 | 
														
															     @Override 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    public void superFindCourseSchedules(Map<String, Object> params, ManagerDownload managerDownload) throws FileNotFoundException { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        List<CourseScheduleEndDto> rows = courseScheduleDao.endFindCourseSchedules(params); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+    public void superFindCourseSchedules(EndCourseScheduleQueryInfo queryInfo, ManagerDownload managerDownload) throws FileNotFoundException { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        List<CourseScheduleEndDto> rows = courseScheduleService.endFindCourseSchedules(queryInfo).getRows(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         for (CourseScheduleEndDto row : rows) { 
														 | 
														
														 | 
														
															         for (CourseScheduleEndDto row : rows) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             row.setIsComplaints(StringUtils.equals(row.getIsComplaints(), "1") ? "有" : "无"); 
														 | 
														
														 | 
														
															             row.setIsComplaints(StringUtils.equals(row.getIsComplaints(), "1") ? "有" : "无"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 |