|  | @@ -119,12 +119,11 @@ public class RealExamCollectionService extends Ele6RYBaseService {
 | 
	
		
			
				|  |  |          startPage();
 | 
	
		
			
				|  |  |          q.setExamCollectionType(RealExamCollection.Type.EXAM);
 | 
	
		
			
				|  |  |          List<RealExamCollectionVo> list = Collections.emptyList();
 | 
	
		
			
				|  |  | -        realExamCollectionMapper.selectRealExamCollectionList(q)
 | 
	
		
			
				|  |  | -                .forEach((RealExamCollection s) -> {
 | 
	
		
			
				|  |  | -                    RealExamCollectionVo t = new RealExamCollectionVo();
 | 
	
		
			
				|  |  | -                    BeanUtils.copyProperties(s, t);
 | 
	
		
			
				|  |  | -                    list.add(t);
 | 
	
		
			
				|  |  | -                });
 | 
	
		
			
				|  |  | +        realExamCollectionMapper.selectRealExamCollectionList(q).forEach((RealExamCollection s) -> {
 | 
	
		
			
				|  |  | +            RealExamCollectionVo t = new RealExamCollectionVo();
 | 
	
		
			
				|  |  | +            BeanUtils.copyProperties(s, t);
 | 
	
		
			
				|  |  | +            list.add(t);
 | 
	
		
			
				|  |  | +        });
 | 
	
		
			
				|  |  |          return getDataTable(list);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -150,8 +149,7 @@ public class RealExamCollectionService extends Ele6RYBaseService {
 | 
	
		
			
				|  |  |       * [教师]获取考试集合详细信息
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      public AjaxResult getExamInfoByTeacher(Long id) {
 | 
	
		
			
				|  |  | -        RealExamCollection f = realExamCollectionMapper.
 | 
	
		
			
				|  |  | -                selectRealExamCollectionByExamCollectionId(id);
 | 
	
		
			
				|  |  | +        RealExamCollection f = realExamCollectionMapper.selectRealExamCollectionByExamCollectionId(id);
 | 
	
		
			
				|  |  |          return AjaxResult.success(f);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -159,8 +157,7 @@ public class RealExamCollectionService extends Ele6RYBaseService {
 | 
	
		
			
				|  |  |       * [教师]获取练习集合详细信息
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      public AjaxResult getExerciseInfoByTeacher(Long id) {
 | 
	
		
			
				|  |  | -        RealExamCollection f = realExamCollectionMapper.
 | 
	
		
			
				|  |  | -                selectRealExamCollectionByExamCollectionId(id);
 | 
	
		
			
				|  |  | +        RealExamCollection f = realExamCollectionMapper.selectRealExamCollectionByExamCollectionId(id);
 | 
	
		
			
				|  |  |          return AjaxResult.success(f);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -470,11 +467,10 @@ public class RealExamCollectionService extends Ele6RYBaseService {
 | 
	
		
			
				|  |  |      private void closeAllByType(final String type) {
 | 
	
		
			
				|  |  |          RealExamCollection q = new RealExamCollection();
 | 
	
		
			
				|  |  |          q.setExamCollectionType(type);
 | 
	
		
			
				|  |  | -        selectRealExamCollectionList(q)
 | 
	
		
			
				|  |  | -                .forEach((RealExamCollection ec) -> {
 | 
	
		
			
				|  |  | -                    ec.setExamCollectionState(RealExamCollection.State.CLOSED);
 | 
	
		
			
				|  |  | -                    updateRealExamCollection(ec);
 | 
	
		
			
				|  |  | -                });
 | 
	
		
			
				|  |  | +        selectRealExamCollectionList(q).forEach((RealExamCollection ec) -> {
 | 
	
		
			
				|  |  | +            ec.setExamCollectionState(RealExamCollection.State.CLOSED);
 | 
	
		
			
				|  |  | +            updateRealExamCollection(ec);
 | 
	
		
			
				|  |  | +        });
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /**
 | 
	
	
		
			
				|  | @@ -507,4 +503,20 @@ public class RealExamCollectionService extends Ele6RYBaseService {
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          return list.get(0);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    public void deleteRefTypeSelfExercise() {
 | 
	
		
			
				|  |  | +        RealExamCollection q = new RealExamCollection();
 | 
	
		
			
				|  |  | +        q.setExamCollectionType(RealExamCollection.Type.SELF_EXERCISE);
 | 
	
		
			
				|  |  | +        List<RealExamCollection> list = selectRealExamCollectionList(q);
 | 
	
		
			
				|  |  | +        list.forEach((RealExamCollection rec) -> {
 | 
	
		
			
				|  |  | +            deleteRef(rec.getExamCollectionId());
 | 
	
		
			
				|  |  | +        });
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    public void deleteRef(Long id) {
 | 
	
		
			
				|  |  | +        // delete ref exam data.
 | 
	
		
			
				|  |  | +        realExamService.deleteRefByExamCollectionId(id);
 | 
	
		
			
				|  |  | +        // 
 | 
	
		
			
				|  |  | +        deleteRealExamCollectionByExamCollectionId(id);
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  |  }
 |