diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index c92d29f..6188eac 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -287,7 +287,10 @@
 			sv_homework
 		LEFT JOIN sv_homeworkreport ON sv_homework.HOMEWORK_ID = sv_homeworkreport.HOMEWORK_ID
 		WHERE
-			sv_homework.CLASS_ID = #{CLASS_ID}
+			sv_homework.CLASS_ID = #{CLASS_ID} and sv_homework.COMPLETE_COUNT > 0
+			<if test="HOMEWORK_ID != null and HOMEWORK_ID != ''"><!-- 关键词检索 -->
+				and HOMEWORK_ID = #{HOMEWORK_ID}
+			</if>
 		ORDER BY sv_homework.COMPLETE_DATE,sv_homework.HOMEWORK_ID,sv_homeworkreport.STUDNET_NO
 	
 	</select>
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index acba287..e299a14 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -2895,6 +2895,7 @@ public class V1 extends BaseController {
 			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());
+			homePd.put("COMPLETE_COUNT", "1");
 			homeworkService.edit(homePd);
 			List<PageData> list = homeworkReporkService.findByHomeworkID(homePd);
 			if(list == null || list.size() == 0){
@@ -2903,6 +2904,7 @@ public class V1 extends BaseController {
 				List<PageData> student = studentService.findByClassId(homePd);
 				for(PageData ptd : student){
 					ptd.put("STUDENT_NAME", ptd.get("NAME"));
+					ptd.put("HOMEWORK_REPORT_ID", this.get32UUID());
 					ptd.put("STUDENT_NO", ptd.get("SNO"));
 					ptd.put("RANK", student.size() + "");
 					ptd.put("KEYBOARD", ptd.get("KEYPAD_ID"));
@@ -2912,7 +2914,9 @@ public class V1 extends BaseController {
 					ptd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
 				}
 				// 2. 根据学生列表生成初始化成绩
-				homeworkReporkService.batchSave(student);
+				if(student.size() > 0){
+					homeworkReporkService.batchSave(student);
+				}
 			}
 			List<ResultStudent> students = resultHomework.getSTUDENTS();
 			for(ResultStudent student:students){
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 4d7667d..bbcf96d 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -245,13 +245,29 @@ public class HomeworkController extends BaseController {
 		pd.put("TEACHER_ID", getTeacherID());
 		List<PageData> list = coursemanagementService.listTeacherClass(pd);
 		for(PageData ptd : list){
+<<<<<<< HEAD
 			ptd.put("ClASS_ID", pd.get("ID"));
+=======
+			ptd.put("CLASS_ID", ptd.get("ID"));
+>>>>>>> bd553929bab8314313b820c4fd78254ca1640230
 			ptd.put("TEACHER_ID", pd.get("TEACHER_ID"));
-			List<PageData> dataList = homeworkService.listAll(ptd);
-			ptd.put("DETAIL", dataList);
+			List<PageData> homeworkList = homeworkService.listAll(ptd);
+			for(PageData hpd:homeworkList){
+				List<PageData> dataList = homeworkService.report(hpd);
+				hpd.put("STUDENTS", dataList);
+				hpd.remove("TEACHER_ID");
+				hpd.remove("CLASS_TYPE");
+				hpd.remove("BASESTATION_ID");
+				hpd.remove("SCHOOL_ID");
+				hpd.remove("GRADE_ID");
+				hpd.remove("ID");
+			}
+			ptd.put("HOMEWORKS", homeworkList);
 		}
 		pd.put("CLASS", list);
-		
+		pd.remove("JSON");
+		pd.remove("JSON");
+		pd.remove("ID");
 		mv.setViewName("sunvote/homework/homework_report");
 		mv.addObject("pd", pd);
 		return mv;
diff --git a/src/com/fh/controller/sunvote/student/StudentController.java b/src/com/fh/controller/sunvote/student/StudentController.java
index de84010..221f189 100644
--- a/src/com/fh/controller/sunvote/student/StudentController.java
+++ b/src/com/fh/controller/sunvote/student/StudentController.java
@@ -135,6 +135,9 @@ public class StudentController extends BaseController {
 		PageData tpd = getPageData();
 		PageData pd = new PageData();
 		String termID = tpd.getString("TERM_ID");
+		if(termID == null || "".equals(termID.trim())){
+			termID = getTermId();
+		}
 		String classID = tpd.getString("CLASS_ID");
 		if (null != file && !file.isEmpty()) {
 			String filePath = PathUtil.getClasspath() + Const.FILEPATHFILE;								//文件上传路径
@@ -157,6 +160,8 @@ public class StudentController extends BaseController {
 						if (savePd.values().size() > 0) {
 							String studentId = this.get32UUID();
 							savePd.put("ID", studentId);
+							savePd.put("CLASS_ID", classID);
+							
 							studentService.save(savePd);
 
 							if (classID != null && termID != null) {