diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index a8bc3c1..4e46bb1 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -99,57 +99,84 @@
 			</ul>
 		</div>
 		<div class="testpaper tab1">
-			<p>试卷管理<span class="right jiao"></span></p>
+			<p>轻松考<span class="right jiao"></span></p>
 				<ul class="menu_1">
 					<li >
-						<p >轻松考试卷管理</p>
+						<p >试卷管理</p>
 						<ul class="menu_2">
 							<li ><p id="new_paper">出卷</p></li>
 							<li ><p id="qingsongkao_paper">查看所有试卷</p></li>
 							
 						</ul>
 					</li>
-					<li>
-						<p id="jishice_paper">即时测试卷管理</p>
+					<li >
+						<p>考试情况</p>
+						<ul class="menu_2">
+							<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
+								<c:forEach items="${var.classInfos}" var="var1" varStatus="vs1">
+									<li onclick="event.stopPropagation();report('${var1.ID}')">
+										<p>${ var1.CLASS_NAME }</p>
+									</li>
+								</c:forEach>
+							</c:forEach>
+						</ul>
 					</li>
+					
 				</ul>
 			
 		</div>
 		<div class="analyse tab1">
 			<p>
-				测验分析<span class="right jiao"></span>
+				即时测<span class="right jiao"></span>
 			</p>
 			
 			<ul class="menu_1">
-					<li >
-						<p>轻松考统考</p>
+					<li>
+						<p id="jishice_paper">试卷管理</p>
 					</li>
-					<li >
-						<p>轻松考班级情况</p>
+					<li>
+						<p>测验分析</p>
 						<ul class="menu_2">
-							<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
-								<c:forEach items="${var.classInfos}" var="var1" varStatus="vs1">
-									<li onclick="event.stopPropagation();report('${var1.ID}')">
-										<p>${ var1.CLASS_NAME }</p>
-									</li>
-								</c:forEach>
+						<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
+							<c:forEach items="${var.classInfos}" var="var1" varStatus="vs1">
+								<li onclick="event.stopPropagation();report2('${var1.ID}')">
+									<p>${ var1.CLASS_NAME }</p>
+								</li>
 							</c:forEach>
+						</c:forEach>
 						</ul>
 					</li>
+				</ul>
+		</div>
+		
+		
+		<div class="analyse tab1">
+			<p>
+				课后练<span class="right jiao"></span>
+			</p>
+			
+			<ul class="menu_1">
 					<li>
-						<p>即时测测验分析</p>
-							<ul class="menu_2">
-							<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
-								<c:forEach items="${var.classInfos}" var="var1" varStatus="vs1">
-									<li onclick="event.stopPropagation();report2('${var1.ID}')">
-										<p>${ var1.CLASS_NAME }</p>
-									</li>
-								</c:forEach>
+						<p onclick="event.stopPropagation();monitor('${SCHOOL_ID}')">班长管理</p>
+					</li>
+					<li>
+						<p id="jishice_paper">作业管理</p>
+					</li>
+					<li>
+						<p>作业分析</p>
+						<ul class="menu_2">
+						<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
+							<c:forEach items="${var.classInfos}" var="var1" varStatus="vs1">
+								<li onclick="event.stopPropagation();report2('${var1.ID}')">
+									<p>${ var1.CLASS_NAME }</p>
+								</li>
 							</c:forEach>
+						</c:forEach>
 						</ul>
 					</li>
 				</ul>
 		</div>
+		
 		<div class="analyse tab1">
 			<p>
 				系统设置<span class="right jiao"></span>
@@ -166,9 +193,7 @@
 					<li>
 						<p onclick="event.stopPropagation();pagetemplate('${SCHOOL_ID}')">模板设置</p>
 					</li>
-					<li>
-						<p onclick="event.stopPropagation();monitor('${SCHOOL_ID}')">班长管理</p>
-					</li>
+					
 					<li>
 						<p onclick="event.stopPropagation();other('${SCHOOL_ID}')">其他配置</p>
 					</li>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
index 8ba8a56..557b9ef 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
@@ -88,7 +88,7 @@ input[type="text"],select {
 		method="post">
 		<input type="hidden" name="ID" id="ID" value="${pd.ID}" /> <input
 			type="hidden" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}" />
-		<input type="hidden" name="TERM_ID" id="TERM_ID" value="${pd.TERM_ID}" />
+			<input type="hidden" name="TERM_ID" id="TERM_ID" value="${pd.TERM_ID}" />
 		<div id="zhongxin">
 			<li>
 				<p><span style="color:#f00">*</span>学生姓名:</p>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
index a6b17a2..ca4bd2b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
@@ -162,7 +162,7 @@
 		function edit(Id){
 			window.top.modal.init({
 			'title':'添加学生',
-			'url':'<%=basePath%>student/goEdit2.do?ID='+Id,
+			'url':'<%=basePath%>student/goEdit2.do?class_id=${pd.CLASS_ID}&term_id=${pd.TERM_ID}&ID='+Id,
 			func:function() {
 				tosearch();
 			}
diff --git a/resources/mybatis1/sunvote/CourseManagementMapper.xml b/resources/mybatis1/sunvote/CourseManagementMapper.xml
index 8fde21b..667399a 100644
--- a/resources/mybatis1/sunvote/CourseManagementMapper.xml
+++ b/resources/mybatis1/sunvote/CourseManagementMapper.xml
@@ -154,6 +154,17 @@
 		
 	</select>
 	
+	<select id="listTeacherClass" parameterType="pd" resultType="pd">
+		SELECT
+			sv_sclass.*
+		FROM
+			sv_coursemanagement
+		LEFT JOIN sv_sclass ON sv_coursemanagement.CLASS_ID = sv_sclass.ID
+		WHERE
+			sv_coursemanagement.TEACHER_ID =  #{TEACHER_ID}
+		
+	</select>
+	
 	<!-- 列表(全部) -->
 	<select id="listCourselistPage" parameterType="page" resultType="pd">
 		SELECT
diff --git a/resources/mybatis1/sunvote/HeadmasterMapper.xml b/resources/mybatis1/sunvote/HeadmasterMapper.xml
index cd210cb..e967df5 100644
--- a/resources/mybatis1/sunvote/HeadmasterMapper.xml
+++ b/resources/mybatis1/sunvote/HeadmasterMapper.xml
@@ -84,10 +84,10 @@
 		from 
 		<include refid="tableName"></include>
 		where 
-			<if test="pd.KEYPAD_ID != null and pd.KEYPAD_ID != ''">
+			<if test="KEYPAD_ID != null and KEYPAD_ID != ''">
 				KEYPAD_ID = #{KEYPAD_ID}
 			</if>
-			<if test="pd.KEYPAD_ID == null or pd.KEYPAD_ID != ''">
+			<if test="KEYPAD_ID == null or KEYPAD_ID == ''">
 				USERNAME = #{USERNAME} and
 				PASSWORD = #{PASSWORD}
 			</if>
diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index 2995542..48a7a0c 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -21,6 +21,12 @@
 		COMPLETE_COUNT,	
 		ALL_SCORE,	
 		TEACHER_ID,	
+		HOMEWORK_DESC,	
+		COMPLETE_DESC,	
+		SUMBIT_DATE,	
+		GET_SCORE,	
+		GET_SCORE_PERSENT,	
+		GET_MAX_SCORE,	
 		HOMEWORK_ID
 	</sql>
 	
@@ -38,6 +44,12 @@
 		#{COMPLETE_COUNT},	
 		#{ALL_SCORE},	
 		#{TEACHER_ID},	
+		#{HOMEWORK_DESC},	
+		#{COMPLETE_DESC},	
+		#{SUMBIT_DATE},	
+		#{GET_SCORE},	
+		#{GET_SCORE_PERSENT},	
+		#{GET_MAX_SCORE},	
 		#{HOMEWORK_ID}
 	</sql>
 	
@@ -65,18 +77,43 @@
 		update
 		<include refid="tableName"></include>
 		set 
+			<if test="CODE != null and CODE != ''">
 			CODE = #{CODE},
+			</if><if test="NAME != null and NAME != ''">
 			NAME = #{NAME},
+			</if><if test="SUBJECT_ID != null and SUBJECT_ID != ''">
 			SUBJECT_ID = #{SUBJECT_ID},
+			</if><if test="CLASS_ID != null and CLASS_ID != ''">
 			CLASS_ID = #{CLASS_ID},
+			</if><if test="GRADE_ID != null and GRADE_ID != ''">
 			GRADE_ID = #{GRADE_ID},
+			</if><if test="SCHOOL_ID != null and SCHOOL_ID != ''">
 			SCHOOL_ID = #{SCHOOL_ID},
+			</if><if test="COMPLETE_DATE != null and COMPLETE_DATE != ''">
 			COMPLETE_DATE = #{COMPLETE_DATE},
+			</if><if test="CREATE_DATE != null and CREATE_DATE != ''">
 			CREATE_DATE = #{CREATE_DATE},
+			</if><if test="MODIFY_DATE != null and MODIFY_DATE != ''">
 			MODIFY_DATE = #{MODIFY_DATE},
+			</if><if test="COMPLETE_COUNT != null and COMPLETE_COUNT != ''">
 			COMPLETE_COUNT = #{COMPLETE_COUNT},
+			</if><if test="ALL_SCORE != null and ALL_SCORE != ''">
 			ALL_SCORE = #{ALL_SCORE},
+			</if><if test="TEACHER_ID != null and TEACHER_ID != ''">
 			TEACHER_ID = #{TEACHER_ID},
+			</if><if test="HOMEWORK_DESC != null and HOMEWORK_DESC != ''">
+			HOMEWORK_DESC = #{HOMEWORK_DESC},
+			</if><if test="COMPLETE_DESC != null and COMPLETE_DESC != ''">
+			COMPLETE_DESC = #{COMPLETE_DESC},
+			</if><if test="SUMBIT_DATE != null and SUMBIT_DATE != ''">
+			SUMBIT_DATE = #{SUMBIT_DATE},
+			</if><if test="GET_SCORE != null and GET_SCORE != ''">
+			GET_SCORE = #{GET_SCORE},
+			</if><if test="GET_SCORE_PERSENT != null and GET_SCORE_PERSENT != ''">
+			GET_SCORE_PERSENT = #{GET_SCORE_PERSENT},
+			</if><if test="GET_MAX_SCORE != null and GET_MAX_SCORE != ''">
+			GET_MAX_SCORE = #{GET_MAX_SCORE},
+			</if>
 		HOMEWORK_ID = HOMEWORK_ID
 		where 
 		HOMEWORK_ID = #{HOMEWORK_ID}
@@ -118,22 +155,22 @@
 		from 
 		<include refid="tableName"></include>
 		where 1 = 1
-		<if test="pd.SUBJECT_ID != null and pd.SUBJECT_ID != ''"><!-- 关键词检索 -->
+		<if test="SUBJECT_ID != null and SUBJECT_ID != ''"><!-- 关键词检索 -->
 			and SUBJECT_ID = #{SUBJECT_ID}
 		</if>
-		<if test="pd.CLASS_ID != null and pd.CLASS_ID != ''"><!-- 关键词检索 -->
+		<if test="CLASS_ID != null and CLASS_ID != ''"><!-- 关键词检索 -->
 			and CLASS_ID = #{CLASS_ID}
 		</if>
-		<if test="pd.GRADE_ID != null and pd.GRADE_ID != ''"><!-- 关键词检索 -->
+		<if test="GRADE_ID != null and GRADE_ID != ''"><!-- 关键词检索 -->
 			and GRADE_ID = #{GRADE_ID}
 		</if>
-		<if test="pd.SCHOOL_ID != null and pd.SCHOOL_ID != ''"><!-- 关键词检索 -->
+		<if test="SCHOOL_ID != null and SCHOOL_ID != ''"><!-- 关键词检索 -->
 			and SCHOOL_ID = #{SCHOOL_ID}
 		</if>
-		<if test="pd.TEACHER_ID != null and pd.TEACHER_ID != ''"><!-- 关键词检索 -->
+		<if test="TEACHER_ID != null and TEACHER_ID != ''"><!-- 关键词检索 -->
 			and TEACHER_ID = #{TEACHER_ID}
 		</if>
-		<if test="pd.COMPLETE != null and pd.COMPLETE != ''"><!-- 关键词检索 -->
+		<if test="COMPLETE != null and COMPLETE != ''"><!-- 关键词检索 -->
 			and COMPLETE_DATE &gt; #{COMPLETE_DATE}
 		</if>
 		
@@ -148,29 +185,27 @@
 			SUBJECT_ID,	
 			CLASS_ID,	
 			COMPLETE_DATE,	
-			COMPLETE_COUNT,	
 			ALL_SCORE,	
-			TEACHER_ID,	
 			HOMEWORK_ID
 		from 
 		<include refid="tableName"></include>
 		where 1 = 1
-		<if test="pd.SUBJECT_ID != null and pd.SUBJECT_ID != ''"><!-- 关键词检索 -->
+		<if test="SUBJECT_ID != null and SUBJECT_ID != ''"><!-- 关键词检索 -->
 			and SUBJECT_ID = #{SUBJECT_ID}
 		</if>
-		<if test="pd.CLASS_ID != null and pd.CLASS_ID != ''"><!-- 关键词检索 -->
+		<if test="CLASS_ID != null and CLASS_ID != ''"><!-- 关键词检索 -->
 			and CLASS_ID = #{CLASS_ID}
 		</if>
-		<if test="pd.GRADE_ID != null and pd.GRADE_ID != ''"><!-- 关键词检索 -->
+		<if test="GRADE_ID != null and GRADE_ID != ''"><!-- 关键词检索 -->
 			and GRADE_ID = #{GRADE_ID}
 		</if>
-		<if test="pd.SCHOOL_ID != null and pd.SCHOOL_ID != ''"><!-- 关键词检索 -->
+		<if test="SCHOOL_ID != null and SCHOOL_ID != ''"><!-- 关键词检索 -->
 			and SCHOOL_ID = #{SCHOOL_ID}
 		</if>
-		<if test="pd.TEACHER_ID != null and pd.TEACHER_ID != ''"><!-- 关键词检索 -->
+		<if test="TEACHER_ID != null and TEACHER_ID != ''"><!-- 关键词检索 -->
 			and TEACHER_ID = #{TEACHER_ID}
 		</if>
-		<if test="pd.COMPLETE != null and pd.COMPLETE != ''"><!-- 关键词检索 -->
+		<if test="COMPLETE != null and COMPLETE != ''"><!-- 关键词检索 -->
 			and COMPLETE_DATE &gt; #{COMPLETE_DATE}
 		</if>
 		
diff --git a/resources/mybatis1/sunvote/HomeworkProblemMapper.xml b/resources/mybatis1/sunvote/HomeworkProblemMapper.xml
index 9bd687a..0cca4bf 100644
--- a/resources/mybatis1/sunvote/HomeworkProblemMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkProblemMapper.xml
@@ -129,18 +129,22 @@
 	<!-- 列表(全部) -->
 	<select id="listProblem" parameterType="pd" resultType="pd">
 		select
-		<include refid="Field"></include>
+		RANK,
+		NAME,
+		OPTION_NUM,
+		SCORE,
+		RIGHT_ANSWER
 		from 
 		<include refid="tableName"></include>
 		where 1 = 1
-		<if test="pd.HOMEWORK_ID != null and pd.HOMEWORK_ID != ''">
-			and	HOMEWORK_ID = #{pd.HOMEWORK_ID}
+		<if test="HOMEWORK_ID != null and HOMEWORK_ID != ''">
+			and	HOMEWORK_ID = #{HOMEWORK_ID}
 		</if>
-		<if test="pd.P_HOMEWORK_PROBLEM_ID == null or pd.P_HOMEWORK_PROBLEM_ID == ''">
+		<if test="P_HOMEWORK_PROBLEM_ID == null or P_HOMEWORK_PROBLEM_ID == ''">
 			and	P_HOMEWORK_PROBLEM_ID is NULL
 		</if>
-		<if test="pd.P_HOMEWORK_PROBLEM_ID != null and pd.P_HOMEWORK_PROBLEM_ID != ''">
-			and	P_HOMEWORK_PROBLEM_ID = #{pd.P_HOMEWORK_PROBLEM_ID}
+		<if test="P_HOMEWORK_PROBLEM_ID != null and P_HOMEWORK_PROBLEM_ID != ''">
+			and	P_HOMEWORK_PROBLEM_ID = #{P_HOMEWORK_PROBLEM_ID}
 		</if>
 		ORDER BY RANK
 	</select>
diff --git a/resources/mybatis1/sunvote/HomeworkReportMapper.xml b/resources/mybatis1/sunvote/HomeworkReportMapper.xml
new file mode 100644
index 0000000..591cfa8
--- /dev/null
+++ b/resources/mybatis1/sunvote/HomeworkReportMapper.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="HomeworkReportMapper">
+	
+	<!--表名 -->
+	<sql id="tableName">
+		SV_HOMEWORKREPORT
+	</sql>
+	
+	<!-- 字段 -->
+	<sql id="Field">
+		HOMEWORK_REPORT_ID,	
+		RANK,	
+		STUDENT_NAME,	
+		STUDNET_NO,	
+		KEYBOARD,	
+		RIGHT_PERSENT,	
+		GET_SCORE,	
+		ANSWER,	
+		HOMEWORK_ID
+	</sql>
+	
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{HOMEWORK_REPORT_ID},	
+		#{RANK},	
+		#{STUDENT_NAME},	
+		#{STUDNET_NO},	
+		#{KEYBOARD},	
+		#{RIGHT_PERSENT},	
+		#{GET_SCORE},	
+		#{ANSWER},	
+		#{HOMEWORK_ID}
+	</sql>
+	
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into 
+	<include refid="tableName"></include>
+		(
+	<include refid="Field"></include>
+		) values (
+	<include refid="FieldValue"></include>
+		)
+	</insert>
+	
+	<!-- 删除-->
+	<delete id="delete" parameterType="pd">
+		delete from
+		<include refid="tableName"></include>
+		where 
+			HOMEWORK_REPORT_ID = #{HOMEWORK_REPORT_ID}
+	</delete>
+	
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set 
+		RANK = #{RANK},
+		STUDENT_NAME = #{STUDENT_NAME},
+		STUDNET_NO = #{STUDNET_NO},
+		KEYBOARD = #{KEYBOARD},
+		RIGHT_PERSENT = #{RIGHT_PERSENT},
+		GET_SCORE = #{GET_SCORE},
+		ANSWER = #{ANSWER},
+		HOMEWORK_ID = #{HOMEWORK_ID}
+		where 
+		HOMEWORK_REPORT_ID = #{HOMEWORK_REPORT_ID}
+	</update>
+	<!-- 修改 -->
+	<update id="update" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set 
+		RANK = #{RANK},
+		STUDENT_NAME = #{STUDENT_NAME},
+		STUDNET_NO = #{STUDNET_NO},
+		KEYBOARD = #{KEYBOARD},
+		RIGHT_PERSENT = #{RIGHT_PERSENT},
+		GET_SCORE = #{GET_SCORE},
+		ANSWER = #{ANSWER},
+		HOMEWORK_ID = #{HOMEWORK_ID}
+		where 
+		HOMEWORK_ID = #{HOMEWORK_ID}
+		and
+		STUDNET_NO = #{STUDNET_NO}
+	</update>
+	
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			HOMEWORK_REPORT_ID = #{HOMEWORK_REPORT_ID}
+	</select>
+	
+	<select id="findByHomeworkID" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			HOMEWORK_ID = #{HOMEWORK_ID}
+	</select>
+	
+	<!-- 列表 -->
+	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 1=1
+		<if test="pd.keywords!= null and pd.keywords != ''"><!-- 关键词检索 -->
+			and
+				(
+				<!--	根据需求自己加检索条件
+					字段1 LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
+					 or 
+					字段2 LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%') 
+				-->
+				)
+		</if>
+	</select>
+	
+	<!-- 列表(全部) -->
+	<select id="listAll" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+	</select>
+	
+
+	
+	<!-- 批量删除 -->
+	<delete id="deleteAll" parameterType="String">
+		delete from
+		<include refid="tableName"></include>
+		where 
+			HOMEWORK_REPORT_ID in
+		<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
+                 #{item}
+		</foreach>
+	</delete>
+	
+	<!-- fh313596790qq(青苔) -->
+	
+	<!-- 新增-->
+	<insert id="batchSave" parameterType="java.util.List">
+		insert into 
+	<include refid="tableName"></include>
+		(
+	<include refid="Field"></include>
+		) values 
+
+	 <foreach collection="list" index="index" item="item" separator=",">
+      (
+      	#{item.HOMEWORK_REPORT_ID},	
+		#{item.RANK},	
+		#{item.STUDENT_NAME},	
+		#{item.STUDNET_NO},	
+		#{item.KEYBOARD},	
+		#{item.RIGHT_PERSENT},	
+		#{item.GET_SCORE},	
+		#{item.ANSWER},	
+		#{item.HOMEWORK_ID}
+       )
+     </foreach>
+     </insert>
+     
+</mapper>
\ No newline at end of file
diff --git a/resources/mybatis1/sunvote/StudentMapper.xml b/resources/mybatis1/sunvote/StudentMapper.xml
index d3b3526..fdf4b2e 100644
--- a/resources/mybatis1/sunvote/StudentMapper.xml
+++ b/resources/mybatis1/sunvote/StudentMapper.xml
@@ -19,6 +19,7 @@
 		PARENT_PHONE,	
 		KEYPAD_ID,	
 		REMARK,	
+		CLASS_ID,	
 		ID
 	</sql>
 	
@@ -34,6 +35,7 @@
 		#{PARENT_PHONE},	
 		#{KEYPAD_ID},	
 		#{REMARK},	
+		#{CLASS_ID},	
 		#{ID}
 	</sql>
 	
@@ -69,6 +71,7 @@
 			PARENT_PHONE = #{PARENT_PHONE},
 			KEYPAD_ID = #{KEYPAD_ID},
 			REMARK = #{REMARK},
+			CLASS_ID = #{CLASS_ID},
 		ID = #{ID}
 		where 
 		ID = #{ID}
@@ -85,6 +88,16 @@
 	</select>
 	
 	<!-- 通过ID获取数据 -->
+	<select id="findByClassId" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			CLASS_ID = #{CLASS_ID}
+	</select>
+	
+	<!-- 通过ID获取数据 -->
 	<select id="findByName" parameterType="pd" resultType="pd">
 		select 
 		<include refid="Field"></include>
diff --git a/resources/mybatis1/sunvote/TermMapper.xml b/resources/mybatis1/sunvote/TermMapper.xml
index 38c855d..c087e93 100644
--- a/resources/mybatis1/sunvote/TermMapper.xml
+++ b/resources/mybatis1/sunvote/TermMapper.xml
@@ -68,6 +68,17 @@
 			TERM_ID = #{TERM_ID}
 	</select>
 	
+	<!-- 通过ID获取数据 -->
+	<select id="findCurrentId" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where
+		START_DATE &lt; NOW()
+		AND sv_term.END_DATE &gt; NOW()
+	</select>
+	
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
diff --git a/src/com/fh/bean/ResultHomework.java b/src/com/fh/bean/ResultHomework.java
new file mode 100644
index 0000000..c0e05ef
--- /dev/null
+++ b/src/com/fh/bean/ResultHomework.java
@@ -0,0 +1,143 @@
+package com.fh.bean;
+
+import java.util.List;
+
+import com.google.gson.Gson;
+
+public class ResultHomework {
+
+	private String HOMEWORK_ID;
+	private String CLASS_ID;
+	private String GET_SCORE;
+	private String GET_SCORE_PERSENT;
+	private String COMPLETE_DESC;
+	private String GET_MAX_SCORE;
+	private List<ResultStudent> STUDENTS;
+
+	public void setHOMEWORK_ID(String HOMEWORK_ID) {
+		this.HOMEWORK_ID = HOMEWORK_ID;
+	}
+
+	public String getHOMEWORK_ID() {
+		return HOMEWORK_ID;
+	}
+
+	public void setCLASS_ID(String CLASS_ID) {
+		this.CLASS_ID = CLASS_ID;
+	}
+
+	public String getCLASS_ID() {
+		return CLASS_ID;
+	}
+
+	public void setGET_SCORE(String GET_SCORE) {
+		this.GET_SCORE = GET_SCORE;
+	}
+
+	public String getGET_SCORE() {
+		return GET_SCORE;
+	}
+
+	public void setGET_SCORE_PERSENT(String GET_SCORE_PERSENT) {
+		this.GET_SCORE_PERSENT = GET_SCORE_PERSENT;
+	}
+
+	public String getGET_SCORE_PERSENT() {
+		return GET_SCORE_PERSENT;
+	}
+
+	public void setCOMPLETE_DESC(String COMPLETE_DESC) {
+		this.COMPLETE_DESC = COMPLETE_DESC;
+	}
+
+	public String getCOMPLETE_DESC() {
+		return COMPLETE_DESC;
+	}
+
+	public void setGET_MAX_SCORE(String GET_MAX_SCORE) {
+		this.GET_MAX_SCORE = GET_MAX_SCORE;
+	}
+
+	public String getGET_MAX_SCORE() {
+		return GET_MAX_SCORE;
+	}
+
+	public void setSTUDENTS(List<ResultStudent> STUDENTS) {
+		this.STUDENTS = STUDENTS;
+	}
+
+	public List<ResultStudent> getSTUDENTS() {
+		return STUDENTS;
+	}
+	
+	public static ResultHomework parse(String json){
+		Gson gson = new Gson();
+		return gson.fromJson(json, ResultHomework.class);
+	}
+
+	public static class ResultStudent {
+		private String STUDENT_NO;
+		private String STUDENT_NAME;
+		private String KEYBOARD;
+		private String RIGHT_PERSENT;
+		private String GET_SCORE;
+		private String RANK;
+		private String ANSWER;
+
+		public void setSTUDENT_NO(String STUDENT_NO) {
+			this.STUDENT_NO = STUDENT_NO;
+		}
+
+		public String getSTUDENT_NO() {
+			return STUDENT_NO;
+		}
+
+		public void setSTUDENT_NAME(String STUDENT_NAME) {
+			this.STUDENT_NAME = STUDENT_NAME;
+		}
+
+		public String getSTUDENT_NAME() {
+			return STUDENT_NAME;
+		}
+
+		public void setKEYBOARD(String KEYBOARD) {
+			this.KEYBOARD = KEYBOARD;
+		}
+
+		public String getKEYBOARD() {
+			return KEYBOARD;
+		}
+
+		public void setRIGHT_PERSENT(String RIGHT_PERSENT) {
+			this.RIGHT_PERSENT = RIGHT_PERSENT;
+		}
+
+		public String getRIGHT_PERSENT() {
+			return RIGHT_PERSENT;
+		}
+
+		public void setGET_SCORE(String GET_SCORE) {
+			this.GET_SCORE = GET_SCORE;
+		}
+
+		public String getGET_SCORE() {
+			return GET_SCORE;
+		}
+
+		public void setRANK(String RANK) {
+			this.RANK = RANK;
+		}
+
+		public String getRANK() {
+			return RANK;
+		}
+
+		public void setANSWER(String ANSWER) {
+			this.ANSWER = ANSWER;
+		}
+
+		public String getANSWER() {
+			return ANSWER;
+		}
+	}
+}
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index 04e1c84..f5bab5e 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -26,6 +26,8 @@ import org.springframework.web.multipart.MultipartFile;
 import com.fh.bean.Paper;
 import com.fh.bean.Point;
 import com.fh.bean.Question;
+import com.fh.bean.ResultHomework;
+import com.fh.bean.ResultHomework.ResultStudent;
 import com.fh.bean.StudentAnswer;
 import com.fh.bean.TestPaper;
 import com.fh.bean.TestPaperInfo;
@@ -47,6 +49,7 @@ import com.fh.service.sunvote.event.EventManager;
 import com.fh.service.sunvote.grade.GradeManager;
 import com.fh.service.sunvote.headmaster.HeadmasterManager;
 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.keypad.KeypadManager;
 import com.fh.service.sunvote.keypadcheck.KeypadCheckManager;
@@ -199,6 +202,9 @@ public class V1 extends BaseController {
 	@Resource(name="homeworkproblemService")
 	private HomeworkProblemManager homeworkproblemService;
 	
+	@Resource(name="homeworkReporService")
+	private HomeworkReportManager homeworkReporkService;
+	
 	/**
 	 * 登录 可以通过账号密码登录、 可以通过教师卡登录
 	 * 
@@ -259,7 +265,7 @@ public class V1 extends BaseController {
 				headerMaster.put("role", "headermaster");
 				List<PageData> classInfoList = sclassService.listAll(headerMaster);
 				headerMaster.put("classInfoList", classInfoList);
-				
+				res.setData(headerMaster);
 				
 			}else{
 				res.set1Error();
@@ -2872,12 +2878,117 @@ public class V1 extends BaseController {
 		
 		PageData pd = this.getPageData();
 		if (!StringUtils.isEmpty(pd.getJsonString())) {
-			
-			
-			
-			res.setData("success");
+			ResultHomework resultHomework = ResultHomework.parse(pd.getJsonString());
+			PageData homePd = new PageData();
+			homePd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
+			homePd.put("CLASS_ID", resultHomework.getCLASS_ID());
+			homePd.put("GET_SCORE", resultHomework.getGET_SCORE());
+			homePd.put("GET_SCORE_PERSENT", resultHomework.getGET_SCORE_PERSENT());
+			homePd.put("COMPLETE_DESC", resultHomework.getCOMPLETE_DESC());
+			homePd.put("GET_MAX_SCORE", resultHomework.getGET_MAX_SCORE());
+			homeworkService.edit(homePd);
+			List<PageData> list = homeworkReporkService.findByHomeworkID(homePd);
+			if(list == null || list.size() == 0){
+				// 初始化班級作业数据
+				// 1. 根据班级id 查询班级学生列表
+				List<PageData> student = studentService.findByClassId(homePd);
+				for(PageData ptd : student){
+					ptd.put("STUDENT_NAME", ptd.get("NAME"));
+					ptd.put("STUDENT_NO", ptd.get("SNO"));
+					ptd.put("RANK", student.size() + "");
+					ptd.put("KEYBOARD", ptd.get("KEYPAD_ID"));
+					ptd.put("RIGHT_PERSENT", "0%");
+					ptd.put("GET_SCORE", "0");
+					ptd.put("ANSWER", "");
+					ptd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
+				}
+				// 2. 根据学生列表生成初始化成绩
+				homeworkReporkService.batchSave(student);
+			}
+			List<ResultStudent> students = resultHomework.getSTUDENTS();
+			for(ResultStudent student:students){
+				// update 学生作业情况
+				PageData tpd = new PageData();
+				tpd.put("STUDENT_NAME", student.getSTUDENT_NAME());
+				tpd.put("STUDENT_NO", student.getSTUDENT_NO());
+				tpd.put("RANK", student.getRANK());
+				tpd.put("KEYBOARD", student.getKEYBOARD());
+				tpd.put("RIGHT_PERSENT", student.getRIGHT_PERSENT());
+				tpd.put("GET_SCORE", student.getGET_SCORE());
+				tpd.put("ANSWER", student.getANSWER());
+				tpd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
+				homeworkReporkService.update(tpd);
+			}
+			res.setData(resultHomework.getHOMEWORK_ID());
+		}else{
+			res.setDataError();
+		}
+		
+		return res.toJson();
+		
+	}
+	
+	
+	/**
+	 * 更新学生详情
+	 * 
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/uploadshomework", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public String uploadshomework() throws Exception {
+		ResponseGson<String> res = new ResponseGson<String>();
+		
+		PageData pd = this.getPageData();
+		if (!StringUtils.isEmpty(pd.getJsonString())) {
+			ResultHomework resultHomework = ResultHomework.parse(pd.getJsonString());
+			PageData homePd = new PageData();
+			homePd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
+			homePd.put("CLASS_ID", resultHomework.getCLASS_ID());
+			homePd.put("GET_SCORE", resultHomework.getGET_SCORE());
+			homePd.put("GET_SCORE_PERSENT", resultHomework.getGET_SCORE_PERSENT());
+			homePd.put("COMPLETE_DESC", resultHomework.getCOMPLETE_DESC());
+			homePd.put("GET_MAX_SCORE", resultHomework.getGET_MAX_SCORE());
+			homeworkService.edit(homePd);
+			List<PageData> list = homeworkReporkService.findByHomeworkID(homePd);
+			if(list == null || list.size() == 0){
+				// 初始化班級作业数据
+				// 1. 根据班级id 查询班级学生列表
+				List<PageData> student = studentService.findByClassId(homePd);
+				for(PageData ptd : student){
+					ptd.put("STUDENT_NAME", ptd.get("NAME"));
+					ptd.put("STUDENT_NO", ptd.get("SNO"));
+					ptd.put("RANK", student.size() + "");
+					ptd.put("KEYBOARD", ptd.get("KEYPAD_ID"));
+					ptd.put("RIGHT_PERSENT", "0%");
+					ptd.put("GET_SCORE", "0");
+					ptd.put("ANSWER", "");
+					ptd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
+				}
+				// 2. 根据学生列表生成初始化成绩
+				homeworkReporkService.batchSave(student);
+			}
+			List<ResultStudent> students = resultHomework.getSTUDENTS();
+			for(ResultStudent student:students){
+				// update 学生作业情况
+				PageData tpd = new PageData();
+				tpd.put("STUDENT_NAME", student.getSTUDENT_NAME());
+				tpd.put("STUDENT_NO", student.getSTUDENT_NO());
+				tpd.put("RANK", student.getRANK());
+				tpd.put("KEYBOARD", student.getKEYBOARD());
+				tpd.put("RIGHT_PERSENT", student.getRIGHT_PERSENT());
+				tpd.put("GET_SCORE", student.getGET_SCORE());
+				tpd.put("ANSWER", student.getANSWER());
+				tpd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
+				homeworkReporkService.update(tpd);
+			}
+			res.setData(resultHomework.getHOMEWORK_ID());
+		}else{
+			res.setDataError();
 		}
-		res.setDataError();
+		
 		return res.toJson();
 		
 	}
diff --git a/src/com/fh/controller/base/BaseController.java b/src/com/fh/controller/base/BaseController.java
index 159a41d..9364f03 100644
--- a/src/com/fh/controller/base/BaseController.java
+++ b/src/com/fh/controller/base/BaseController.java
@@ -177,4 +177,5 @@ public class BaseController {
 		return "zh".equals(getLang());
 	}
 	
+	
 }
diff --git a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
index 5e211b5..c6c1220 100644
--- a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
+++ b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.fh.controller.api.ResponseGson;
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
 import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
@@ -192,6 +193,25 @@ public class CourseManagementController extends BaseController {
 		return mv;
 	}
 	
+	
+	/**
+	 * 获取作业详情
+	 * 
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/teacherClass", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public String homework() throws Exception {
+		ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
+		PageData pageData = this.getPageData();
+		List<PageData> list = coursemanagementService.listTeacherClass(pageData);
+		res.setData(list);
+		return res.toJson();
+		
+	}
+	
 	/**去新增页面
 	 * @param
 	 * @throws Exception
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index c813a73..a3a0e47 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -8,7 +8,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.annotation.Resource;
+
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.WebDataBinder;
@@ -16,108 +18,124 @@ import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
+
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
+import com.fh.service.sunvote.homework.HomeworkManager;
+import com.fh.service.sunvote.homework.HomeworkReportManager;
 import com.fh.util.AppUtil;
+import com.fh.util.Jurisdiction;
 import com.fh.util.ObjectExcelView;
 import com.fh.util.PageData;
-import com.fh.util.Jurisdiction;
-import com.fh.util.Tools;
-import com.fh.service.sunvote.homework.HomeworkManager;
+import com.google.gson.Gson;
 
-/** 
- * 说明：作业
- * 创建人：FH Q313596790
- * 创建时间：2019-03-07
+/**
+ * 说明：作业 创建人：FH Q313596790 创建时间：2019-03-07
  */
 @Controller
-@RequestMapping(value="/homework")
+@RequestMapping(value = "/homework")
 public class HomeworkController extends BaseController {
-	
-	String menuUrl = "homework/list.do"; //菜单地址(权限用)
-	@Resource(name="homeworkService")
+
+	String menuUrl = "homework/list.do"; // 菜单地址(权限用)
+	@Resource(name = "homeworkService")
 	private HomeworkManager homeworkService;
-	
-	/**保存
+	@Resource(name = "homeworkReporService")
+	private HomeworkReportManager homeworkReporService;
+
+	/**
+	 * 保存
+	 * 
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/save")
-	public ModelAndView save() throws Exception{
-		logBefore(logger, Jurisdiction.getUsername()+"新增Homework");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
+	@RequestMapping(value = "/save")
+	public ModelAndView save() throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "新增Homework");
+		if (!Jurisdiction.buttonJurisdiction(menuUrl, "add")) {
+			return null;
+		} // 校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		pd.put("HOMEWORK_ID", this.get32UUID());	//主键
+		pd.put("HOMEWORK_ID", this.get32UUID()); // 主键
 		homeworkService.save(pd);
-		mv.addObject("msg","success");
+		mv.addObject("msg", "success");
 		mv.setViewName("save_result");
 		return mv;
 	}
-	
-	/**删除
+
+	/**
+	 * 删除
+	 * 
 	 * @param out
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/delete")
-	public void delete(PrintWriter out) throws Exception{
-		logBefore(logger, Jurisdiction.getUsername()+"删除Homework");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限
+	@RequestMapping(value = "/delete")
+	public void delete(PrintWriter out) throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "删除Homework");
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		homeworkService.delete(pd);
 		out.write("success");
 		out.close();
 	}
-	
-	/**修改
+
+	/**
+	 * 修改
+	 * 
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/edit")
-	public ModelAndView edit() throws Exception{
-		logBefore(logger, Jurisdiction.getUsername()+"修改Homework");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
+	@RequestMapping(value = "/edit")
+	public ModelAndView edit() throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "修改Homework");
+		if (!Jurisdiction.buttonJurisdiction(menuUrl, "edit")) {
+			return null;
+		} // 校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		homeworkService.edit(pd);
-		mv.addObject("msg","success");
+		mv.addObject("msg", "success");
 		mv.setViewName("save_result");
 		return mv;
 	}
-	
-	/**列表
+
+	/**
+	 * 列表
+	 * 
 	 * @param page
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/list")
-	public ModelAndView list(Page page) throws Exception{
-		logBefore(logger, Jurisdiction.getUsername()+"列表Homework");
-		//if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
+	@RequestMapping(value = "/list")
+	public ModelAndView list(Page page) throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "列表Homework");
+		// if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;}
+		// //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		String keywords = pd.getString("keywords");				//关键词检索条件
-		if(null != keywords && !"".equals(keywords)){
+		String keywords = pd.getString("keywords"); // 关键词检索条件
+		if (null != keywords && !"".equals(keywords)) {
 			pd.put("keywords", keywords.trim());
 		}
 		page.setPd(pd);
-		List<PageData>	varList = homeworkService.list(page);	//列出Homework列表
+		List<PageData> varList = homeworkService.list(page); // 列出Homework列表
 		mv.setViewName("sunvote/homework/homework_list");
 		mv.addObject("varList", varList);
 		mv.addObject("pd", pd);
-		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限
+		mv.addObject("QX", Jurisdiction.getHC()); // 按钮权限
 		return mv;
 	}
-	
-	/**去新增页面
+
+	/**
+	 * 去新增页面
+	 * 
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/goAdd")
-	public ModelAndView goAdd()throws Exception{
+	@RequestMapping(value = "/goAdd")
+	public ModelAndView goAdd() throws Exception {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -125,101 +143,129 @@ public class HomeworkController extends BaseController {
 		mv.addObject("msg", "save");
 		mv.addObject("pd", pd);
 		return mv;
-	}	
-	
-	 /**去修改页面
+	}
+
+	/**
+	 * 去修改页面
+	 * 
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/goEdit")
-	public ModelAndView goEdit()throws Exception{
+	@RequestMapping(value = "/goEdit")
+	public ModelAndView goEdit() throws Exception {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		pd = homeworkService.findById(pd);	//根据ID读取
+		pd = homeworkService.findById(pd); // 根据ID读取
 		mv.setViewName("sunvote/homework/homework_edit");
 		mv.addObject("msg", "edit");
 		mv.addObject("pd", pd);
 		return mv;
-	}	
-	
-	 /**批量删除
+	}
+
+	/**
+	 * 批量删除
+	 * 
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/deleteAll")
+	@RequestMapping(value = "/deleteAll")
 	@ResponseBody
-	public Object deleteAll() throws Exception{
-		logBefore(logger, Jurisdiction.getUsername()+"批量删除Homework");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限
-		PageData pd = new PageData();		
-		Map<String,Object> map = new HashMap<String,Object>();
+	public Object deleteAll() throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "批量删除Homework");
+		if (!Jurisdiction.buttonJurisdiction(menuUrl, "del")) {
+			return null;
+		} // 校验权限
+		PageData pd = new PageData();
+		Map<String, Object> map = new HashMap<String, Object>();
 		pd = this.getPageData();
 		List<PageData> pdList = new ArrayList<PageData>();
 		String DATA_IDS = pd.getString("DATA_IDS");
-		if(null != DATA_IDS && !"".equals(DATA_IDS)){
+		if (null != DATA_IDS && !"".equals(DATA_IDS)) {
 			String ArrayDATA_IDS[] = DATA_IDS.split(",");
 			homeworkService.deleteAll(ArrayDATA_IDS);
 			pd.put("msg", "ok");
-		}else{
+		} else {
 			pd.put("msg", "no");
 		}
 		pdList.add(pd);
 		map.put("list", pdList);
 		return AppUtil.returnObject(pd, map);
 	}
-	
-	 /**导出到excel
+
+	/**
+	 * 导出到excel
+	 * 
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/excel")
-	public ModelAndView exportExcel() throws Exception{
-		logBefore(logger, Jurisdiction.getUsername()+"导出Homework到excel");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;}
+	@RequestMapping(value = "/excel")
+	public ModelAndView exportExcel() throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "导出Homework到excel");
+		if (!Jurisdiction.buttonJurisdiction(menuUrl, "cha")) {
+			return null;
+		}
 		ModelAndView mv = new ModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		Map<String,Object> dataMap = new HashMap<String,Object>();
+		Map<String, Object> dataMap = new HashMap<String, Object>();
 		List<String> titles = new ArrayList<String>();
-		titles.add("作业代码");	//1
-		titles.add("作业名称");	//2
-		titles.add("科目ID");	//3
-		titles.add("班级ID");	//4
-		titles.add("年级ID");	//5
-		titles.add("学校ID");	//6
-		titles.add("需要完成时间");	//7
-		titles.add("创建时间");	//8
-		titles.add("修改时间");	//9
-		titles.add("完成次数");	//10
-		titles.add("总分");	//11
+		titles.add("作业代码"); // 1
+		titles.add("作业名称"); // 2
+		titles.add("科目ID"); // 3
+		titles.add("班级ID"); // 4
+		titles.add("年级ID"); // 5
+		titles.add("学校ID"); // 6
+		titles.add("需要完成时间"); // 7
+		titles.add("创建时间"); // 8
+		titles.add("修改时间"); // 9
+		titles.add("完成次数"); // 10
+		titles.add("总分"); // 11
 		dataMap.put("titles", titles);
 		List<PageData> varOList = homeworkService.listAll(pd);
 		List<PageData> varList = new ArrayList<PageData>();
-		for(int i=0;i<varOList.size();i++){
+		for (int i = 0; i < varOList.size(); i++) {
 			PageData vpd = new PageData();
-			vpd.put("var1", varOList.get(i).getString("CODE"));	    //1
-			vpd.put("var2", varOList.get(i).getString("NAME"));	    //2
-			vpd.put("var3", varOList.get(i).getString("SUBJECT_ID"));	    //3
-			vpd.put("var4", varOList.get(i).getString("CLASS_ID"));	    //4
-			vpd.put("var5", varOList.get(i).getString("GRADE_ID"));	    //5
-			vpd.put("var6", varOList.get(i).getString("SCHOOL_ID"));	    //6
-			vpd.put("var7", varOList.get(i).getString("COMPLETE_DATE"));	    //7
-			vpd.put("var8", varOList.get(i).getString("CREATE_DATE"));	    //8
-			vpd.put("var9", varOList.get(i).getString("MODIFY_DATE"));	    //9
-			vpd.put("var10", varOList.get(i).get("COMPLETE_COUNT").toString());	//10
-			vpd.put("var11", varOList.get(i).get("ALL_SCORE").toString());	//11
+			vpd.put("var1", varOList.get(i).getString("CODE")); // 1
+			vpd.put("var2", varOList.get(i).getString("NAME")); // 2
+			vpd.put("var3", varOList.get(i).getString("SUBJECT_ID")); // 3
+			vpd.put("var4", varOList.get(i).getString("CLASS_ID")); // 4
+			vpd.put("var5", varOList.get(i).getString("GRADE_ID")); // 5
+			vpd.put("var6", varOList.get(i).getString("SCHOOL_ID")); // 6
+			vpd.put("var7", varOList.get(i).getString("COMPLETE_DATE")); // 7
+			vpd.put("var8", varOList.get(i).getString("CREATE_DATE")); // 8
+			vpd.put("var9", varOList.get(i).getString("MODIFY_DATE")); // 9
+			vpd.put("var10", varOList.get(i).get("COMPLETE_COUNT").toString()); // 10
+			vpd.put("var11", varOList.get(i).get("ALL_SCORE").toString()); // 11
 			varList.add(vpd);
 		}
 		dataMap.put("varList", varList);
 		ObjectExcelView erv = new ObjectExcelView();
-		mv = new ModelAndView(erv,dataMap);
+		mv = new ModelAndView(erv, dataMap);
 		return mv;
 	}
-	
+
 	@InitBinder
-	public void initBinder(WebDataBinder binder){
+	public void initBinder(WebDataBinder binder) {
 		DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-		binder.registerCustomEditor(Date.class, new CustomDateEditor(format,true));
+		binder.registerCustomEditor(Date.class, new CustomDateEditor(format,
+				true));
+	}
+
+	/**
+	 * 批量删除
+	 * 
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/homereport", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public String getHomeReport() throws Exception {
+		PageData pd = this.getPageData();
+		pd = homeworkService.findById(pd);
+		List<PageData> data = homeworkReporService.findByHomeworkID(pd);
+		pd.put("STUDENTS", data);
+		Gson gson = new Gson();
+		return gson.toJson(pd);
 	}
 }
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index 8f78691..65193ea 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -68,22 +68,22 @@ public class ReportController extends BaseController {
 		if( role != null && "admin".equals(role)){
 			PageData tpd = new PageData();
 			tpd.put("ID", getUserID());
-			List<PageData> adminInfos = v1Service.getAdminInfo(tpd);
+			PageData adminInfos = v1Service.getAdminInfo(tpd);
 			List<PageData> subjectInfos = new ArrayList<PageData>();
-			for(PageData pad : adminInfos){
-				PageData tmpd = new PageData();
-				Object gradeId = pad.get("GRADE_ID");
-				tmpd.put("SNAME", pad.get("SNAME"));// 学校名称
-				tmpd.put("SCHOOL_ID", pad.get("SCHOOL_ID"));//学校ID
-				tmpd.put("GRADE_ID", pad.get("GRADE_ID"));//年级id
-				tmpd.put("GNAME", pad.get("GNAME"));//年级名称
-				tmpd.put("SUBJECT_ID", pad.get("SUBJECT_ID"));// 科目id
-				tmpd.put("SCNAME", pad.get("SCNAME"));// 科目名称
-				if(gradeId != null && !"".equals(gradeId)){
-				}else{
-					subjectInfos.add(tmpd);
-				}
-			}
+//			for(PageData pad : adminInfos){
+//				PageData tmpd = new PageData();
+//				Object gradeId = pad.get("GRADE_ID");
+//				tmpd.put("SNAME", pad.get("SNAME"));// 学校名称
+//				tmpd.put("SCHOOL_ID", pad.get("SCHOOL_ID"));//学校ID
+//				tmpd.put("GRADE_ID", pad.get("GRADE_ID"));//年级id
+//				tmpd.put("GNAME", pad.get("GNAME"));//年级名称
+//				tmpd.put("SUBJECT_ID", pad.get("SUBJECT_ID"));// 科目id
+//				tmpd.put("SCNAME", pad.get("SCNAME"));// 科目名称
+//				if(gradeId != null && !"".equals(gradeId)){
+//				}else{
+//					subjectInfos.add(tmpd);
+//				}
+//			}
 			mv.addObject("subjectInfos", subjectInfos);
 		}else{
 			pd.put("TEACHER_ID", getUserID());
diff --git a/src/com/fh/controller/sunvote/student/StudentController.java b/src/com/fh/controller/sunvote/student/StudentController.java
index 721fda0..de84010 100644
--- a/src/com/fh/controller/sunvote/student/StudentController.java
+++ b/src/com/fh/controller/sunvote/student/StudentController.java
@@ -34,6 +34,7 @@ import com.fh.util.PathUtil;
 import com.fh.util.Tools;
 import com.fh.service.sunvote.classroster.ClassRosterManager;
 import com.fh.service.sunvote.student.StudentManager;
+import com.fh.service.sunvote.term.TermManager;
 
 /** 
  * 说明：学生管理
@@ -51,6 +52,9 @@ public class StudentController extends BaseController {
 	@Resource(name="classrosterService")
 	private ClassRosterManager classrosterService;
 	
+	@Resource(name="termService")
+	private TermManager termService;
+	
 	/**保存
 	 * @param
 	 * @throws Exception
@@ -80,6 +84,7 @@ public class StudentController extends BaseController {
 		String studentID = this.get32UUID();
 		pd.put("ID", studentID);
 		pd.put("STUDENT_ID", studentID);
+		pd.put("SNO", pd.get("NUMBER"));
 		studentService.save(pd);
 		
 		String termID = pd.getString("TERM_ID");
@@ -296,6 +301,7 @@ public class StudentController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		pd.put("TERM_ID", getTermId());
 		if(isChineseLanguageClient()){
 			mv.setViewName("sunvote/student/student_edit2");
 		}else{
@@ -329,9 +335,7 @@ public class StudentController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		String classID = pd.getString("CLASS_ID");
 		pd = studentService.findById(pd);	//根据ID读取
-		pd.put("CLASS_ID", classID);
 		if(isChineseLanguageClient()){
 			mv.setViewName("sunvote/student/student_edit2");
 		}else{
@@ -413,6 +417,14 @@ public class StudentController extends BaseController {
 		return mv;
 	}
 	
+	public String getTermId()  throws Exception{
+		PageData pd = termService.findCurrentId();
+		if(pd != null){
+			return pd.getString("TERM_ID");
+		}
+		return null;
+	}
+	
 	@InitBinder
 	public void initBinder(WebDataBinder binder){
 		DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
diff --git a/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java b/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java
index 1169195..8f2fa5f 100644
--- a/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java
+++ b/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java
@@ -57,7 +57,10 @@ public interface CourseManagementManager{
 	
 	
 	public List<PageData> listCourse(PageData pd)throws Exception;
+	
+	
 	public List<PageData> listCourse(Page pd)throws Exception;
+	public List<PageData> listTeacherClass(PageData pd)throws Exception;
 	
 }
 
diff --git a/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java b/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java
index f125391..15bdd20 100644
--- a/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java
+++ b/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java
@@ -71,6 +71,12 @@ public class CourseManagementService implements CourseManagementManager{
 		return (List<PageData>)dao.findForList("CourseManagementMapper.listCourselistPage", pd);
 	}
 	
+	
+	@SuppressWarnings("unchecked")
+	public List<PageData> listTeacherClass(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("CourseManagementMapper.listTeacherClass", pd);
+	}
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
diff --git a/src/com/fh/service/sunvote/homework/HomeworkReportManager.java b/src/com/fh/service/sunvote/homework/HomeworkReportManager.java
new file mode 100644
index 0000000..4e8eb3a
--- /dev/null
+++ b/src/com/fh/service/sunvote/homework/HomeworkReportManager.java
@@ -0,0 +1,80 @@
+package com.fh.service.sunvote.homework;
+
+import java.util.List;
+
+import com.fh.entity.Page;
+import com.fh.util.PageData;
+
+/** 
+ * 说明： 作业接口
+ * 创建人：FH Q313596790
+ * 创建时间：2019-03-07
+ * @version
+ */
+public interface HomeworkReportManager{
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception;
+	
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void batchSave(List<PageData> pd)throws Exception;
+	
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception;
+	
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception;
+	
+	/**
+	 * 
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void update(PageData pd)throws Exception;
+	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception;
+	
+	/**
+	 * 
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	public List<PageData> findByHomeworkID(PageData pd)throws Exception;
+	
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception;
+	
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception;
+	
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
+	
+}
+
diff --git a/src/com/fh/service/sunvote/homework/impl/HomeworkReportService.java b/src/com/fh/service/sunvote/homework/impl/HomeworkReportService.java
new file mode 100644
index 0000000..96fa3bc
--- /dev/null
+++ b/src/com/fh/service/sunvote/homework/impl/HomeworkReportService.java
@@ -0,0 +1,107 @@
+package com.fh.service.sunvote.homework.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.fh.dao.DaoSupport;
+import com.fh.entity.Page;
+import com.fh.service.sunvote.homework.HomeworkReportManager;
+import com.fh.util.PageData;
+
+/** 
+ * 说明： 作业
+ * 创建人：FH Q313596790
+ * 创建时间：2019-03-07
+ * @version
+ */
+@Service("homeworkReporService")
+public class HomeworkReportService implements HomeworkReportManager{
+
+	@Resource(name = "daoSupport")
+	private DaoSupport dao;
+	
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception{
+		dao.save("HomeworkReportMapper.save", pd);
+	}
+	
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception{
+		dao.delete("HomeworkReportMapper.delete", pd);
+	}
+	
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception{
+		dao.update("HomeworkReportMapper.edit", pd);
+	}
+	
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void update(PageData pd)throws Exception{
+		dao.update("HomeworkReportMapper.update", pd);
+	}
+	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> list(Page page)throws Exception{
+		return (List<PageData>)dao.findForList("HomeworkReportMapper.datalistPage", page);
+	}
+	
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("HomeworkReportMapper.listAll", pd);
+	}
+	
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> findByHomeworkID(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("HomeworkReportMapper.findByHomeworkID", pd);
+	}
+	
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception{
+		return (PageData)dao.findForObject("HomeworkReportMapper.findById", pd);
+	}
+	
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
+		dao.delete("HomeworkReportMapper.deleteAll", ArrayDATA_IDS);
+	}
+
+	@Override
+	public void batchSave(List<PageData> pd) throws Exception {
+		dao.save("HomeworkReportMapper.batchSave", pd);
+	}
+	
+}
+
diff --git a/src/com/fh/service/sunvote/homework/impl/HomeworkService.java b/src/com/fh/service/sunvote/homework/impl/HomeworkService.java
index c3afb8b..e55a770 100644
--- a/src/com/fh/service/sunvote/homework/impl/HomeworkService.java
+++ b/src/com/fh/service/sunvote/homework/impl/HomeworkService.java
@@ -68,7 +68,7 @@ public class HomeworkService implements HomeworkManager{
 	 */
 	@SuppressWarnings("unchecked")
 	public List<PageData> qlistAll(PageData pd)throws Exception{
-		return (List<PageData>)dao.findForList("HomeworkMapper.listAll", pd);
+		return (List<PageData>)dao.findForList("HomeworkMapper.qlistAll", pd);
 	}
 	
 	/**通过id获取数据
diff --git a/src/com/fh/service/sunvote/student/StudentManager.java b/src/com/fh/service/sunvote/student/StudentManager.java
index 340444e..31d02a1 100644
--- a/src/com/fh/service/sunvote/student/StudentManager.java
+++ b/src/com/fh/service/sunvote/student/StudentManager.java
@@ -49,6 +49,8 @@ public interface StudentManager{
 	 */
 	public List<PageData> listAll(PageData pd)throws Exception;
 	
+	public List<PageData> findByClassId(PageData pd)throws Exception;
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
diff --git a/src/com/fh/service/sunvote/student/impl/StudentService.java b/src/com/fh/service/sunvote/student/impl/StudentService.java
index c33e0fb..fb3fc81 100644
--- a/src/com/fh/service/sunvote/student/impl/StudentService.java
+++ b/src/com/fh/service/sunvote/student/impl/StudentService.java
@@ -71,6 +71,11 @@ public class StudentService implements StudentManager{
 		return (List<PageData>)dao.findForList("StudentMapper.listAll", pd);
 	}
 	
+	@SuppressWarnings("unchecked")
+	public List<PageData> findByClassId(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("StudentMapper.findByClassId", pd);
+	}
+	
 	
 	@SuppressWarnings("unchecked")
 	public List<PageData> listAllClass(PageData pd)throws Exception{
diff --git a/src/com/fh/service/sunvote/term/TermManager.java b/src/com/fh/service/sunvote/term/TermManager.java
index f007bcd..ce2fe3d 100644
--- a/src/com/fh/service/sunvote/term/TermManager.java
+++ b/src/com/fh/service/sunvote/term/TermManager.java
@@ -46,6 +46,11 @@ public interface TermManager{
 	 * @throws Exception
 	 */
 	public PageData findById(PageData pd)throws Exception;
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findCurrentId()throws Exception;
 	
 	/**批量删除
 	 * @param ArrayDATA_IDS
diff --git a/src/com/fh/service/sunvote/term/impl/TermService.java b/src/com/fh/service/sunvote/term/impl/TermService.java
index 8062c28..ee5a183 100644
--- a/src/com/fh/service/sunvote/term/impl/TermService.java
+++ b/src/com/fh/service/sunvote/term/impl/TermService.java
@@ -1,8 +1,11 @@
 package com.fh.service.sunvote.term.impl;
 
 import java.util.List;
+
 import javax.annotation.Resource;
+
 import org.springframework.stereotype.Service;
+
 import com.fh.dao.DaoSupport;
 import com.fh.entity.Page;
 import com.fh.util.PageData;
@@ -69,6 +72,14 @@ public class TermService implements TermManager{
 		return (PageData)dao.findForObject("TermMapper.findById", pd);
 	}
 	
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findCurrentId()throws Exception{
+		return (PageData)dao.findForObject("TermMapper.findCurrentId",null);
+	}
+	
 	/**批量删除
 	 * @param ArrayDATA_IDS
 	 * @throws Exception
@@ -76,6 +87,6 @@ public class TermService implements TermManager{
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
 		dao.delete("TermMapper.deleteAll", ArrayDATA_IDS);
 	}
-	
+
 }