Commit a1975f10a0c678db4713c654b821a8cf940c83f0
1 parent
6c3110ae
添加科目 年级信息
Showing
1 changed file
with
11 additions
and
0 deletions
src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java
@@ -8,7 +8,9 @@ import java.util.Date; | @@ -8,7 +8,9 @@ import java.util.Date; | ||
8 | import java.util.HashMap; | 8 | import java.util.HashMap; |
9 | import java.util.List; | 9 | import java.util.List; |
10 | import java.util.Map; | 10 | import java.util.Map; |
11 | + | ||
11 | import javax.annotation.Resource; | 12 | import javax.annotation.Resource; |
13 | + | ||
12 | import org.springframework.beans.propertyeditors.CustomDateEditor; | 14 | import org.springframework.beans.propertyeditors.CustomDateEditor; |
13 | import org.springframework.stereotype.Controller; | 15 | import org.springframework.stereotype.Controller; |
14 | import org.springframework.web.bind.WebDataBinder; | 16 | import org.springframework.web.bind.WebDataBinder; |
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder; | @@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder; | ||
16 | import org.springframework.web.bind.annotation.RequestMapping; | 18 | import org.springframework.web.bind.annotation.RequestMapping; |
17 | import org.springframework.web.bind.annotation.ResponseBody; | 19 | import org.springframework.web.bind.annotation.ResponseBody; |
18 | import org.springframework.web.servlet.ModelAndView; | 20 | import org.springframework.web.servlet.ModelAndView; |
21 | + | ||
19 | import com.fh.controller.base.BaseController; | 22 | import com.fh.controller.base.BaseController; |
20 | import com.fh.entity.Page; | 23 | import com.fh.entity.Page; |
21 | import com.fh.util.AppUtil; | 24 | import com.fh.util.AppUtil; |
@@ -24,6 +27,7 @@ import com.fh.util.PageData; | @@ -24,6 +27,7 @@ import com.fh.util.PageData; | ||
24 | import com.fh.util.Jurisdiction; | 27 | import com.fh.util.Jurisdiction; |
25 | import com.fh.util.Tools; | 28 | import com.fh.util.Tools; |
26 | import com.fh.service.sunvote.pagetemplate.PageTemplateManager; | 29 | import com.fh.service.sunvote.pagetemplate.PageTemplateManager; |
30 | +import com.fh.service.sunvote.schoolgradesubject.SchoolGradeSubjectManager; | ||
27 | 31 | ||
28 | /** | 32 | /** |
29 | * 说明:试卷模板管理 | 33 | * 说明:试卷模板管理 |
@@ -38,6 +42,9 @@ public class PageTemplateController extends BaseController { | @@ -38,6 +42,9 @@ public class PageTemplateController extends BaseController { | ||
38 | @Resource(name="pagetemplateService") | 42 | @Resource(name="pagetemplateService") |
39 | private PageTemplateManager pagetemplateService; | 43 | private PageTemplateManager pagetemplateService; |
40 | 44 | ||
45 | + @Resource(name="schoolgradesubjectService") | ||
46 | + private SchoolGradeSubjectManager schoolgradesubjectService; | ||
47 | + | ||
41 | /**保存 | 48 | /**保存 |
42 | * | 49 | * |
43 | * 模板内容(数组) | 50 | * 模板内容(数组) |
@@ -136,7 +143,11 @@ public class PageTemplateController extends BaseController { | @@ -136,7 +143,11 @@ public class PageTemplateController extends BaseController { | ||
136 | page.setPd(pd); | 143 | page.setPd(pd); |
137 | List<PageData> varList = pagetemplateService.list(page); //列出PageTemplate列表 | 144 | List<PageData> varList = pagetemplateService.list(page); //列出PageTemplate列表 |
138 | mv.setViewName("sunvote/pagetemplate/pagetemplate_list2"); | 145 | mv.setViewName("sunvote/pagetemplate/pagetemplate_list2"); |
146 | + List<PageData> gradeList = schoolgradesubjectService.listAllGrade(pd); | ||
147 | + List<PageData> subjectList = schoolgradesubjectService.listAllSubject(pd); | ||
139 | mv.addObject("varList", varList); | 148 | mv.addObject("varList", varList); |
149 | + mv.addObject("gradeList", gradeList); | ||
150 | + mv.addObject("subjectList", subjectList); | ||
140 | mv.addObject("pd", pd); | 151 | mv.addObject("pd", pd); |
141 | mv.addObject("QX",Jurisdiction.getHC()); //按钮权限 | 152 | mv.addObject("QX",Jurisdiction.getHC()); //按钮权限 |
142 | return mv; | 153 | return mv; |