|  | @@ -414,9 +414,9 @@ namespace mxdemo.Mind
 | 
	
		
			
				|  |  |              // 6.11 hht +录取组合&报名组合(迭代至参数中acitve阶段的录取状态, getClassGenerationDetails专用)
 | 
	
		
			
				|  |  |              public int enrollGeneration; // 真实录取时的generation
 | 
	
		
			
				|  |  |              public string enrollGroupName; // 录取组合
 | 
	
		
			
				|  |  | -            public string rankInEnrolledGroup; // 录取排名:已录取情况下,组合所有录取同学中的排名, 录取排名/组合全部录取人数
 | 
	
		
			
				|  |  | +            public string rankInEnrolledGroup; // 录取排名:已录取情况下,组合所有录取同学中的排名, 录取排名/组合全校全部录取人数
 | 
	
		
			
				|  |  |              public string[] applyGroupNames; // active只会传入决策代,取active前一代的报名组合
 | 
	
		
			
				|  |  | -            public string rankInAppliedGroup; // 报名排名:报名时的排名(多志愿取一志愿) 报名排名/本阶段本组合1志愿报名人数
 | 
	
		
			
				|  |  | +            public string rankInAppliedGroup; // 报名排名:报名时的排名(多志愿取一志愿) 报名排名/applyGroupNames中1志愿报名全校总人数
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |              public long id { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 | 
	
		
			
				|  |  |              public string category { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 | 
	
	
		
			
				|  | @@ -562,11 +562,17 @@ namespace mxdemo.Mind
 | 
	
		
			
				|  |  |          /// </summary>
 | 
	
		
			
				|  |  |          ElectiveGenerationDetail[] searchElectiveGenerationDetails(int pageNum, int pageSize, int roundId, string keywords);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +        public class ClassGenerationDetailWrapper {
 | 
	
		
			
				|  |  | +          ElectiveGenerationDetail[] details;
 | 
	
		
			
				|  |  | +          int studentCount;  // 本班总人数
 | 
	
		
			
				|  |  | +          int enrolledCount; // 迭代至activeGeneration的本班录取人数
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          /// <summary>
 | 
	
		
			
				|  |  |          /// 重用getElectiveGenerationDetails, query=active=generation
 | 
	
		
			
				|  |  |          /// 学生查询接口,查询当前班级的选科数据
 | 
	
		
			
				|  |  |          /// </summary>
 | 
	
		
			
				|  |  | -        ElectiveGenerationDetail[] getClassGenerationDetails(int pageNum, int pageSize, int roundId, int generation, string queryCode);
 | 
	
		
			
				|  |  | +        ClassGenerationDetailWrapper getClassGenerationDetails(int pageNum, int pageSize, int roundId, int generation, string queryCode);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          #endregion
 | 
	
		
			
				|  |  |      }
 |