diff --git a/WebRoot/WEB-INF/jsp/sunvote/chapter/chapter_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/chapter/chapter_edit.jsp index 6d8a7d7..525acab 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/chapter/chapter_edit.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/chapter/chapter_edit.jsp @@ -45,7 +45,13 @@ 所属教材: - + + <%-- --%> + diff --git a/WebRoot/WEB-INF/jsp/sunvote/chapter/chapter_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/chapter/chapter_list.jsp index 1c141f7..b4c5732 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/chapter/chapter_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/chapter/chapter_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() + "://" @@ -88,7 +89,7 @@ ${var.NAME} ${var.CDESCRIPTION} ${var.REMARK} - ${var.TEACHINGMATERIAL_ID} + ${myelfun:findTeachingmaterialName(var.TEACHINGMATERIAL_ID)} diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit.jsp index dc7bee9..9aca037 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit.jsp @@ -33,15 +33,36 @@ - + --%> + + - - + + --%> + + - + --%> + + diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list.jsp index e0082ed..416e270 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_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() + "://" @@ -67,7 +68,7 @@ - + @@ -87,9 +88,9 @@ - - - + + + diff --git a/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_edit.jsp index 21e711f..f16e562 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_edit.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_edit.jsp @@ -41,11 +41,22 @@ - + + <%-- --%> - + --%> + diff --git a/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp index b056906..9f5996b 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp @@ -88,8 +88,8 @@ - - + +
老师: + <%--
班级ID:班级: + <%--
科目: + <%--
开始时间: 序号 老师班级ID班级 科目 开始时间 结束时间 ${vs.index+1}${var.TEACHER_ID}${var.CLASS_ID}${var.SUBJECT_ID}${myelfun:findTeacherName(var.TEACHER_ID)}${myelfun:findClassName(var.CLASS_ID)}${myelfun:findSubjectCName(var.SUBJECT_ID)} ${var.START_DATE} ${var.END_DATE} ${var.REMARK}
是否正常: + +
工作模式: + <%--
生产时间:${vs.index+1} ${var.NO} ${var.SN}${var.IS_OK}${var.WORK_MODE}${var.IS_OK == 1 ? "正常":"损坏"}${var.WORK_MODE == 1 ? "RF模式" : "433模式"} ${var.PRODUCT_DATE} diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit.jsp index 88b6faa..ff94298 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit.jsp @@ -33,15 +33,37 @@ - + - + --%> + + - + --%> + + @@ -53,7 +75,14 @@ - + --%> + + - - - + + + - +
所属学校: + <%-- --%> + + +
所属年级: + <%--
班级类型: + <%--
班级名称:
班级基站: + <%--
diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list.jsp index cc1c831..ab1af37 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list.jsp @@ -1,6 +1,8 @@ <%@ 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() + "://" @@ -87,12 +89,12 @@ ${vs.index+1}${var.SCHOOL_ID}${var.GRADE_ID}${var.CLASS_TYPE}${myelfun:findSchoolName(var.SCHOOL_ID)}${myelfun:findGradeName(var.GRADE_ID)}${myelfun:findClassTypeName(var.CLASS_TYPE)} ${var.CLASS_NAME} ${var.CLASS_CODE}${var.BASESTATION_ID}${myelfun:findBasestationName(var.BASESTATION_ID)} diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit.jsp index ed2bb23..5ddacfd 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit.jsp @@ -33,7 +33,14 @@ - + + <%-- --%> @@ -57,11 +64,17 @@ - + - + + <%-- --%> diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list.jsp index a00b980..5c6495b 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_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() + "://" @@ -72,7 +73,6 @@ - @@ -91,14 +91,13 @@ - + - - + - + + <%-- --%> - + + <%-- --%> diff --git a/WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_list.jsp index bc637c7..816ef28 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_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() + "://" @@ -87,8 +88,8 @@ - - + +
所在学校: + +
姓名:
密码:
性别: + +
科目列表:座机电话 证件号 账号密码 性别 科目列表 教师卡编号 ${vs.index+1}${var.SCHOOL_ID}${myelfun:findSchoolName(var.SCHOOL_ID)} ${var.NAME} ${var.PHONE} ${var.SEAT_PHONE} ${var.CARD_NO} ${var.ACCOUT}${var.PASSWORD}${var.SEX}${var.SEX == 1? "男":"女"} ${var.SUBJECT_IDS} ${var.KEYPAD_ID} diff --git a/WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_edit.jsp index 65c0252..b92f82e 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_edit.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_edit.jsp @@ -2,6 +2,7 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> + <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; @@ -37,11 +38,25 @@
所属科目: + +
所属年级: + +
教材版本号: ${vs.index+1} ${var.NAME}${var.SUBJECT_ID}${var.GRADE_ID}${myelfun:findSubjectCName(var.SUBJECT_ID)}${myelfun:findGradeName(var.GRADE_ID)} ${var.VERSION_CODE} ${var.VERSION_NAME} diff --git a/resources/mybatis1/sunvote/TeachingMaterialMapper.xml b/resources/mybatis1/sunvote/TeachingMaterialMapper.xml index 9d2fd09..7a408b5 100644 --- a/resources/mybatis1/sunvote/TeachingMaterialMapper.xml +++ b/resources/mybatis1/sunvote/TeachingMaterialMapper.xml @@ -32,9 +32,17 @@ insert into ( - + NAME, + SUBJECT_ID, + GRADE_ID, + VERSION_CODE, + VERSION_NAME ) values ( - + #{NAME}, + #{SUBJECT_ID}, + #{GRADE_ID}, + #{VERSION_CODE}, + #{VERSION_NAME} ) @@ -56,7 +64,7 @@ GRADE_ID = #{GRADE_ID}, VERSION_CODE = #{VERSION_CODE}, VERSION_NAME = #{VERSION_NAME}, - ID = ID + ID = #{ID} where ID = #{ID} diff --git a/resources/spring/ApplicationContext-main.xml b/resources/spring/ApplicationContext-main.xml index 703f0a3..3f3881e 100644 --- a/resources/spring/ApplicationContext-main.xml +++ b/resources/spring/ApplicationContext-main.xml @@ -34,4 +34,6 @@ + + diff --git a/src/com/fh/controller/api/ApiServer.java b/src/com/fh/controller/api/ApiServer.java index 25c72af..6b59efb 100644 --- a/src/com/fh/controller/api/ApiServer.java +++ b/src/com/fh/controller/api/ApiServer.java @@ -28,14 +28,6 @@ public class ApiServer extends BaseController { private KeypadManager keypadService; - @RequestMapping(value="/*" ,produces="application/json;charset=UTF-8") - @ResponseBody - public Object Default() throws Exception{ - ResponseGson respone = new ResponseGson(); - respone.setPathError(); - return respone.toJson(); - } - @RequestMapping(value="/school" ,produces="application/json;charset=UTF-8") @ResponseBody public Object schoolDefault() throws Exception{ diff --git a/src/com/fh/controller/sunvote/chapter/ChapterController.java b/src/com/fh/controller/sunvote/chapter/ChapterController.java index 5012042..daa7475 100644 --- a/src/com/fh/controller/sunvote/chapter/ChapterController.java +++ b/src/com/fh/controller/sunvote/chapter/ChapterController.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,7 @@ import com.fh.util.PageData; import com.fh.util.Jurisdiction; import com.fh.util.Tools; import com.fh.service.sunvote.chapter.ChapterManager; +import com.fh.service.sunvote.teachingmaterial.TeachingMaterialManager; /** * 说明：章节管理 @@ -38,6 +42,9 @@ public class ChapterController extends BaseController { @Resource(name="chapterService") private ChapterManager chapterService; + @Resource(name="teachingmaterialService") + private TeachingMaterialManager teachingmaterialService; + /**保存 * @param * @throws Exception @@ -121,6 +128,10 @@ public class ChapterController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); mv.setViewName("sunvote/chapter/chapter_edit"); + + List teachings = teachingmaterialService.listAll(pd); + mv.addObject("teachings", teachings); + mv.addObject("msg", "save"); mv.addObject("pd", pd); return mv; @@ -137,6 +148,10 @@ public class ChapterController extends BaseController { pd = this.getPageData(); pd = chapterService.findById(pd); //根据ID读取 mv.setViewName("sunvote/chapter/chapter_edit"); + + List teachings = teachingmaterialService.listAll(pd); + mv.addObject("teachings", teachings); + mv.addObject("msg", "edit"); mv.addObject("pd", pd); return mv; diff --git a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java index 0c8853f..e516544 100644 --- a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java +++ b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.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.coursemanagement.CourseManagementManager; +import com.fh.service.sunvote.sclass.SClassManager; +import com.fh.service.sunvote.subject.SubjectManager; +import com.fh.service.sunvote.teacher.TeacherManager; /** * 说明：任课管理 @@ -38,6 +44,15 @@ public class CourseManagementController extends BaseController { @Resource(name="coursemanagementService") private CourseManagementManager coursemanagementService; + @Resource(name="teacherService") + private TeacherManager teacherService; + + @Resource(name="sclassService") + private SClassManager sclassService; + + @Resource(name="subjectService") + private SubjectManager subjectService; + /**保存 * @param * @throws Exception @@ -121,6 +136,14 @@ public class CourseManagementController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); mv.setViewName("sunvote/coursemanagement/coursemanagement_edit"); + + List teachers = teacherService.listAll(pd); + mv.addObject("teachers",teachers); + List classs = sclassService.listAll(pd); + mv.addObject("classs",classs); + List subjects = subjectService.listAll(pd); + mv.addObject("subjects", subjects); + mv.addObject("msg", "save"); mv.addObject("pd", pd); return mv; @@ -137,6 +160,13 @@ public class CourseManagementController extends BaseController { pd = this.getPageData(); pd = coursemanagementService.findById(pd); //根据ID读取 mv.setViewName("sunvote/coursemanagement/coursemanagement_edit"); + List teachers = teacherService.listAll(pd); + mv.addObject("teachers",teachers); + List classs = sclassService.listAll(pd); + mv.addObject("classs",classs); + List subjects = subjectService.listAll(pd); + mv.addObject("subjects", subjects); + mv.addObject("msg", "edit"); mv.addObject("pd", pd); return mv; diff --git a/src/com/fh/controller/sunvote/sclass/SClassController.java b/src/com/fh/controller/sunvote/sclass/SClassController.java index acedfb5..8adc769 100644 --- a/src/com/fh/controller/sunvote/sclass/SClassController.java +++ b/src/com/fh/controller/sunvote/sclass/SClassController.java @@ -125,8 +125,8 @@ public class SClassController extends BaseController { pd.put("keywords", keywords.trim()); } page.setPd(pd); - List varList = sclassService.list(page); //列出SClass列表 mv.setViewName("sunvote/sclass/sclass_list"); + List varList = sclassService.list(page); //列出SClass列表 mv.addObject("varList", varList); mv.addObject("pd", pd); mv.addObject("QX",Jurisdiction.getHC()); //按钮权限 @@ -143,6 +143,14 @@ public class SClassController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); mv.setViewName("sunvote/sclass/sclass_edit"); + List schools = schoolService.listAll(pd); + mv.addObject("schools",schools); + List basestations = basestationService.listAll(pd); + mv.addObject("basestations",basestations); + List grades = gradeService.listAll(pd); + mv.addObject("grades", grades); + List classTypes = classtypeService.listAll(pd); + mv.addObject("classTypes", classTypes); mv.addObject("msg", "save"); mv.addObject("pd", pd); return mv; @@ -159,6 +167,14 @@ public class SClassController extends BaseController { pd = this.getPageData(); pd = sclassService.findById(pd); //根据ID读取 mv.setViewName("sunvote/sclass/sclass_edit"); + List schools = schoolService.listAll(pd); + mv.addObject("schools",schools); + List basestations = basestationService.listAll(pd); + mv.addObject("basestations",basestations); + List grades = gradeService.listAll(pd); + mv.addObject("grades", grades); + List classTypes = classtypeService.listAll(pd); + mv.addObject("classTypes", classTypes); mv.addObject("msg", "edit"); mv.addObject("pd", pd); return mv; diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java index 879770a..11e77da 100644 --- a/src/com/fh/controller/sunvote/teacher/TeacherController.java +++ b/src/com/fh/controller/sunvote/teacher/TeacherController.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; @@ -23,6 +26,7 @@ import com.fh.util.ObjectExcelView; import com.fh.util.PageData; import com.fh.util.Jurisdiction; import com.fh.util.Tools; +import com.fh.service.sunvote.school.SchoolManager; import com.fh.service.sunvote.teacher.TeacherManager; /** @@ -38,6 +42,9 @@ public class TeacherController extends BaseController { @Resource(name="teacherService") private TeacherManager teacherService; + @Resource(name="schoolService") + private SchoolManager schoolService; + /**保存 * @param * @throws Exception @@ -121,6 +128,10 @@ public class TeacherController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); mv.setViewName("sunvote/teacher/teacher_edit"); + + List schools = schoolService.listAll(pd); + mv.addObject("schools",schools); + mv.addObject("msg", "save"); mv.addObject("pd", pd); return mv; @@ -137,6 +148,8 @@ public class TeacherController extends BaseController { pd = this.getPageData(); pd = teacherService.findById(pd); //根据ID读取 mv.setViewName("sunvote/teacher/teacher_edit"); + List schools = schoolService.listAll(pd); + mv.addObject("schools",schools); mv.addObject("msg", "edit"); mv.addObject("pd", pd); return mv; diff --git a/src/com/fh/controller/sunvote/teachingmaterial/TeachingMaterialController.java b/src/com/fh/controller/sunvote/teachingmaterial/TeachingMaterialController.java index 8c6bd83..bb2fc08 100644 --- a/src/com/fh/controller/sunvote/teachingmaterial/TeachingMaterialController.java +++ b/src/com/fh/controller/sunvote/teachingmaterial/TeachingMaterialController.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; @@ -23,6 +26,8 @@ import com.fh.util.ObjectExcelView; import com.fh.util.PageData; import com.fh.util.Jurisdiction; import com.fh.util.Tools; +import com.fh.service.sunvote.grade.GradeManager; +import com.fh.service.sunvote.subject.SubjectManager; import com.fh.service.sunvote.teachingmaterial.TeachingMaterialManager; /** @@ -38,6 +43,11 @@ public class TeachingMaterialController extends BaseController { @Resource(name="teachingmaterialService") private TeachingMaterialManager teachingmaterialService; + @Resource(name="gradeService") + private GradeManager gradeService; + + @Resource(name="subjectService") + private SubjectManager subjectService; /**保存 * @param * @throws Exception @@ -121,6 +131,13 @@ public class TeachingMaterialController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); mv.setViewName("sunvote/teachingmaterial/teachingmaterial_edit"); + + List grades = gradeService.listAll(pd); + mv.addObject("grades", grades); + + List subjects = subjectService.listAll(pd); + mv.addObject("subjects", subjects); + mv.addObject("msg", "save"); mv.addObject("pd", pd); return mv; @@ -137,6 +154,10 @@ public class TeachingMaterialController extends BaseController { pd = this.getPageData(); pd = teachingmaterialService.findById(pd); //根据ID读取 mv.setViewName("sunvote/teachingmaterial/teachingmaterial_edit"); + List grades = gradeService.listAll(pd); + mv.addObject("grades", grades); + List subjects = subjectService.listAll(pd); + mv.addObject("subjects", subjects); mv.addObject("msg", "edit"); mv.addObject("pd", pd); return mv;