diff --git a/resources/mybatis1/sunvote/CourseManagementMapper.xml b/resources/mybatis1/sunvote/CourseManagementMapper.xml
index 667399a..2d8e39e 100644
--- a/resources/mybatis1/sunvote/CourseManagementMapper.xml
+++ b/resources/mybatis1/sunvote/CourseManagementMapper.xml
@@ -162,6 +162,7 @@
 		LEFT JOIN sv_sclass ON sv_coursemanagement.CLASS_ID = sv_sclass.ID
 		WHERE
 			sv_coursemanagement.TEACHER_ID =  #{TEACHER_ID}
+		order by sv_sclass.CLASS_CODE
 		
 	</select>
 	
diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index 83bec9f..d2d96ae 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -123,6 +123,27 @@
 		HOMEWORK_ID = #{HOMEWORK_ID}
 	</update>
 	
+	
+	<!-- 修改 -->
+	<update id="deleteHomework" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set IS_DELETE = '1'
+		where 
+		HOMEWORK_ID = #{HOMEWORK_ID}
+	</update>
+	<!-- 修改 -->
+	<update id="deleteHomeworkAll" parameterType="String">
+		update
+		<include refid="tableName"></include>
+		set IS_DELETE = '1'
+		where 
+		HOMEWORK_ID in 
+		<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
+                 #{item}
+		</foreach>
+	</update>
+	
 	<!-- 通过ID获取数据 -->
 	<select id="findById" parameterType="pd" resultType="pd">
 		select 
@@ -174,6 +195,8 @@
 		<if test="pd.ENDDATE != null and pd.ENDDATE != ''"><!-- 关键词检索 -->
 			and COMPLETE_DATE &lt; #{pd.ENDDATE}
 		</if>
+		
+		and IS_DELETE != '1'
 	</select>
 	
 	<!-- 列表(全部) -->
@@ -202,18 +225,21 @@
 			and COMPLETE_DATE &gt; #{COMPLETE_DATE}
 		</if>
 		
+		and IS_DELETE != '1'
 		
 	</select>
 	
 	<!-- 列表(全部) -->
 	<select id="qlistAll" parameterType="pd" resultType="pd">
 		select
+			COMPLETE_COUNT,
 			CODE,	
 			NAME,	
 			SUBJECT_ID,	
 			CLASS_ID,	
 			COMPLETE_DATE,	
 			ALL_SCORE,	
+			QUESTION_COUNT,	
 			HOMEWORK_ID
 		from 
 		<include refid="tableName"></include>
@@ -237,7 +263,7 @@
 			and COMPLETE_DATE &gt; #{COMPLETE_DATE}
 		</if>
 		
-		
+		and IS_DELETE != '1'
 	</select>
 	
 	<!-- 批量删除 -->
diff --git a/resources/mybatis1/sunvote/HomeworkProblemMapper.xml b/resources/mybatis1/sunvote/HomeworkProblemMapper.xml
index b5b710c..15d39a6 100644
--- a/resources/mybatis1/sunvote/HomeworkProblemMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkProblemMapper.xml
@@ -137,6 +137,7 @@
 	<!-- 列表(全部) -->
 	<select id="listProblem" parameterType="pd" resultType="pd">
 		select
+		HOMEWORKPROBLEM_ID,
 		RANK,
 		NAME,
 		OPTION_NUM,
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index b895492..acba287 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -261,10 +261,18 @@ public class V1 extends BaseController {
 				res.setData(pageData);
 				// 填充数据到返回数据中
 			} else if(headerMaster != null && headerMaster.get("HEADMASTER_ID") != null){
-				headerMaster.put("PASSWORD", "");
 				headerMaster.put("role", "headermaster");
 				List<PageData> classInfoList = sclassService.listAll(headerMaster);
+				for(PageData pttd : classInfoList){
+					pttd.put("CLASS_ID", pttd.get("ID"));
+					pttd.remove("ID");
+					pttd.remove("HEADMASTER_ID");
+					pttd.remove("SCHOOL_ID");
+					pttd.remove("CLASS_TYPE");
+				}
 				headerMaster.put("classInfoList", classInfoList);
+				headerMaster.remove("USERNAME");
+				headerMaster.remove("PASSWORD");
 				res.setData(headerMaster);
 				
 			}else{
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 96b4322..eb69873 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -242,7 +242,7 @@ public class HomeworkController extends BaseController {
 		String DATA_IDS = pd.getString("DATA_IDS");
 		if (null != DATA_IDS && !"".equals(DATA_IDS)) {
 			String ArrayDATA_IDS[] = DATA_IDS.split(",");
-			homeworkService.deleteAll(ArrayDATA_IDS);
+			homeworkService.deleteHomeworkAll(ArrayDATA_IDS);
 			pd.put("msg", "ok");
 		} else {
 			pd.put("msg", "no");
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index 65193ea..36dc8de 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -70,20 +70,6 @@ public class ReportController extends BaseController {
 			tpd.put("ID", getUserID());
 			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);
-//				}
-//			}
 			mv.addObject("subjectInfos", subjectInfos);
 		}else{
 			pd.put("TEACHER_ID", getUserID());
diff --git a/src/com/fh/service/sunvote/homework/HomeworkManager.java b/src/com/fh/service/sunvote/homework/HomeworkManager.java
index b010985..b8b5023 100644
--- a/src/com/fh/service/sunvote/homework/HomeworkManager.java
+++ b/src/com/fh/service/sunvote/homework/HomeworkManager.java
@@ -29,6 +29,16 @@ public interface HomeworkManager{
 	 * @throws Exception
 	 */
 	public void edit(PageData pd)throws Exception;
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void deleteHomework(PageData pd)throws Exception;
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void deleteHomeworkAll(String[] ArrayDATA_IDS)throws Exception;
 	
 	/**列表
 	 * @param page
diff --git a/src/com/fh/service/sunvote/homework/impl/HomeworkService.java b/src/com/fh/service/sunvote/homework/impl/HomeworkService.java
index 6a80189..2179c5b 100644
--- a/src/com/fh/service/sunvote/homework/impl/HomeworkService.java
+++ b/src/com/fh/service/sunvote/homework/impl/HomeworkService.java
@@ -47,6 +47,22 @@ public class HomeworkService implements HomeworkManager{
 		dao.update("HomeworkMapper.edit", pd);
 	}
 	
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void deleteHomework(PageData pd)throws Exception{
+		dao.update("HomeworkMapper.deleteHomework", pd);
+	}
+	
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void deleteHomeworkAll(String[] ArrayDATA_IDS)throws Exception{
+		dao.update("HomeworkMapper.deleteHomework", ArrayDATA_IDS);
+	}
+	
 	/**列表
 	 * @param page
 	 * @throws Exception