|  | @@ -1,15 +1,20 @@
 | 
	
		
			
				|  |  |  package com.ym.mec.web.service.impl;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +import java.util.List;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +import org.springframework.beans.factory.annotation.Autowired;
 | 
	
		
			
				|  |  | +import org.springframework.stereotype.Service;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  import com.ym.mec.common.dal.BaseDAO;
 | 
	
		
			
				|  |  |  import com.ym.mec.common.page.PageInfo;
 | 
	
		
			
				|  |  |  import com.ym.mec.common.page.QueryInfo;
 | 
	
		
			
				|  |  |  import com.ym.mec.common.service.impl.BaseServiceImpl;
 | 
	
		
			
				|  |  |  import com.ym.mec.web.dal.dao.StudentAttendanceDao;
 | 
	
		
			
				|  |  | +import com.ym.mec.web.dal.dto.StudentAttendancePageInfo;
 | 
	
		
			
				|  |  |  import com.ym.mec.web.dal.dto.StudentStatusCountUtilEntity;
 | 
	
		
			
				|  |  |  import com.ym.mec.web.dal.entity.StudentAttendance;
 | 
	
		
			
				|  |  |  import com.ym.mec.web.dal.enums.StudentAttendanceStatusEnum;
 | 
	
		
			
				|  |  |  import com.ym.mec.web.dal.page.StudentAttendanceQueryInfo;
 | 
	
		
			
				|  |  | -import com.ym.mec.web.dal.utilEntity.StudentAttendancePageInfo;
 | 
	
		
			
				|  |  |  import com.ym.mec.web.service.StudentAttendanceService;
 | 
	
		
			
				|  |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
	
		
			
				|  |  |  import org.springframework.stereotype.Service;
 | 
	
	
		
			
				|  | @@ -32,16 +37,17 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 | 
	
		
			
				|  |  |  	@Override
 | 
	
		
			
				|  |  |  	public void addStudentAttendances(List<StudentAttendance> studentAttendances) {
 | 
	
		
			
				|  |  |  		studentAttendances.forEach(studentAttendance -> {
 | 
	
		
			
				|  |  | -			if(studentAttendance.getStatus()!= StudentAttendanceStatusEnum.DROP_OUT){
 | 
	
		
			
				|  |  | +			if (studentAttendance.getStatus() != StudentAttendanceStatusEnum.DROP_OUT) {
 | 
	
		
			
				|  |  |  				studentAttendanceDao.insert(studentAttendanceDao.getStudentAttendanceInfo(studentAttendance));
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  		});
 | 
	
		
			
				|  |  |  	}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	@Override
 | 
	
		
			
				|  |  | -	public StudentAttendancePageInfo queryPage(QueryInfo queryInfo) {
 | 
	
		
			
				|  |  | +	public Map<String, Object> getCurrentCourseStudents(QueryInfo queryInfo) {
 | 
	
		
			
				|  |  | +		Map<String,Object> result=new HashMap<>();
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  		PageInfo pageInfo = super.queryPage(queryInfo);
 | 
	
		
			
				|  |  | -		StudentAttendancePageInfo studentAttendancePageInfo = new StudentAttendancePageInfo();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  		result.put("pageInfo",pageInfo);
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -50,7 +56,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 | 
	
		
			
				|  |  |  		stringIntegerMap.forEach(studentStatusCount->{
 | 
	
		
			
				|  |  |  			switch (studentStatusCount.getStudentStatus()){
 | 
	
		
			
				|  |  |  				case LEAVE:
 | 
	
		
			
				|  |  | -					studentAttendancePageInfo.setNumberOfLeavePeoples(studentStatusCount.getNumberOfStudent());
 | 
	
		
			
				|  |  | +					result.put("numberOfLeavePeoples",studentStatusCount.getNumberOfStudent());
 | 
	
		
			
				|  |  |  					break;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  			}
 |