更新到服务器

孙向锦
1 parent a51b67cf
Showing 9 changed files with 110 additions and 30 deletions
WebRoot/WEB-INF/jsp/sunvote/classroster/classroster_list.jsp
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
WebRoot/WEB-INF/tld/elfun.tld
WebRoot/static/images/analysis.png
WebRoot/static/images/loading.gif
resources/mybatis1/sunvote/CourseManagementMapper.xml
src/com/fh/controller/sunvote/Myelfun.java
src/com/fh/controller/sunvote/classroster/ClassRosterController.java
 <%@ 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 @@
 												<label class="pos-rel"><input type='checkbox' name='ids' value="${var.CLASSROSTER_ID}" class="ace" /><span class="lbl"></span></label>
 											</td>
 											<td class='center' style="width: 30px;">${vs.index+1}</td>
-											<td class='center'>${var.SCLASS_ID}</td>
-											<td class='center'>${var.STUDENT_ID}</td>
-											<td class='center'>${var.TEAMID}</td>
+											<td class='center'>${myelfun:findClassName(var.SCLASS_ID)}</td>
+											<td class='center'>${myelfun:findStudentName(var.STUDENT_ID)}</td>
+											<td class='center'>${myelfun:findTermName(var.TEAMID)}</td>
 											<td class="center">
 												<c:if test="${QX.edit != 1 && QX.del != 1 }">
 												<span class="label label-large label-grey arrowed-in-right arrowed-in"><i class="ace-icon fa fa-lock" title="无权限"></i></span>
-												</c:if>
+												</c:if>	
 												<div class="hidden-sm hidden-xs btn-group">
 													<c:if test="${QX.edit == 1 }">
 													<a class="btn btn-xs btn-success" title="编辑" onclick="edit('${var.CLASSROSTER_ID}');">
@@ -70,9 +70,10 @@
 									<th class="center">老师</th>
 									<th class="center">班级</th>
 									<th class="center">科目</th>
-									<th class="center">开始时间</th>
+									<th class="center">学期</th>
+									<!-- <th class="center">开始时间</th>
 									<th class="center">结束时间</th>
-									<th class="center">备注</th>
+									<th class="center">备注</th> -->
 									<th class="center">操作</th>
 								</tr>
 							</thead>
@@ -91,9 +92,7 @@
 											<td class='center'>${myelfun:findTeacherName(var.TEACHER_ID)}</td>
 											<td class='center'>${myelfun:findClassName(var.CLASS_ID)}</td>
 											<td class='center'>${myelfun:findSubjectCName(var.SUBJECT_ID)}</td>
-											<td class='center'>${var.START_DATE}</td>
-											<td class='center'>${var.END_DATE}</td>
-											<td class='center'>${var.REMARK}</td>
+											<td class='center'>${myelfun:findTermName(var.TERM_ID)}</td>
 											<td class="center">
 												<c:if test="${QX.edit != 1 && QX.del != 1 }">
 												<span class="label label-large label-grey arrowed-in-right arrowed-in"><i class="ace-icon fa fa-lock" title="无权限"></i></span>
@@ -92,9 +92,11 @@
 				</div>
 			</div>
 		</div>
-		<div class="class">
-			<p>${pd.TEACHER[0].GRADE_NAME}${pd.TEACHER[0].SUBJECT_NAME} <span>${pd.TEACHER[0].CLASS_NAME}</span></p>
-		</div>
+		<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
+			<div class="class">
+				<p>${var.GRADE_NAME}${var.SUBJECT_NAME} <span>${var.CLASS_NAME}</span></p>
+			</div>
+		</c:forEach>
 		<div class="test">测验</div>
 		<div class="analysis">分析</div>
 	</div>
@@ -11,7 +11,7 @@
       <description>根据ID 获取学校名称</description><!-- 对该标签的说明 -->  
       <name>findSchoolName</name><!-- 定义标签名，放在短标签之后 -->  
       <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径  -->  
-      <function-signature>java.lang.String findSchoolName(int)</function-signature><!-- 标签处理域值的具体的类方法 -->  
+      <function-signature>java.lang.String findSchoolName(java.lang.String)</function-signature><!-- 标签处理域值的具体的类方法 -->  
       <example>${myelfun:findSchoolName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
    </function>
@@ -20,7 +20,7 @@
       <description>根据ID获取年级名称</description><!-- 对该标签的说明 -->  
       <name>findGradeName</name><!-- 定义标签名，放在短标签之后 -->  
       <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径  -->  
-      <function-signature>java.lang.String findGradeName(int)</function-signature><!-- 标签处理域值的具体的类方法 -->  
+      <function-signature>java.lang.String findGradeName(java.lang.String)</function-signature><!-- 标签处理域值的具体的类方法 -->  
       <example>${myelfun:findGradeName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
    </function>
@@ -28,7 +28,7 @@
       <description>根据ID获取班级类型名称</description><!-- 对该标签的说明 -->  
       <name>findClassTypeName</name><!-- 定义标签名，放在短标签之后 -->  
       <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径  -->  
-      <function-signature>java.lang.String findClassTypeName(int)</function-signature><!-- 标签处理域值的具体的类方法 -->  
+      <function-signature>java.lang.String findClassTypeName(java.lang.String)</function-signature><!-- 标签处理域值的具体的类方法 -->  
       <example>${myelfun:findClassTypeName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
    </function>
@@ -36,7 +36,7 @@
       <description>获取科目英文名称</description><!-- 对该标签的说明 -->  
       <name>findSubjectEName</name><!-- 定义标签名，放在短标签之后 -->  
       <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径  -->  
-      <function-signature>java.lang.String findSubjectEName(int)</function-signature><!-- 标签处理域值的具体的类方法 -->  
+      <function-signature>java.lang.String findSubjectEName(java.lang.String)</function-signature><!-- 标签处理域值的具体的类方法 -->  
       <example>${myelfun:findSubjectEName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
    </function>
@@ -44,7 +44,7 @@
       <description>根据ID获取科目中文名称</description><!-- 对该标签的说明 -->  
       <name>findSubjectCName</name><!-- 定义标签名，放在短标签之后 -->  
       <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径  -->  
-      <function-signature>java.lang.String findSubjectCName(int)</function-signature><!-- 标签处理域值的具体的类方法 -->  
+      <function-signature>java.lang.String findSubjectCName(java.lang.String)</function-signature><!-- 标签处理域值的具体的类方法 -->  
       <example>${myelfun:findSubjectCName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
    </function>
@@ -52,7 +52,7 @@
       <description>根据ID查找基站名称</description><!-- 对该标签的说明 -->  
       <name>findBasestationName</name><!-- 定义标签名，放在短标签之后 -->  
       <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径  -->  
-      <function-signature>java.lang.String findBasestationName(int)</function-signature><!-- 标签处理域值的具体的类方法 -->  
+      <function-signature>java.lang.String findBasestationName(java.lang.String)</function-signature><!-- 标签处理域值的具体的类方法 -->  
       <example>${myelfun:findBasestationName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
    </function>
@@ -60,7 +60,7 @@
       <description>根据ID查找老师姓名</description><!-- 对该标签的说明 -->  
       <name>findTeacherName</name><!-- 定义标签名，放在短标签之后 -->  
       <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径  -->  
-      <function-signature>java.lang.String findTeacherName(int)</function-signature><!-- 标签处理域值的具体的类方法 -->  
+      <function-signature>java.lang.String findTeacherName(java.lang.String)</function-signature><!-- 标签处理域值的具体的类方法 -->  
       <example>${myelfun:findTeacherName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
    </function>
@@ -68,15 +68,29 @@
       <description>根据ID查找班级姓名</description><!-- 对该标签的说明 -->  
       <name>findClassName</name><!-- 定义标签名，放在短标签之后 -->  
       <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径  -->  
-      <function-signature>java.lang.String findClassName(int)</function-signature><!-- 标签处理域值的具体的类方法 -->  
+      <function-signature>java.lang.String findClassName(java.lang.String)</function-signature><!-- 标签处理域值的具体的类方法 -->  
       <example>${myelfun:findClassName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
    </function>
+   <function>  
+      <description>根据ID查找学生姓名</description><!-- 对该标签的说明 -->  
+      <name>findStudentName</name><!-- 定义标签名，放在短标签之后 -->  
+      <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径  -->  
+      <function-signature>java.lang.String findStudentName(java.lang.String)</function-signature><!-- 标签处理域值的具体的类方法 -->  
+      <example>${myelfun:findStudentName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
+   </function>
+   <function>  
+      <description>根据ID查找学期名称</description><!-- 对该标签的说明 -->  
+      <name>findTermName</name><!-- 定义标签名，放在短标签之后 -->  
+      <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径  -->  
+      <function-signature>java.lang.String findTermName(java.lang.String)</function-signature><!-- 标签处理域值的具体的类方法 -->  
+      <example>${myelfun:findTermName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
+   </function>
    <function>  
       <description>根据ID查找教材名称</description><!-- 对该标签的说明 -->  
       <name>findTeachingmaterialName</name><!-- 定义标签名，放在短标签之后 -->  
       <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径  -->  
-      <function-signature>java.lang.String findTeachingmaterialName(int)</function-signature><!-- 标签处理域值的具体的类方法 -->  
+      <function-signature>java.lang.String findTeachingmaterialName(String)</function-signature><!-- 标签处理域值的具体的类方法 -->  
       <example>${myelfun:findTeachingmaterialName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
    </function>
@@ -84,7 +98,7 @@
       <description>根据ID查找题目类型</description><!-- 对该标签的说明 -->  
       <name>findQuestionTypeName</name><!-- 定义标签名，放在短标签之后 -->  
       <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径  -->  
-      <function-signature>java.lang.String findQuestionTypeName(int)</function-signature><!-- 标签处理域值的具体的类方法 -->  
+      <function-signature>java.lang.String findQuestionTypeName(String)</function-signature><!-- 标签处理域值的具体的类方法 -->  
       <example>${myelfun:findQuestionTypeName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
    </function>
@@ -15,6 +15,8 @@
 		START_DATE,	
 		END_DATE,	
 		REMARK,	
+		GRADE_ID,
+		TERM_ID,
 		ID
 	</sql>
@@ -26,6 +28,8 @@
 		#{START_DATE},	
 		#{END_DATE},	
 		#{REMARK},	
+		#{GRADE_ID},	
+		#{TERM_ID},	
 		#{ID}
 	</sql>
@@ -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}
 		)
 	</insert>
@@ -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}
@@ -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
@@ -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<PageData>	varList = classrosterService.list(page);	//列出ClassRoster列表
 		mv.setViewName("sunvote/classroster/classroster_list");
 		mv.addObject("varList", varList);