diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index 6dfc0a6..ca735f1 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -83,7 +83,16 @@
 					任课管理<span class="right jiao"></span>
 				</p>
 				<ul class="menu_1">
-					<li onclick="event.stopPropagation();subject('${SCHOOL_ID}')"><p>科目管理</p></li>
+					<li> <p>科目管理</p>
+						<ul  class="menu_2">
+							<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
+								<li onclick="event.stopPropagation();subject('${SCHOOL_ID}')">
+									<p>${ var.GNAME }</p>
+								</li>
+							</c:forEach>
+						</ul>
+					</li>
+						
 					<li onclick="event.stopPropagation();coursemanager('${SCHOOL_ID}')"><p>任课管理</p></li>
 					<li onclick="event.stopPropagation();teacher('${SCHOOL_ID}')"><p>教师管理</p></li>
 			</ul>
@@ -242,8 +251,8 @@
 	<script type="text/javascript">
 	
 		var schoolId = '${SCHOOL_ID}';
-		function subject(school_id){
-			var path = "../subject/listcs.do?school_id=" + school_id ;
+		function subject(school_id,grade_id){
+			var path = "../subject/listcs.do?school_id=" + school_id + "&grade_id=" + grade_id ;
 			//if($("#mainFrame").attr('src') != (path)){
 				$("#mainFrame").attr('src',path);
 				window.top.loading.show();
diff --git a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp
index 67d0153..d2b7b4a 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp
@@ -29,6 +29,7 @@
 					
 					<form action="subject/${msg }.do" name="Form" id="Form" method="post">
 						<input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
+						<input type="hidden" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}"/>
 						<div id="zhongxin" style="padding-top: 13px;">
 						<table id="table_report" class="table table-striped table-bordered table-hover">
 							<tr>
diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml
index 0f80e56..bd7b52c 100644
--- a/resources/mybatis1/api/V1Mapper.xml
+++ b/resources/mybatis1/api/V1Mapper.xml
@@ -185,6 +185,7 @@
 		
 	</select>
 	
+	
 	<!-- 通过admin ID获取科目数据 -->
 	<select id="getClassBySchoolAndGradle" parameterType="pd" resultType="pd">
 		SELECT
diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index a09a212..2995542 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -140,6 +140,43 @@
 		
 	</select>
 	
+	<!-- 列表(全部) -->
+	<select id="qlistAll" parameterType="pd" resultType="pd">
+		select
+			CODE,	
+			NAME,	
+			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 != ''"><!-- 关键词检索 -->
+			and SUBJECT_ID = #{SUBJECT_ID}
+		</if>
+		<if test="pd.CLASS_ID != null and pd.CLASS_ID != ''"><!-- 关键词检索 -->
+			and CLASS_ID = #{CLASS_ID}
+		</if>
+		<if test="pd.GRADE_ID != null and pd.GRADE_ID != ''"><!-- 关键词检索 -->
+			and GRADE_ID = #{GRADE_ID}
+		</if>
+		<if test="pd.SCHOOL_ID != null and pd.SCHOOL_ID != ''"><!-- 关键词检索 -->
+			and SCHOOL_ID = #{SCHOOL_ID}
+		</if>
+		<if test="pd.TEACHER_ID != null and pd.TEACHER_ID != ''"><!-- 关键词检索 -->
+			and TEACHER_ID = #{TEACHER_ID}
+		</if>
+		<if test="pd.COMPLETE != null and pd.COMPLETE != ''"><!-- 关键词检索 -->
+			and COMPLETE_DATE &gt; #{COMPLETE_DATE}
+		</if>
+		
+		
+	</select>
+	
 	<!-- 批量删除 -->
 	<delete id="deleteAll" parameterType="String">
 		delete from
diff --git a/resources/mybatis1/sunvote/HomeworkProblemMapper.xml b/resources/mybatis1/sunvote/HomeworkProblemMapper.xml
index f68c2af..9bd687a 100644
--- a/resources/mybatis1/sunvote/HomeworkProblemMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkProblemMapper.xml
@@ -18,6 +18,7 @@
 		RIGHT_ANSWER,	
 		SCORE,	
 		PART_SCORE,	
+		HOMEWORK_ID,	
 		HOMEWORKPROBLEM_ID
 	</sql>
 	
@@ -32,6 +33,7 @@
 		#{RIGHT_ANSWER},	
 		#{SCORE},	
 		#{PART_SCORE},	
+		#{HOMEWORK_ID},	
 		#{HOMEWORKPROBLEM_ID}
 	</sql>
 	
@@ -68,6 +70,7 @@
 			RIGHT_ANSWER = #{RIGHT_ANSWER},
 			SCORE = #{SCORE},
 			PART_SCORE = #{PART_SCORE},
+			HOMEWORK_ID = #{HOMEWORK_ID},
 		HOMEWORKPROBLEM_ID = HOMEWORKPROBLEM_ID
 		where 
 		HOMEWORKPROBLEM_ID = #{HOMEWORKPROBLEM_ID}
@@ -110,6 +113,38 @@
 		<include refid="tableName"></include>
 	</select>
 	
+	<!-- 列表(全部) -->
+	<select id="listHomeworkProblem" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		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>
+		ORDER BY RANK
+	</select>
+	
+	<!-- 列表(全部) -->
+	<select id="listProblem" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		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>
+		<if test="pd.P_HOMEWORK_PROBLEM_ID == null or pd.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>
+		ORDER BY RANK
+	</select>
+	
 	<!-- 批量删除 -->
 	<delete id="deleteAll" parameterType="String">
 		delete from
diff --git a/resources/mybatis1/sunvote/SubjectMapper.xml b/resources/mybatis1/sunvote/SubjectMapper.xml
index 401c243..66a4099 100644
--- a/resources/mybatis1/sunvote/SubjectMapper.xml
+++ b/resources/mybatis1/sunvote/SubjectMapper.xml
@@ -123,6 +123,9 @@
 		<if test="pd.SCHOOL_ID != null and pd.SCHOOL_ID != ''">
 			and	sv_schoolgradesubject.SCHOOL_ID = #{pd.SCHOOL_ID}
 		</if>
+		<if test="pd.GRADE_ID != null and pd.GRADE_ID != ''">
+			and	sv_schoolgradesubject.GRADE_ID = #{pd.GRADE_ID}
+		</if>
 	</select>
 	
 	<!-- 添加学校科目，从未添加的科目里面进行添加 -->
@@ -141,6 +144,9 @@
 			<if test="SCHOOL_ID != null and SCHOOL_ID != ''">
 				and	sv_schoolgradesubject.SCHOOL_ID = #{SCHOOL_ID}
 			</if>
+			<if test="GRADE_ID != null and GRADE_ID != ''">
+				and	sv_schoolgradesubject.GRADE_ID = #{GRADE_ID}
+			</if>
 		)
 		
 	</select>
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index 3510294..3888421 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -46,6 +46,7 @@ import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
 import com.fh.service.sunvote.event.EventManager;
 import com.fh.service.sunvote.grade.GradeManager;
 import com.fh.service.sunvote.homework.HomeworkManager;
+import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager;
 import com.fh.service.sunvote.keypad.KeypadManager;
 import com.fh.service.sunvote.keypadcheck.KeypadCheckManager;
 import com.fh.service.sunvote.knowledge.KnowledgeManager;
@@ -190,7 +191,10 @@ public class V1 extends BaseController {
 
 	@Resource(name = "cacheService")
 	private CacheManager cacheService;
-
+	
+	@Resource(name="homeworkproblemService")
+	private HomeworkProblemManager homeworkproblemService;
+	
 	/**
 	 * 登录 可以通过账号密码登录、 可以通过教师卡登录
 	 * 
@@ -2809,11 +2813,60 @@ public class V1 extends BaseController {
 	public String listhomework() throws Exception {
 		ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
 		PageData pageData = this.getPageData();
-		List<PageData> list = homeworkService.listAll(pageData);
+		List<PageData> list = homeworkService.qlistAll(pageData);
 		res.setData(list);
 		return res.toJson();
 		
 	}
+	
+	/**
+	 * 获取作业详情
+	 * 
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/homework", 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 = homeworkproblemService.listProblem(pageData);
+		for(PageData pd : list){
+			if(pd.get("P_HOMEWORK_PROBLEM_ID") != null){
+				List<PageData> childList = homeworkproblemService.listProblem(pd);
+				pd.put("PROBLEMS", childList);
+			}
+			
+		}
+		res.setData(list);
+		return res.toJson();
+		
+	}
+	
+	/**
+	 * 获取作业详情
+	 * 
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/uploadhomework", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public String uploadhomework() throws Exception {
+		ResponseGson<String> res = new ResponseGson<String>();
+		
+		PageData pd = this.getPageData();
+		if (!StringUtils.isEmpty(pd.getJsonString())) {
+			
+			
+			
+			res.setData("success");
+		}
+		res.setDataError();
+		return res.toJson();
+		
+	}
 
 	/**
 	 * 根据ID班级名称
diff --git a/src/com/fh/controller/sunvote/grade/GradeController.java b/src/com/fh/controller/sunvote/grade/GradeController.java
index 053e6fb..17d9972 100644
--- a/src/com/fh/controller/sunvote/grade/GradeController.java
+++ b/src/com/fh/controller/sunvote/grade/GradeController.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,14 +18,14 @@ 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.grade.GradeManager;
 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.grade.GradeManager;
 
 /** 
  * 说明：年级
diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java
index d826ddb..3d2393a 100644
--- a/src/com/fh/controller/system/login/LoginController.java
+++ b/src/com/fh/controller/system/login/LoginController.java
@@ -296,6 +296,7 @@ public class LoginController extends BaseController {
 					List<PageData> gradeInfos = new ArrayList<PageData>();
 					List<PageData> subjectInfos = new ArrayList<PageData>();
 					//  查询学校信息
+					Object tgradleId = "" ;
 					for(PageData pad : adminInfos){
 						PageData tmpd = new PageData();
 						Object gradeId = pad.get("GRADE_ID");
@@ -305,13 +306,15 @@ public class LoginController extends BaseController {
 						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)){
+						if(gradeId != null && !gradeId.equals(tgradleId)){
+							tgradleId = gradeId ;
 							List<PageData> classInfos = sclassService.listAll(tmpd);
 							tmpd.put("classInfos", classInfos);
 							gradeInfos.add(tmpd);
-						}else{
-							subjectInfos.add(tmpd);
+							subjectInfos =  new ArrayList<PageData>();
+							tmpd.put("subjectInfos", subjectInfos);
 						}
+						subjectInfos.add(tmpd);
 						schoolId = pad.getString("SCHOOL_ID");
 						mv.addObject("SNAME", pad.get("SNAME"));
 						mv.addObject("SCHOOL_ID", pad.get("SCHOOL_ID"));
@@ -319,7 +322,6 @@ public class LoginController extends BaseController {
 					session.setAttribute(USERNAME + Const.ROLE_ID,
 							"admin");
 					mv.addObject("gradeInfos", gradeInfos);
-					mv.addObject("subjectInfos", subjectInfos);
 					session.setAttribute(Const.SESSION_USERNAME, USERNAME); // 放入用户名到session
 					if(isChineseLanguageClient()){
 						mv.setViewName("sunvote/admin/admin_main");
diff --git a/src/com/fh/service/sunvote/homework/HomeworkManager.java b/src/com/fh/service/sunvote/homework/HomeworkManager.java
index 9fb373f..2925486 100644
--- a/src/com/fh/service/sunvote/homework/HomeworkManager.java
+++ b/src/com/fh/service/sunvote/homework/HomeworkManager.java
@@ -41,6 +41,11 @@ public interface HomeworkManager{
 	 * @throws Exception
 	 */
 	public List<PageData> listAll(PageData pd)throws Exception;
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> qlistAll(PageData pd)throws Exception;
 	
 	/**通过id获取数据
 	 * @param pd
diff --git a/src/com/fh/service/sunvote/homework/impl/HomeworkService.java b/src/com/fh/service/sunvote/homework/impl/HomeworkService.java
index 17c66a3..c3afb8b 100644
--- a/src/com/fh/service/sunvote/homework/impl/HomeworkService.java
+++ b/src/com/fh/service/sunvote/homework/impl/HomeworkService.java
@@ -62,6 +62,15 @@ public class HomeworkService implements HomeworkManager{
 		return (List<PageData>)dao.findForList("HomeworkMapper.listAll", pd);
 	}
 	
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> qlistAll(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("HomeworkMapper.listAll", pd);
+	}
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
diff --git a/src/com/fh/service/sunvote/homeworkproblem/HomeworkProblemManager.java b/src/com/fh/service/sunvote/homeworkproblem/HomeworkProblemManager.java
index d266176..297b23d 100644
--- a/src/com/fh/service/sunvote/homeworkproblem/HomeworkProblemManager.java
+++ b/src/com/fh/service/sunvote/homeworkproblem/HomeworkProblemManager.java
@@ -42,6 +42,17 @@ public interface HomeworkProblemManager{
 	 */
 	public List<PageData> listAll(PageData pd)throws Exception;
 	
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listHomeworkProblem(PageData pd)throws Exception;
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listProblem(PageData pd)throws Exception;
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
diff --git a/src/com/fh/service/sunvote/homeworkproblem/impl/HomeworkProblemService.java b/src/com/fh/service/sunvote/homeworkproblem/impl/HomeworkProblemService.java
index 3a697a8..be128c1 100644
--- a/src/com/fh/service/sunvote/homeworkproblem/impl/HomeworkProblemService.java
+++ b/src/com/fh/service/sunvote/homeworkproblem/impl/HomeworkProblemService.java
@@ -62,6 +62,23 @@ public class HomeworkProblemService implements HomeworkProblemManager{
 		return (List<PageData>)dao.findForList("HomeworkProblemMapper.listAll", pd);
 	}
 	
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> listHomeworkProblem(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("HomeworkProblemMapper.listHomeworkProblem", pd);
+	}
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> listProblem(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("HomeworkProblemMapper.listProblem", pd);
+	}
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception