diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp index b42af60..941e4b3 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp @@ -19,17 +19,30 @@ - -<%@ include file="../../system/index/top.jsp"%> + + +
+ +
+
@@ -41,6 +54,8 @@
学生人数: ${info.STUDENT_NUM}
+ + diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java index 7b546ee..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 list = homeworkReporkService.findByHomeworkID(homePd); if(list == null || list.size() == 0){ @@ -2903,6 +2904,7 @@ public class V1 extends BaseController { List 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")); diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java index d3f3080..248ec58 100644 --- a/src/com/fh/controller/sunvote/homework/HomeworkController.java +++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java @@ -247,14 +247,18 @@ public class HomeworkController extends BaseController { for(PageData ptd : list){ ptd.put("CLASS_ID", ptd.get("ID")); ptd.put("TEACHER_ID", pd.get("TEACHER_ID")); - List dataList = homeworkService.report(ptd); - ptd.put("DETAIL", dataList); - ptd.remove("TEACHER_ID"); - ptd.remove("CLASS_TYPE"); - ptd.remove("BASESTATION_ID"); - ptd.remove("SCHOOL_ID"); - ptd.remove("GRADE_ID"); - ptd.remove("ID"); + List homeworkList = homeworkService.listAll(ptd); + for(PageData hpd:homeworkList){ + List 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");