diff --git a/WebRoot/WEB-INF/jsp/sunvote/classroster/classroster_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/classroster/classroster_list.jsp index 9453c1e..d6b7e11 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/classroster/classroster_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/classroster/classroster_list.jsp @@ -1,6 +1,7 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%> <% String path = request.getContextPath(); String basePath = request.getScheme() + "://" @@ -84,13 +85,13 @@ ${vs.index+1} - ${var.SCLASS_ID} - ${var.STUDENT_ID} - ${var.TEAMID} + ${myelfun:findClassName(var.SCLASS_ID)} + ${myelfun:findStudentName(var.STUDENT_ID)} + ${myelfun:findTermName(var.TEAMID)} - + -
-

${pd.TEACHER[0].GRADE_NAME}${pd.TEACHER[0].SUBJECT_NAME} ${pd.TEACHER[0].CLASS_NAME}

-
+ +
+

${var.GRADE_NAME}${var.SUBJECT_NAME} ${var.CLASS_NAME}

+
+
测验
分析
diff --git a/WebRoot/WEB-INF/tld/elfun.tld b/WebRoot/WEB-INF/tld/elfun.tld index 66b7585..32e3681 100644 --- a/WebRoot/WEB-INF/tld/elfun.tld +++ b/WebRoot/WEB-INF/tld/elfun.tld @@ -11,7 +11,7 @@ 根据ID 获取学校名称 findSchoolName com.fh.controller.sunvote.Myelfun - java.lang.String findSchoolName(int) + java.lang.String findSchoolName(java.lang.String) ${myelfun:findSchoolName(obj1)} @@ -20,7 +20,7 @@ 根据ID获取年级名称 findGradeName com.fh.controller.sunvote.Myelfun - java.lang.String findGradeName(int) + java.lang.String findGradeName(java.lang.String) ${myelfun:findGradeName(obj1)} @@ -28,7 +28,7 @@ 根据ID获取班级类型名称 findClassTypeName com.fh.controller.sunvote.Myelfun - java.lang.String findClassTypeName(int) + java.lang.String findClassTypeName(java.lang.String) ${myelfun:findClassTypeName(obj1)} @@ -36,7 +36,7 @@ 获取科目英文名称 findSubjectEName com.fh.controller.sunvote.Myelfun - java.lang.String findSubjectEName(int) + java.lang.String findSubjectEName(java.lang.String) ${myelfun:findSubjectEName(obj1)} @@ -44,7 +44,7 @@ 根据ID获取科目中文名称 findSubjectCName com.fh.controller.sunvote.Myelfun - java.lang.String findSubjectCName(int) + java.lang.String findSubjectCName(java.lang.String) ${myelfun:findSubjectCName(obj1)} @@ -52,7 +52,7 @@ 根据ID查找基站名称 findBasestationName com.fh.controller.sunvote.Myelfun - java.lang.String findBasestationName(int) + java.lang.String findBasestationName(java.lang.String) ${myelfun:findBasestationName(obj1)} @@ -60,7 +60,7 @@ 根据ID查找老师姓名 findTeacherName com.fh.controller.sunvote.Myelfun - java.lang.String findTeacherName(int) + java.lang.String findTeacherName(java.lang.String) ${myelfun:findTeacherName(obj1)} @@ -68,15 +68,29 @@ 根据ID查找班级姓名 findClassName com.fh.controller.sunvote.Myelfun - java.lang.String findClassName(int) + java.lang.String findClassName(java.lang.String) ${myelfun:findClassName(obj1)} + + 根据ID查找学生姓名 + findStudentName + com.fh.controller.sunvote.Myelfun + java.lang.String findStudentName(java.lang.String) + ${myelfun:findStudentName(obj1)} + + + 根据ID查找学期名称 + findTermName + com.fh.controller.sunvote.Myelfun + java.lang.String findTermName(java.lang.String) + ${myelfun:findTermName(obj1)} + 根据ID查找教材名称 findTeachingmaterialName com.fh.controller.sunvote.Myelfun - java.lang.String findTeachingmaterialName(int) + java.lang.String findTeachingmaterialName(String) ${myelfun:findTeachingmaterialName(obj1)} @@ -84,7 +98,7 @@ 根据ID查找题目类型 findQuestionTypeName com.fh.controller.sunvote.Myelfun - java.lang.String findQuestionTypeName(int) + java.lang.String findQuestionTypeName(String) ${myelfun:findQuestionTypeName(obj1)} diff --git a/WebRoot/static/images/analysis.png b/WebRoot/static/images/analysis.png new file mode 100644 index 0000000..291ebc8 --- /dev/null +++ b/WebRoot/static/images/analysis.png diff --git a/WebRoot/static/images/loading.gif b/WebRoot/static/images/loading.gif new file mode 100644 index 0000000..4bc8734 --- /dev/null +++ b/WebRoot/static/images/loading.gif diff --git a/resources/mybatis1/sunvote/CourseManagementMapper.xml b/resources/mybatis1/sunvote/CourseManagementMapper.xml index 1c657bb..f917867 100644 --- a/resources/mybatis1/sunvote/CourseManagementMapper.xml +++ b/resources/mybatis1/sunvote/CourseManagementMapper.xml @@ -15,6 +15,8 @@ START_DATE, END_DATE, REMARK, + GRADE_ID, + TERM_ID, ID @@ -26,6 +28,8 @@ #{START_DATE}, #{END_DATE}, #{REMARK}, + #{GRADE_ID}, + #{TERM_ID}, #{ID} @@ -39,6 +43,8 @@ SUBJECT_ID, START_DATE, END_DATE, + GRADE_ID, + TERM_ID, REMARK ) values ( #{TEACHER_ID}, @@ -46,6 +52,8 @@ #{SUBJECT_ID}, #{START_DATE}, #{END_DATE}, + #{GRADE_ID}, + #{TERM_ID}, #{REMARK} ) @@ -69,6 +77,8 @@ START_DATE = #{START_DATE}, END_DATE = #{END_DATE}, REMARK = #{REMARK}, + GRADE_ID = #{GRADE_ID}, + TERM_ID = #{TERM_ID}, ID = ${ID} where ID = #{ID} diff --git a/src/com/fh/controller/sunvote/Myelfun.java b/src/com/fh/controller/sunvote/Myelfun.java index 421cbda..bf7eb5d 100644 --- a/src/com/fh/controller/sunvote/Myelfun.java +++ b/src/com/fh/controller/sunvote/Myelfun.java @@ -8,10 +8,12 @@ import com.fh.service.sunvote.grade.impl.GradeService; import com.fh.service.sunvote.questiontype.QuestionTypeManager; import com.fh.service.sunvote.school.impl.SchoolService; import com.fh.service.sunvote.sclass.impl.SClassService; +import com.fh.service.sunvote.student.StudentManager; import com.fh.service.sunvote.subject.impl.SubjectService; import com.fh.service.sunvote.teacher.TeacherManager; import com.fh.service.sunvote.teacher.impl.TeacherService; import com.fh.service.sunvote.teachingmaterial.impl.TeachingMaterialService; +import com.fh.service.sunvote.term.TermManager; import com.fh.util.PageData; import com.fh.util.SpringBeanFactoryUtils; @@ -24,7 +26,7 @@ public class Myelfun { * @return * @throws Exception */ - public static String findSchoolName(int type) throws Exception{ + public static String findSchoolName(String type) throws Exception{ SchoolService schoolService = (SchoolService)SpringBeanFactoryUtils.getBean("schoolService"); PageData pageData = new PageData(); pageData.put("ID", type); @@ -42,7 +44,7 @@ public class Myelfun { * @return * @throws Exception */ - public static String findGradeName(int type) throws Exception{ + public static String findGradeName(String type) throws Exception{ GradeService gradeService = (GradeService)SpringBeanFactoryUtils.getBean("gradeService"); PageData pageData = new PageData(); pageData.put("ID", type); @@ -60,7 +62,7 @@ public class Myelfun { * @return * @throws Exception */ - public static String findClassTypeName(int type) throws Exception{ + public static String findClassTypeName(String type) throws Exception{ ClassTypeService classTypeService = (ClassTypeService)SpringBeanFactoryUtils.getBean("classtypeService"); PageData pageData = new PageData(); pageData.put("ID", type); @@ -78,7 +80,7 @@ public class Myelfun { * @return * @throws Exception */ - public static String findSubjectEName(int type) throws Exception{ + public static String findSubjectEName(String type) throws Exception{ SubjectService subjectService = (SubjectService)SpringBeanFactoryUtils.getBean("subjectService"); PageData pageData = new PageData(); pageData.put("ID", type); @@ -96,7 +98,7 @@ public class Myelfun { * @return * @throws Exception */ - public static String findSubjectCName(int type) throws Exception{ + public static String findSubjectCName(String type) throws Exception{ SubjectService subjectService = (SubjectService)SpringBeanFactoryUtils.getBean("subjectService"); PageData pageData = new PageData(); pageData.put("ID", type); @@ -114,7 +116,7 @@ public class Myelfun { * @return * @throws Exception */ - public static String findBasestationName(int type) throws Exception{ + public static String findBasestationName(String type) throws Exception{ BasestationService basestationService = (BasestationService)SpringBeanFactoryUtils.getBean("basestationService"); PageData pageData = new PageData(); pageData.put("ID", type); @@ -132,7 +134,7 @@ public class Myelfun { * @return * @throws Exception */ - public static String findTeacherName(int id) throws Exception { + public static String findTeacherName(String id) throws Exception { TeacherService teacherService = (TeacherService)SpringBeanFactoryUtils.getBean("teacherService"); PageData pageData = new PageData(); pageData.put("ID", id); @@ -150,7 +152,7 @@ public class Myelfun { * @return * @throws Exception */ - public static String findClassName(int id) throws Exception { + public static String findClassName(String id) throws Exception { SClassService sclassService = (SClassService)SpringBeanFactoryUtils.getBean("sclassService"); PageData pageData = new PageData(); pageData.put("ID", id); @@ -163,6 +165,42 @@ public class Myelfun { } /** + * 根据ID学生 + * @param id + * @return + * @throws Exception + */ + public static String findStudentName(String id) throws Exception { + StudentManager studentService = (StudentManager)SpringBeanFactoryUtils.getBean("studentService"); + PageData pageData = new PageData(); + pageData.put("ID", id); + pageData = studentService.findById(pageData); + if(pageData != null){ + return pageData.getString("NAME"); + }else{ + return "" ; + } + } + + /** + * 根据学期名称 + * @param id + * @return + * @throws Exception + */ + public static String findTermName(String id) throws Exception { + TermManager termService = (TermManager)SpringBeanFactoryUtils.getBean("termService"); + PageData pageData = new PageData(); + pageData.put("TERM_ID", id); + pageData = termService.findById(pageData); + if(pageData != null){ + return pageData.getString("NAME"); + }else{ + return "" ; + } + } + + /** * 根据ID班级名称 * @param id * @return diff --git a/src/com/fh/controller/sunvote/classroster/ClassRosterController.java b/src/com/fh/controller/sunvote/classroster/ClassRosterController.java index 539a504..9d96d4e 100644 --- a/src/com/fh/controller/sunvote/classroster/ClassRosterController.java +++ b/src/com/fh/controller/sunvote/classroster/ClassRosterController.java @@ -8,7 +8,9 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.annotation.Resource; + import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.stereotype.Controller; import org.springframework.web.bind.WebDataBinder; @@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; + import com.fh.controller.base.BaseController; import com.fh.entity.Page; import com.fh.util.AppUtil; @@ -24,6 +27,9 @@ import com.fh.util.PageData; import com.fh.util.Jurisdiction; import com.fh.util.Tools; import com.fh.service.sunvote.classroster.ClassRosterManager; +import com.fh.service.sunvote.sclass.SClassManager; +import com.fh.service.sunvote.student.StudentManager; +import com.fh.service.sunvote.term.TermManager; /** * 说明：班级名册 @@ -37,6 +43,15 @@ public class ClassRosterController extends BaseController { @Resource(name="classrosterService") private ClassRosterManager classrosterService; + @Resource(name="sclassService") + private SClassManager sclassService; + + @Resource(name="termService") + private TermManager termService; + + @Resource(name="studentService") + private StudentManager studentService; + /**保存 * @param * @throws Exception @@ -103,6 +118,7 @@ public class ClassRosterController extends BaseController { pd.put("keywords", keywords.trim()); } page.setPd(pd); + List varList = classrosterService.list(page); //列出ClassRoster列表 mv.setViewName("sunvote/classroster/classroster_list"); mv.addObject("varList", varList);