diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
index 8e32ea5..eeee7b3 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
@@ -145,7 +145,7 @@
 		function edit(Id){
 			window.top.modal.init({
 			'title':'修改信息',
-			'url':'<%=basePath%>sclass/edit2.do?ID='+Id,
+			'url':'<%=basePath%>sclass/goEdit2.do?ID='+Id,
 			func:function() {
 				tosearch();
 			}
diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index 8a38363..14a1fa6 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -240,6 +240,7 @@
 			COMPLETE_DATE,	
 			ALL_SCORE,	
 			QUESTION_COUNT,	
+			COMPLETE_DESC,
 			HOMEWORK_ID
 		from 
 		<include refid="tableName"></include>
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index eb69873..9e20f74 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -221,6 +221,25 @@ public class HomeworkController extends BaseController {
 		mv.addObject("pd", pd);
 		return mv;
 	}
+	
+	
+	/**
+	 * 去修改页面
+	 * 
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/report")
+	public ModelAndView report() throws Exception {
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+	
+		mv.setViewName("sunvote/homework/homework_report");
+		mv.addObject("pd", pd);
+		return mv;
+	}
+
 
 	/**
 	 * 批量删除
@@ -321,12 +340,22 @@ public class HomeworkController extends BaseController {
 	@ResponseBody
 	public String getHomeReport() throws Exception {
 		PageData pd = this.getPageData();
-		pd = homeworkService.findById(pd);
-		List<PageData> data = homeworkReporService.findByHomeworkID(pd);
-		pd.put("STUDENTS", data);
+		if(pd.get("HOMEWORK_ID") != null && !"".equals(pd.get("HOMEWORK_ID").toString().trim())){
+			pd = homeworkService.findById(pd);
+			if(pd != null){
+				List<PageData> data = homeworkReporService.findByHomeworkID(pd);
+				pd.put("STUDENTS", data);
+			}else{
+				pd.put("HOMEWORK_ID", "no");
+			}
+		}else{
+			pd.put("HOMEWORK_ID", "no data"); 
+		}
 		Gson gson = new Gson();
 		return gson.toJson(pd);
 	}
+	
+	
 
 	/**
 	 * 列表