报表添加教师名称及科目信息

孙向锦
1 parent 4b5d7c93
Showing 3 changed files with 28 additions and 4 deletions
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
src/com/fh/controller/sunvote/report/ReportController.java
@@ -7,8 +7,7 @@
 <%
 	String path = request.getContextPath();
 	String basePath = request.getScheme() + "://"
-			+ request.getServerName() + ":" + request.getServerPort()
-			+ path + "/";
+			+ request.getServerName() + ":" + request.getServerPort() + path + "/";
 %>
 <!DOCTYPE html>
 <html lang="en">
@@ -35,7 +35,11 @@
 			<input type="hidden" name="CLASSID" id="CLASSID" value="${info.CLASS_ID}" />
 			<table style="margin-top:5px;">
 				<tr style="height: 30px">
-					<td>测验名称: ${testpaperInfo.NAME}</td>
+					<td>测验名称: ${testpaperInfo.NAME}</td>  
+					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
+					<td>教师: ${teacherPd.NAME}</td> 
+					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
+					<td>科目名称: ${subjectPd.CNAME}</td>
 				</tr>
 				<tr style="height: 30px">
 					<td>收卷时间: ${testpaperInfo.END_DATE}</td>
@@ -138,7 +142,7 @@
             removeOriginal: true
         	};
-       		 $("#simple-table").tablescroller(options);
+       		$("#simple-table").tablescroller(options);
 		});
 		$(function() {
@@ -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<PageData> studentList = studentService.listAllClass(pd);
 		List<Integer> questionList = new ArrayList<Integer>();
@@ -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;