diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp index 6777548..b7281aa 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp @@ -7,8 +7,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme() + "://" - + request.getServerName() + ":" + request.getServerPort() - + path + "/"; + + request.getServerName() + ":" + request.getServerPort() + path + "/"; %> diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp index 48b3f7e..1c2dfb8 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp @@ -35,7 +35,11 @@ - + + + + + @@ -138,7 +142,7 @@ removeOriginal: true }; - $("#simple-table").tablescroller(options); + $("#simple-table").tablescroller(options); }); $(function() { diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java index f4304bc..1d21063 100644 --- a/src/com/fh/controller/sunvote/report/ReportController.java +++ b/src/com/fh/controller/sunvote/report/ReportController.java @@ -18,6 +18,9 @@ import com.fh.service.api.V1Manager; import com.fh.service.sunvote.sclass.SClassManager; import com.fh.service.sunvote.student.StudentManager; import com.fh.service.sunvote.studenttest.StudentTestManager; +import com.fh.service.sunvote.subject.SubjectManager; +import com.fh.service.sunvote.teacher.TeacherManager; +import com.fh.service.sunvote.teacher.impl.TeacherService; import com.fh.service.sunvote.testpaper.TestPaperManager; import com.fh.service.sunvote.testpaperinfo.TestPaperInfoManager; import com.fh.util.Jurisdiction; @@ -45,6 +48,12 @@ public class ReportController extends BaseController { @Resource(name = "v1Service") private V1Manager v1Service; + @Resource(name = "teacherService") + private TeacherManager teacherService; + + @Resource(name="subjectService") + private SubjectManager subjectService; + @RequestMapping(value="/report") @@ -288,6 +297,16 @@ public class ReportController extends BaseController { pd.put("TESTPAPER_ID", pd.get("TESTID")); PageData testpaperPd = testpaperService.findById(pd); + PageData teacherPd = new PageData(); + teacherPd.put("ID", testpaperPd.get("TEACHER_ID")); + teacherPd = teacherService.findById(teacherPd); + + PageData subjectPd = new PageData(); + subjectPd.put("ID", testpaperPd.get("SUBJECT_ID")); + subjectPd = subjectService.findById(subjectPd); + + + // 查询班级学生 List studentList = studentService.listAllClass(pd); List questionList = new ArrayList(); @@ -384,6 +403,8 @@ public class ReportController extends BaseController { mv.addObject("testpaperInfo", testpaperPd); mv.addObject("questionInfo", questionList); mv.addObject("studentInfo", studentList); + mv.addObject("teacherPd", teacherPd); + mv.addObject("subjectPd", subjectPd); mv.setViewName("sunvote/teacher/teacher_report_test"); return mv;
测验名称: ${testpaperInfo.NAME}测验名称: ${testpaperInfo.NAME}                教师: ${teacherPd.NAME}                科目名称: ${subjectPd.CNAME}
收卷时间: ${testpaperInfo.END_DATE}