diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index 7c01552..e813a46 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -60,7 +60,7 @@
 				</p>
 				<ul class="menu_1">
 					<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
-						<li onclick="event.stopPropagation();chooseListClass('${var.SCHOOL_ID}','${var.ID}')">
+						<li onclick="event.stopPropagation();chooseListClass('${SCHOOL_ID}','${var.ID}')">
 							<p>${ var.NAME }</p>
 						</li>
 			</c:forEach>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp
index 6d2e096..6780029 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp
@@ -57,17 +57,17 @@
 								</td>
 							</tr>
 							
-							<tr>
+							<%-- <tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">科目:</td>
 								<td>
-								<%-- <input type="number" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="32" placeholder="这里输入科目" title="科目" style="width:98%;"/></td> --%>
+								<input type="number" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="32" placeholder="这里输入科目" title="科目" style="width:98%;"/></td>
 								<select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入班级类型">
 									<c:forEach var="item" items="${subjects}">
 										<option value="${item.ID}"  <c:if test="${pd.SUBJECT_ID==item.ID}">selected="true"</c:if>>${item.CNAME}</option>
 									</c:forEach>
 								</select>
 								</td>
-							</tr>
+							</tr> --%>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">学期:</td>
 								<td>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp
index 30d5d4d..78018c6 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp
@@ -64,8 +64,8 @@
 						<th class="center"><div style="width:109px;">键盘</div></th>
 						<th class="center"><div style="width:80px;">正确率</div></th>
 						<th class="center"><div style="width:80px;">得分</div></th>						
-						<c:set value="${ fn:split(pd.DATA[0].ANSWER, ';') }" var="ANSWER" />
-						<c:forEach items="${ANSWER}" var="var" varStatus="vs">
+						<c:set value="${ fn:split(pd.HOMEWORKINFO.ANSWER_PERSENT, ',') }" var="AN" />
+						<c:forEach items="${AN}" var="var" varStatus="vs">
 							<th class="center th_w"><div style="width:80px;margin:0 auto;">题目${vs.index+1}</div></th>
 						</c:forEach>
 						
@@ -80,13 +80,14 @@
 								<tr>
 									<td class="center"><div style="width:80px;">${pd.DATA[vs.index].RANK}</div></td>
 									<td class="center"><div style="width:80px;">${var.NAME}</div></td>
-									<td class="center"><div style="width:80px;">${var.SNO}</div></td>
+									<td class="center"><div style="width:80px;">${var.NUMBER}</div></td>
 									<td class="center"><div style="width:80px;">${var.KEYPAD_ID}</div></td>
 									<td class="center"><div style="width:109px;"><fmt:formatNumber type="number" value="${pd.DATA[vs.index].STUDENT_SCORE/pd.DATA[vs.index].PAPER_SCORE*100}" pattern="0.00"/>%</div></td>
 									<td class="center"><div style="width:80px;">${pd.DATA[vs.index].STUDENT_SCORE}</div></td>
-									
-									<c:forEach items="${ANSWER}" var="var1" varStatus="vs1">
-										<c:set value="${ fn:split(ANSWER[vs1.index], ',') }" var="ANSWER1" />
+									<c:set value="${ fn:split(pd.DATA[vs.index].ANSWER, ';') }" var="ANSWER2" />
+									<c:set value="${ fn:split(pd.HOMEWORKINFO.ANSWER_PERSENT, ',') }" var="AN" />
+									<c:forEach items="${AN}" var="var1" varStatus="vs1">
+										<c:set value="${ fn:split(ANSWER2[vs1.index], ',') }" var="ANSWER1" />
 										<td class="center td_w" <c:if test="${ANSWER1[1]== '1'}">style="background:#0bb8b9"</c:if>><div style="width:80px;margin:0 auto;">${ANSWER1[0]==""?"--":ANSWER1[0]}</div></td>
 									</c:forEach>
 									
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
index 76d708e..b44915c 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -120,7 +120,7 @@
 				</tbody>
 			</table>
 			<div class="footer">
-				<div class="creat">
+				<div class="creat" <c:if test="${pd.SCHOOL_ID != ''  and pd.SCHOOL_ID != null}">style="display:none;"</c:if>>
 					<input type="button"  onclick="add('${pd.TEACHER_ID}')" value="布置练习" />
 				</div>
 				<div class="removeAll">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
index e2b6e1d..256c115 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
@@ -282,7 +282,7 @@
 		}
 		
 		function homeReport(classId){
-			var path = '<%=basePath%>homework/report.do?CLASS_ID='+classId;
+			var path = '<%=basePath%>homework/report.do?School_id=${pd.SCHOOL_ID}&CLASS_ID='+classId;
 			console.log(path);
 			parent.$("#mainFrame").attr('src',path);
 			window.top.loading.show();
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
index 804f4c6..42bca75 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
@@ -138,7 +138,7 @@
 						</div>
 						<hr />
 						<div>
-							<div style="text-align: center;" colspan="10">
+							<div style="text-align: center;display:none" colspan="10">
 								
 								
 								<a class="btn btn-mini btn-danger" onclick="back();">退出</a>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
index 53d45e4..4eec2f5 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
@@ -48,14 +48,14 @@
 			      <select name="grade_id" id="grade_id" data-placeholder="这里输入所属年级">
 			      		<option value="">全部</option>
 						<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
-							<option value="${var.GRADE_ID}" <c:if test="${pd.GRADE_ID==var.GRADE_ID}">selected="true"</c:if>>${var.GNAME}</option>
+							<option value="${var.ID}" <c:if test="${pd.GRADE_ID==var.ID}">selected="true"</c:if>>${var.NAME}</option>
 						</c:forEach>
 				</select>
 				<label>科目: </label>&nbsp;&nbsp;
 			    <select name="subject_id" id="subject_id" data-placeholder="这里输入所属科目">
 			    		<option value="">全部</option>
 						<c:forEach items="${subjectInfos}" var="var" varStatus="vs">
-							<option value="${var.SUBJECT_ID}" <c:if test="${pd.SUBJECT_ID==var.SUBJECT_ID}">selected="true"</c:if>>${var.SCNAME}</option>
+							<option value="${var.ID}" <c:if test="${pd.SUBJECT_ID==var.ID}">selected="true"</c:if>>${var.CNAME}</option>
 						</c:forEach>
 				</select>&nbsp;&nbsp;&nbsp;&nbsp;
 				<input class="date-picker" type="text" placeholder="开始日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTSTART }"/> 
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
index 2150852..2c6c061 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
@@ -48,11 +48,13 @@
 				</div>
 				<div class="name">
 					<p>Welcome！</p>
-					<p id="name">${pd.TEACHER[0].TEACHER_NAME }</p>
-					<p id="school">${pd.TEACHER[0].SCHOOL_NAME }</p>
+					<p id="name">${pd.TEACHER.TNAME }</p>
+					<p id="school">${pd.TEACHER.SNAME }</p>
 				</div>
 			</div>
-			<div class="class tab1">
+			<br /> <br /> <br />
+			
+			<%-- <div class="class tab1">
 				<p>
 					Classes<span class="right jiao"></span>
 				</p>
@@ -61,49 +63,51 @@
 						<li onclick="event.stopPropagation();chooseClass('${var.CLASS_ID}','${var.TERM_ID}')"><p>${var.CLASS_NAME}
 								<span>${var.SUBJECT_ENAME}</span></p>
 						</li>
-			</c:forEach>
+				</c:forEach>
 
 			</ul>
-		</div>
+		</div> --%>
 		<div class="testpaper tab1">
-			<p>Test Papers<span class="right jiao"></span></p>
+			<p>E-Test<span class="right jiao"></span></p>
 				<ul class="menu_1">
 					<li >
-						<p id="qingsongkao_paper">E-exam Papers</p>
+						<p id="qingsongkao_paper">Papers</p>
 						<!-- <ul class="menu_2">
 							<li><p>高一数学 202班</p></li>
 							<li><p>高一数学 203班</p></li>
 						</ul> -->
 					</li>
-					<li>
-						<p id="jishice_paper">E-class Papers</p>
-						
-						<!-- <ul class="menu_2">
-							<li><p>高一数学 202班</p></li>
-							<li><p>高一数学 203班</p></li>
-						</ul> -->
+					<li >
+						<p>Tests</p>
+						<ul class="menu_2">
+							<c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
+								<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>Result of ${var.CLASS_NAME}
+										</p></li>
+							</c:forEach>
+						</ul>
 					</li>
+					
 				</ul>
 			
 		</div>
 		<div class="analyse tab1">
 			<p>
-				Result Analysis<span class="right jiao"></span>
+				E-class<span class="right jiao"></span>
 			</p>
 			
 			<ul class="menu_1">
-					<li >
-						<p>E-exam Tests</p>
-						<ul class="menu_2">
-						<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-							<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>Result of ${var.CLASS_NAME}</p></li>
-						</c:forEach>
-						</ul>
+					<li>
+						<p id="jishice_paper">Papers</p>
+						
+						<!-- <ul class="menu_2">
+							<li><p>高一数学 202班</p></li>
+							<li><p>高一数学 203班</p></li>
+						</ul> -->
 					</li>
 					<li>
-						<p>E-class Tests</p>
+						<p>Tests</p>
 						<ul class="menu_2">
-						<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
+						<c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
 							<li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>Result of ${var.CLASS_NAME}</p></li>
 						</c:forEach>
 						</ul>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
index 03e63f0..cf72fd3 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
@@ -78,6 +78,16 @@
 								<td><input type="text" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="width:98%;"/></td>
 							</tr>
 							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">所教科目:</td>
+								<td>
+									<select class="chosen-select form-control" name="SUBJECT_IDS" id="SUBJECT_IDS" data-placeholder="所教科目">
+									<c:forEach var="item" items="${subjects}">
+										<option value="${item.ID}"  <c:if test="${pd.SUBJECT_IDS==item.ID}">selected="true"</c:if>>${item.CNAME}</option>
+									</c:forEach>
+								</select>
+								</td>
+							</tr>
+							<tr>
 								<td style="text-align: center;" colspan="10">
 									<a class="btn btn-mini btn-primary" onclick="save();">保存</a>
 									<a class="btn btn-mini btn-danger" onclick="window.top.modal.remove();">取消</a>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
index c9adb29..9a043ec 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
@@ -27,6 +27,7 @@
 <body class="no-skin">
 
 	<form action="teacher/listcs.do" method="post" name="Form" id="Form">
+		<input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
 		<div class="head_box">
 			<div class="box_header">
 				<div class="head_box_l">
@@ -46,7 +47,8 @@
 					<col style="width: 15%" />
 					<col style="width: 15%" />
 					<col style="width: 7%" />
-					<col style="width: 15%" />
+					<col style="width: 8%" />
+					<col style="width: 7%" />
 					<col style="width: 9%" />
 					<thead>
 						<tr>
@@ -58,6 +60,7 @@
 							<th class="center">账号</th>
 							<th class="center">性别</th>
 							<th class="center">教师卡编号</th>
+							<th class="center">科目</th>
 							<th class="center">操作</th>
 						</tr>
 					</thead>
@@ -73,7 +76,8 @@
 						<col style="width: 15%" />
 						<col style="width: 15%" />
 						<col style="width: 7%" />
-						<col style="width: 15%" />
+						<col style="width: 8%" />
+						<col style="width: 7%" />
 						<col style="width: 9%" />
 						<tbody>
 							<!-- 开始循环 -->
@@ -89,6 +93,7 @@
 											<td class='center'>${var.ACCOUT}</td>
 											<td class='center'>${var.SEX == 1? "男":"女"}</td>
 											<td class='center'>${var.KEYPAD_ID}</td>
+											<td class='center'>${myelfun:findSubjectCName(var.SUBJECT_IDS)}</td>
 											<td><a onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
 								
 										</tr>
@@ -108,7 +113,7 @@
 					<input type="button"  onclick="add();" value="添加老师" />
 				</div>
 				<div class="removeAll">
-					<input type="button" onclick="deleteAll()" value="删除" />
+					<input type="button" onclick="del()" value="删除" />
 				</div>
 				<div class="page_box">
 					<div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
@@ -206,6 +211,11 @@
 			window.top.loading.remove();
 		});
 		
+		//检索
+		function tosearch(){
+			$("#Form").submit();
+		}
+		
 		function edit(Id){
 			window.top.modal.init({
 			'title':'修改信息',
@@ -230,6 +240,41 @@
 		
 		function save(){
 			
+		} 
+		
+		function del(Id){
+			window.top.remove.init({"title":"删除","func":function(success){
+				if(success){
+					var all = typeof Id == "undefined" ? true : false;
+					var str = Id;
+					if(all){
+						str = '' ;
+						for(var i=0;i < document.getElementsByName('ids').length;i++){
+						  if(document.getElementsByName('ids')[i].checked){
+						  	if(str=='') str += document.getElementsByName('ids')[i].value;
+						  	else str += ',' + document.getElementsByName('ids')[i].value;
+						  }
+						}
+					}
+					
+					$.ajax({
+							type: "POST",
+							url: '<%=basePath%>teacher/deleteAll.do?tm='+new Date().getTime(),
+					    	data: {DATA_IDS:str},
+							dataType:'json',
+							//beforeSend: validateData,
+							cache: false,
+							success: function(data){
+								tosearch();
+							}
+						});
+					
+				}
+				else{
+					console.log("false");
+				}
+			}});
+			window.top.remove.show();
 		}
 	</script>
 
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index 92bce4e..f51d85c 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -197,7 +197,7 @@
 		function homeWorkList(schoolId){
 			//var path = "../school/goEdit2.do?ID=" + schoolId ;
 
-			var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ;
+			var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER.ID}' ;
 			
 				$("#mainFrame").attr('src',path);
 				window.top.loading.show();
diff --git a/resources/dbconfig.properties b/resources/dbconfig.properties
index d8e1471..e2efa46 100644
--- a/resources/dbconfig.properties
+++ b/resources/dbconfig.properties
@@ -1,5 +1,5 @@
 #数据源 1
-url:jdbc:mysql://47.107.98.47:3306/education?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
+url:jdbc:mysql://47.107.98.47:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 #url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
diff --git a/resources/mybatis1/sunvote/CourseManagementMapper.xml b/resources/mybatis1/sunvote/CourseManagementMapper.xml
index 2d8e39e..43b46cf 100644
--- a/resources/mybatis1/sunvote/CourseManagementMapper.xml
+++ b/resources/mybatis1/sunvote/CourseManagementMapper.xml
@@ -101,6 +101,20 @@
 			ID = #{ID}
 	</select>
 	
+	<select id="findByCourse" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			1 =1 
+			and TEACHER_ID  = #{TEACHER_ID} 
+			and CLASS_ID= #{TEACHER_ID} 	
+			and SUBJECT_ID= #{TEACHER_ID} 	
+			
+			limit 0,1
+	</select>
+	
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
@@ -161,7 +175,14 @@
 			sv_coursemanagement
 		LEFT JOIN sv_sclass ON sv_coursemanagement.CLASS_ID = sv_sclass.ID
 		WHERE
-			sv_coursemanagement.TEACHER_ID =  #{TEACHER_ID}
+		    1 = 1 
+		    <if test="TEACHER_ID != null and TEACHER_ID != ''">
+				and sv_coursemanagement.TEACHER_ID =  #{TEACHER_ID}
+			</if>
+		    <if test="SCHOOL_ID != null and SCHOOL_ID != ''">
+				and sv_coursemanagement.SCHOOL_ID =  #{SCHOOL_ID}
+			</if>
+		group by sv_sclass.CLASS_CODE
 		order by sv_sclass.CLASS_CODE
 		
 	</select>
diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index 8cb40fa..f9f8452 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -266,6 +266,10 @@
 			ALL_SCORE,	
 			QUESTION_COUNT,	
 			COMPLETE_DESC,
+			ANSWER_PERSENT,
+			GET_MAX_SCORE,
+			GET_SCORE,
+			GET_SCORE_PERSENT,
 			HOMEWORK_ID
 		from 
 		<include refid="tableName"></include>
diff --git a/resources/mybatis1/sunvote/HomeworkReportMapper.xml b/resources/mybatis1/sunvote/HomeworkReportMapper.xml
index 9530779..6c4cf3e 100644
--- a/resources/mybatis1/sunvote/HomeworkReportMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkReportMapper.xml
@@ -12,6 +12,7 @@
 		HOMEWORK_REPORT_ID,	
 		RANK,	
 		STUDENT_NAME,	
+		STUDENT_ID,	
 		STUDNET_NO,	
 		KEYBOARD,	
 		RIGHT_PERSENT,	
@@ -26,6 +27,7 @@
 		#{HOMEWORK_REPORT_ID},	
 		#{RANK},	
 		#{STUDENT_NAME},	
+		#{STUDENT_ID},	
 		#{STUDNET_NO},	
 		#{KEYBOARD},	
 		#{RIGHT_PERSENT},	
@@ -61,6 +63,7 @@
 		set 
 		RANK = #{RANK},
 		STUDENT_NAME = #{STUDENT_NAME},
+		STUDENT_ID = #{STUDENT_ID},
 		STUDNET_NO = #{STUDNET_NO},
 		KEYBOARD = #{KEYBOARD},
 		RIGHT_PERSENT = #{RIGHT_PERSENT},
@@ -78,6 +81,7 @@
 		set 
 		RANK = #{RANK},
 		STUDENT_NAME = #{STUDENT_NAME},
+		STUDENT_ID = #{STUDENT_ID},
 		STUDNET_NO = #{STUDNET_NO},
 		KEYBOARD = #{KEYBOARD},
 		RIGHT_PERSENT = #{RIGHT_PERSENT},
@@ -85,9 +89,9 @@
 		ANSWER = #{ANSWER},
 		HOMEWORK_ID = #{HOMEWORK_ID}
 		where 
+		STUDENT_ID = #{STUDENT_ID}
+		and 
 		HOMEWORK_ID = #{HOMEWORK_ID}
-		and
-		STUDNET_NO = #{STUDNET_NO}
 	</update>
 	
 	<!-- 通过ID获取数据 -->
@@ -164,13 +168,14 @@
       	#{item.HOMEWORK_REPORT_ID},	
 		#{item.RANK},	
 		#{item.STUDENT_NAME},	
+		#{item.STUDENT_ID},	
 		#{item.STUDNET_NO},	
 		#{item.KEYBOARD},	
 		#{item.RIGHT_PERSENT},	
 		#{item.GET_SCORE},	
 		#{item.ANSWER},	
+		#{item.COMPLETE_COUNT},	
 		#{item.HOMEWORK_ID}
-		#{item.COMPLETE_COUNT}
        )
      </foreach>
      </insert>
diff --git a/resources/mybatis1/sunvote/StudentMapper.xml b/resources/mybatis1/sunvote/StudentMapper.xml
index fdf4b2e..d6b3f97 100644
--- a/resources/mybatis1/sunvote/StudentMapper.xml
+++ b/resources/mybatis1/sunvote/StudentMapper.xml
@@ -95,6 +95,7 @@
 		<include refid="tableName"></include>
 		where 
 			CLASS_ID = #{CLASS_ID}
+		order by  (sv_student.NUMBER ) * 1,(sv_student.KEYPAD_ID * 1),(sv_student.SNO*1)
 	</select>
 	
 	<!-- 通过ID获取数据 -->
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index 7b3058f..04bff40 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -98,7 +98,7 @@ public class V1 extends BaseController {
 	private ClassRosterManager classrosterService;
 
 	@Resource(name = "classtypeService")
-	private ClassTypeManager classtypeService;
+	private ClassTypeManager classtypeService; 
 
 	@Resource(name = "gradeService")
 	private GradeManager gradeService;
@@ -1575,7 +1575,9 @@ public class V1 extends BaseController {
 								}
 							}
 						}
-						testpaperinfoService.batchSave(testInfoPdList);
+						if(testInfoPdList != null && testInfoPdList.size() > 0){
+							testpaperinfoService.batchSave(testInfoPdList);
+						}
 					}
 				} else {
 					testPaperId = listData.get(0).getString("TESTPAPER_ID");
@@ -1700,7 +1702,9 @@ public class V1 extends BaseController {
 							}
 						}
 					}
-					testpaperinfoService.batchSave(testInfoPdList);
+					if(testInfoPdList != null && testInfoPdList.size() > 0){
+						testpaperinfoService.batchSave(testInfoPdList);
+					}
 				}
 				res.setData(testPaperId);
 			} catch (Exception e) {
@@ -2904,9 +2908,10 @@ public class V1 extends BaseController {
 				// 1. 根据班级id 查询班级学生列表
 				List<PageData> student = studentService.findByClassId(homePd);
 				for(PageData ptd : student){
+					ptd.put("STUDENT_ID", ptd.get("ID"));
 					ptd.put("STUDENT_NAME", ptd.get("NAME"));
 					ptd.put("HOMEWORK_REPORT_ID", this.get32UUID());
-					ptd.put("STUDENT_NO", ptd.get("SNO"));
+					ptd.put("STUDNET_NO", ptd.get("NUMBER"));
 					ptd.put("RANK", student.size() + "");
 					ptd.put("KEYBOARD", ptd.get("KEYPAD_ID"));
 					ptd.put("RIGHT_PERSENT", "0%");
@@ -2926,7 +2931,7 @@ public class V1 extends BaseController {
 				// update 学生作业情况
 				PageData tpd = new PageData();
 				tpd.put("STUDENT_NAME", student.getSTUDENT_NAME());
-				tpd.put("STUDENT_NO", student.getSTUDENT_NO());
+				tpd.put("STUDNET_NO", student.getSTUDENT_NO());
 				tpd.put("STUDENT_ID", student.getSTUDENT_ID());
 				tpd.put("RANK", student.getRANK());
 				tpd.put("KEYBOARD", student.getKEYBOARD());
@@ -2986,7 +2991,9 @@ public class V1 extends BaseController {
 					ptd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
 				}
 				// 2. 根据学生列表生成初始化成绩
-				homeworkReporkService.batchSave(student);
+				if(student != null && student.size() > 0){
+					homeworkReporkService.batchSave(student);
+				}
 			}
 			List<ResultStudent> students = resultHomework.getSTUDENTS();
 			for(ResultStudent student:students){
diff --git a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
index c6c1220..35b26c9 100644
--- a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
+++ b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
@@ -90,7 +90,15 @@ public class CourseManagementController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd.put("ID", this.get32UUID());
-		coursemanagementService.save(pd);
+		PageData tpd = new PageData();
+		tpd.put("ID", pd.get("TEACHER_ID"));
+		tpd = teacherService.findById(tpd);
+		pd.put("SUBJECT_ID", tpd.get("SUBJECT_IDS"));
+		if(coursemanagementService.findByCourse(pd) == null){
+			coursemanagementService.save(pd);
+		}else{
+			//TODO 
+		}
 		mv.addObject("msg","success");
 		mv.setViewName("save_result2");
 		return mv;
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 7169a48..6ff58c7 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -5,6 +5,8 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -31,6 +33,8 @@ import com.fh.service.sunvote.homework.HomeworkManager;
 import com.fh.service.sunvote.homework.HomeworkReportManager;
 import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager;
 import com.fh.service.sunvote.student.StudentManager;
+import com.fh.service.sunvote.teacher.TeacherManager;
+import com.fh.service.sunvote.teacher.impl.TeacherService;
 import com.fh.util.AppUtil;
 import com.fh.util.Jurisdiction;
 import com.fh.util.ObjectExcelView;
@@ -61,6 +65,9 @@ public class HomeworkController extends BaseController {
 	
 	@Resource(name="studentService")
 	private StudentManager studentService;
+	
+	@Resource(name = "teacherService")
+	private TeacherManager teacherService;
 
 	/**
 	 * 保存
@@ -125,10 +132,10 @@ public class HomeworkController extends BaseController {
 		logBefore(logger, Jurisdiction.getUsername() + "列表Homework");
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
-		if(pd.get("TEACHER_ID") == null){
+		pd = this.getPageData();
+		if(pd.get("SCHOOL_ID") == null){
 			pd.put("TEACHER_ID", getTeacherID());
 		}
-		pd = this.getPageData();
 		String keywords = pd.getString("keywords"); // 关键词检索条件
 		if (null != keywords && !"".equals(keywords)) {
 			pd.put("keywords", keywords.trim());
@@ -275,7 +282,9 @@ public class HomeworkController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		pd.put("TEACHER_ID", getTeacherID());
+		if(pd.get("SCHOOL_ID") == null || "".equals(pd.get("SCHOOL_ID").toString().trim())){
+			pd.put("TEACHER_ID", getTeacherID());
+		}
 		
 		
 		if(pd.get("CURRENT_WEEK") == null && pd.get("START_DATE") == null && pd.get("END_DATE") == null){
@@ -362,6 +371,7 @@ public class HomeworkController extends BaseController {
 				stuPd.put("STUDENT_ID", stuPd.get("ID"));
 				stuPd.remove("ID");
 			}
+			
 			for (PageData hpd : homeworkList) {
 				hpd.remove("QUESTION_COUNT");
 				hpd.remove("COMPLETE_COUNT");
@@ -497,6 +507,55 @@ public class HomeworkController extends BaseController {
 		}
 		if(pd.get("HOMEWORK_ID") != null){
 			List<PageData> dataList = homeworkService.report(pd);
+			Collections.sort(dataList,new Comparator<PageData>(){
+
+				@Override
+				public int compare(PageData o1, PageData o2) {
+					String o1GetScore = o1.getString("STUDENT_SCORE");
+					String o2GetScore = o2.getString("STUDENT_SCORE");
+					float o1score = 0 ;
+					float o2score = 0 ;
+					try{
+						o1score = Float.parseFloat(o1GetScore);
+					}catch(Exception e){
+						o1score = -1 ;
+					}
+					try{
+						o2score = Float.parseFloat(o2GetScore);
+					}catch(Exception e){
+						o2score = -1 ;
+					}
+					return  o1score - o2score > 0 ? -1 : 1;
+				}
+				
+			});
+			for(int i = 0 ; i < dataList.size(); i++){
+				PageData tpd1 = dataList.get(i);
+				if(i == 0){
+					tpd1.put("RANK", (i+1));
+				}else{
+					PageData tpd2 = dataList.get(i-1);
+					String o1GetScore = tpd1.getString("STUDENT_SCORE");
+					String o2GetScore = tpd2.getString("STUDENT_SCORE");
+					float o1score = 0 ;
+					float o2score = 0 ;
+					try{
+						o1score = Float.parseFloat(o1GetScore);
+					}catch(Exception e){
+						o1score = -1 ;
+					}
+					try{
+						o2score = Float.parseFloat(o2GetScore);
+					}catch(Exception e){
+						o2score = -1 ;
+					}
+					if(o2score - o1score == 0){
+						tpd1.put("RANK",tpd2.get("RANK"));
+					}else{
+						tpd1.put("RANK", (i+1));
+					}
+				}
+			}
 			pd.put("DATA", dataList);
 		}
 		if(pd.get("CLASS_ID") != null){
@@ -689,6 +748,7 @@ public class HomeworkController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd.put("HOMEWORK_ID", this.get32UUID());
+		pd.put("SUBJECT_ID", homeworkService.querySubjectId(pd));
 		homeworkService.save(pd);
 		ResponseGson<String> responseGson = new ResponseGson<String>();
 		responseGson.setData(pd.getString("HOMEWORK_ID"));
@@ -706,11 +766,15 @@ public class HomeworkController extends BaseController {
 
 		Homework homework = Homework.parse(data);
 
+		pd.put("ID", getTeacherID());
+		PageData tmpd = teacherService.findById(pd);
+		
 		PageData hpd = new PageData();
 		if (homework != null) {
 			hpd.put("CODE", get32UUID());
 			hpd.put("NAME", homework.getNAME());
 			if(homework.getSUBJECT_ID() == null){
+				pd.put("TEACHER_ID", homework.getTEACHER_ID());
 				List<PageData> slist = homeworkService.querySubjectId(pd);
 				if(slist.size() > 0){
 					homework.setSUBJECT_ID(slist.get(0).getString("SUBJECT_ID"));
@@ -724,6 +788,7 @@ public class HomeworkController extends BaseController {
 			hpd.put("MODIFY_DATE", format.format(new Date()));
 			hpd.put("COMPLETE_COUNT", 0);
 			hpd.put("TEACHER_ID", homework.getTEACHER_ID());
+			hpd.put("SCHOOL_ID", tmpd.get("SCHOOL_ID"));
 			hpd.put("COMPLETE_DESC", "");
 
 			if (homework.getCLASSLIST() != null
@@ -772,7 +837,8 @@ public class HomeworkController extends BaseController {
 		ResponseGson<String> responseGson = new ResponseGson<String>();
 
 		Homework homework = Homework.parse(data);
-
+		pd.put("ID", getTeacherID());
+		PageData tmpd = teacherService.findById(pd);
 		PageData hpd = new PageData();
 		if (homework != null) {
 			if (homework.getHOMEWORK_ID() != null
@@ -790,6 +856,7 @@ public class HomeworkController extends BaseController {
 					hpd.put("COMPLETE_COUNT", 0);
 					hpd.put("TEACHER_ID", homework.getTEACHER_ID());
 					hpd.put("COMPLETE_DESC", "");
+					hpd.put("SCHOOL_ID", tmpd.get("SCHOOL_ID"));
 					if(homeworkService.findByCode(hpd).size() > 1){
 						hpd.put("CODE", get32UUID());
 						for (HomeClass homeclass : homework.getCLASSLIST()) {
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index 36dc8de..d670a46 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -192,6 +192,7 @@ public class ReportController extends BaseController {
 		}else{
 			mv.setViewName("sunvote/teacher/en_teacher_report_1");
 		}
+		
 		return mv;
 	}
 	
diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java
index 39b7779..ed8443d 100644
--- a/src/com/fh/controller/sunvote/teacher/TeacherController.java
+++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java
@@ -25,6 +25,8 @@ import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
 import com.fh.service.api.V1Manager;
 import com.fh.service.sunvote.school.SchoolManager;
+import com.fh.service.sunvote.subject.SubjectManager;
+import com.fh.service.sunvote.subject.impl.SubjectService;
 import com.fh.service.sunvote.teacher.TeacherManager;
 import com.fh.service.system.fhlog.FHlogManager;
 import com.fh.service.system.user.UserManager;
@@ -57,6 +59,8 @@ public class TeacherController extends BaseController {
 	@Resource(name = "v1Service")
 	private V1Manager v1Service;
 
+	@Resource(name="subjectService")
+	private SubjectManager subjectService;
 	/**
 	 * 保存
 	 * 
@@ -584,6 +588,11 @@ public class TeacherController extends BaseController {
 		List<PageData> schools = schoolService.listAll(pd);
 		mv.addObject("schools", schools);
 		
+		List<PageData> subjects = subjectService.listAllSchool(pd);
+		mv.addObject("subjects", subjects);
+		
+		
+		
 		mv.addObject("msg", "save2");
 		mv.addObject("pd", pd);
 		return mv;
@@ -624,6 +633,8 @@ public class TeacherController extends BaseController {
 		mv.setViewName("sunvote/teacher/teacher_edit2");
 		List<PageData> schools = schoolService.listAll(pd);
 		mv.addObject("schools", schools);
+		List<PageData> subjects = subjectService.listAllSchool(pd);
+		mv.addObject("subjects", subjects);
 		mv.addObject("msg", "edit2");
 		mv.addObject("pd", pd);
 		return mv;
@@ -646,6 +657,8 @@ public class TeacherController extends BaseController {
 		mv.setViewName("sunvote/teacher/teacher_edit3");
 		List<PageData> schools = schoolService.listAll(pd);
 		mv.addObject("schools", schools);
+		List<PageData> subjects = subjectService.listAllSchool(pd);
+		mv.addObject("subjects", subjects);
 		mv.addObject("msg", "edit2");
 		mv.addObject("pd", pd);
 		return mv;
diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java
index 53e6fac..7225053 100644
--- a/src/com/fh/controller/system/login/LoginController.java
+++ b/src/com/fh/controller/system/login/LoginController.java
@@ -274,14 +274,19 @@ public class LoginController extends BaseController {
 				}else if("admin".equals(changeMenu)){
 					PageData tpd = new PageData();
 					tpd.put("ID", user.getUSER_ID());
-					String schoolId = "" ;
 					PageData adminInfos = v1Service.getAdminInfo(tpd);
+					String schoolId = adminInfos.getString("SCHOOL_ID");
 					//  查询学校信息
 					Object tgradleId = "" ;
 					
 					session.setAttribute(USERNAME + Const.ROLE_ID,
 							"admin");
 					List<PageData> gradeInfos = schoolgradesubjectService.listAllGrade(adminInfos);
+					for(PageData grade : gradeInfos){
+						grade.put("GRADE_ID", grade.get("ID"));
+						grade.put("SCHOOL_ID", adminInfos.get("ID"));
+						grade.put("classInfos", sclassService.listAll(grade));
+					}
 					mv.addObject("gradeInfos", gradeInfos);
 					mv.addObject("adminInfos", adminInfos);
 					mv.addObject("SCHOOL_ID", adminInfos.get("ID"));
diff --git a/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java b/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java
index 8f2fa5f..465a178 100644
--- a/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java
+++ b/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java
@@ -48,6 +48,11 @@ public interface CourseManagementManager{
 	 * @throws Exception
 	 */
 	public PageData findById(PageData pd)throws Exception;
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByCourse(PageData pd)throws Exception;
 	
 	/**批量删除
 	 * @param ArrayDATA_IDS
diff --git a/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java b/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java
index 15bdd20..26e299d 100644
--- a/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java
+++ b/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java
@@ -85,6 +85,14 @@ public class CourseManagementService implements CourseManagementManager{
 		return (PageData)dao.findForObject("CourseManagementMapper.findById", pd);
 	}
 	
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByCourse(PageData pd)throws Exception{
+		return (PageData)dao.findForObject("CourseManagementMapper.findByCourse", pd);
+	}
+	
 	/**批量删除
 	 * @param ArrayDATA_IDS
 	 * @throws Exception