diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp index 7e6b725..a8bc3c1 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp @@ -60,8 +60,8 @@

@@ -203,7 +206,8 @@
- + @@ -214,10 +218,7 @@
-
@@ -227,13 +228,11 @@
+
@@ -260,6 +259,48 @@ //} } + function getSubjects(school_id){ + var grade_id = $("#grade_id").val(); + var path = "../subject/listdata?school_id=" + school_id + "&grade_id=" + grade_id ; + $("#subject_id").empty(); + if(grade != '-1'){ + $.ajax({ + type: 'post', + url : path, + async: true, + dataType: "json", + success: function(data) { + for(var key in data){ + $("#subject_id").append(""); + } + getTemplates(); + } + }); + } + } + + function getTemplates(){ + var grade_id = $("#grade_id").val(); + var subject_id = $("#subject_id").val(); + var school_id = schoolId; + if(grade != '-1' && subject_id != ''){ + var path = "../pagetemplate/listdata?school_id=" + school_id + "&grade_id=" + grade_id + "&subject_id=" + subject_id ; + $("#TEMPLATE_ID").empty(); + $("#TEMPLATE_ID").append(""); + $.ajax({ + type: 'post', + url : path, + async: true, + dataType: "json", + success: function(data) { + for(var key in data){ + $("#TEMPLATE_ID").append(""); + } + } + }); + } + } + function school(schoolId){ var path = "../school/goEdit2.do?ID=" + schoolId ; $("#mainFrame").attr('src',path); @@ -281,6 +322,12 @@ window.top.loading.show(); } + function monitor(school_id){ + var path = "../headmaster/list.do?school_id=" + school_id ; + $("#mainFrame").attr('src',path); + window.top.loading.show(); + } + function coursemanager(school_id){ var path = "../coursemanagement/listcs.do?school_id=" + school_id ; //if($("#mainFrame").attr('src') != (path)){ diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp index 6dd554d..6d2e096 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp @@ -32,6 +32,7 @@
+
diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp index aa66c77..1ab487f 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp @@ -28,7 +28,7 @@ - +
@@ -69,7 +69,7 @@
- + @@ -120,11 +120,15 @@ window.top.loading.remove(); }); + function tosearch(){ + $("#Form").submit(); + } + //新增 function add(){ window.top.modal.init({ 'title':'分配任课', - 'url':'<%=basePath%>coursemanagement/goAdd2.do', + 'url':'<%=basePath%>coursemanagement/goAdd2.do?school_id=${pd.SCHOOL_ID}', func:function() { tosearch(); } @@ -132,6 +136,39 @@ window.top.modal.show(); } + function deleteAll(){ + window.top.remove.init({"title":"移除任课","ok":"确定","cancel":"取消","func":function(success){ + if(success){ + var str = ''; + for(var i=0;i < document.getElementsByName('ids').length;i++){ + if(document.getElementsByName('ids')[i].checked){ + if(str=='') str += document.getElementsByName('ids')[i].value; + else str += ',' + document.getElementsByName('ids')[i].value; + } + } + if(str==''){ + + }else{ + $.ajax({ + type: "POST", + url: '<%=basePath%>coursemanagement/deleteAll.do?tm='+new Date().getTime(), + data: {DATA_IDS:str}, + dataType:'json', + //beforeSend: validateData, + cache: false, + success: function(data){ + tosearch(); + } + }); + } + } + else{ + console.log("false"); + } + }}); + window.top.remove.show(); + } + diff --git a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp index 0216c70..8ff55c3 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp @@ -30,21 +30,20 @@
- +
${vs.index+1}${vs.index+1} ${var.NAME} ${var.CLASS_NAME} ${var.CNAME}
- - - - - - - - - - + + + - + @@ -63,7 +65,7 @@ + value="${var.SCHOOLGRADESUBJECT_ID}" />${vs.index+1} @@ -116,10 +118,15 @@ window.top.loading.remove(); }); + //检索 + function tosearch(){ + $("#Form").submit(); + } + function add(){ window.top.modal.init({ - 'title':'添加班级', - 'url':'<%=basePath%>grade/goAdd2.do', + 'title':'添加年级', + 'url':'<%=basePath%>grade/goAdd2.do?school_id=${pd.SCHOOL_ID}', func:function() { tosearch(); } @@ -152,7 +159,7 @@ }else{ $.ajax({ type: "POST", - url: '<%=basePath%>grade/deleteAll.do?tm='+new Date().getTime(), + url: '<%=basePath%>grade/deleteAll2.do?tm='+new Date().getTime(), data: {DATA_IDS:str}, dataType:'json', //beforeSend: validateData, diff --git a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list.jsp index 0d1dbd3..335dc2f 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list.jsp @@ -1,4 +1,5 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-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"%> <% @@ -9,206 +10,132 @@ %> +中天电子-教育管理系统 - - - -<%@ include file="../../system/index/top.jsp"%> - - + + + +
年级名称:
年级描述:
备注:科目名称: + +
保存 @@ -80,34 +79,14 @@ $(top.hangge()); //保存 function save(){ - if($("#NAME").val()==""){ - $("#NAME").tips({ + if($("#GRADE_ID").val()==""){ + $("#GRADE_ID").tips({ side:3, msg:'请输入年级名称', bg:'#AE81FF', time:2 }); - $("#NAME").focus(); - return false; - } - if($("#DESC").val()==""){ - $("#DESC").tips({ - side:3, - msg:'请输入年级描述', - bg:'#AE81FF', - time:2 - }); - $("#DESC").focus(); - return false; - } - if($("#REMARK").val()==""){ - $("#REMARK").tips({ - side:3, - msg:'请输入备注', - bg:'#AE81FF', - time:2 - }); - $("#REMARK").focus(); + $("#GRADE_ID").focus(); return false; } $("#Form").submit(); diff --git a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp index 25946a2..81911b2 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp @@ -25,6 +25,8 @@ + +
@@ -42,7 +44,7 @@
序号序号 年级名称 年级描述
${vs.index+1} ${var.NAME} ${var.DESC}
+
+ - -
- -
-
-
-
-
- - - - +
+ + + + + + + + + + + + + + + + + + + - + + + + + + + + - - - - - - - - -
+ 序号姓名用户名密码所在学校权限联系电话操作
-
- - - - +
${vs.index+1}${var.NAME}${var.USERNAME}${var.PASSWORD}${var.SCHOOL_ID}${var.PERMISSION}${var.PHONE} + - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - 序号姓名用户名密码所在学校权限联系电话操作
- - ${vs.index+1}${var.NAME}${var.USERNAME}${var.PASSWORD}${var.SCHOOL_ID}${var.PERMISSION}${var.PHONE} - - - - - -
您无权查看
没有相关数据
-
- - - - - -
- - 新增 - - - - -
-
- - -
- -
- -
- -
-
- + + + + + + + 没有相关数据 + + + + + +
+ + + + + +
+ 新增 + + +
+
+
<%@ include file="../../system/index/foot.jsp"%> - - - - - - - - - - + diff --git a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp new file mode 100644 index 0000000..0d1dbd3 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp @@ -0,0 +1,374 @@ +<%@ 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"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + + + +<%@ include file="../../system/index/top.jsp"%> + + + + + + +
+ +
+
+
+
+
+ + +
+ + + + + + + + + + + +
+
+ + + + +
+ 		+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 序号姓名用户名密码所在学校权限联系电话操作
+ + ${vs.index+1}${var.NAME}${var.USERNAME}${var.PASSWORD}${var.SCHOOL_ID}${var.PERMISSION}${var.PHONE} + + + + + +
您无权查看
没有相关数据
+
+ + + + + +
+ + 新增 + + + + +
+
+
+ +
+ +
+ +
+ +
+
+ + + + + + + +
+ + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/pagetemplate_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/pagetemplate_list2.jsp index 4cc3229..2a74a0b 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/pagetemplate_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/pagetemplate_list2.jsp @@ -73,12 +73,13 @@ - ${vs.index+1} + ${vs.index+1} ${var.NAME} ${myelfun:findSubjectCName(var.SUBJECT_ID)} ${myelfun:findGradeName(var.GRADE_ID)} ${var.PAGE_SCORE} - + + @@ -98,7 +99,7 @@
- +
@@ -189,7 +190,7 @@ var grade_id = $("#grade_id").val(); if(name != null&& name != ''){ - self.location.href = "<%=basePath%>" + "pagetemplate/npaper.do?name=" + name + "&grade_id=" + grade_id +"&subject_id=" + subject_id ; + self.location.href = "<%=basePath%>" + "pagetemplate/npaper.do?school_id=${pd.SCHOOL_ID}&subject_id=" + subject_id + "&grade_id=" + grade_id + "&name=" + name; $(".title_time").modal("hide"); }else{ alert("请输入正确的模板名称"); @@ -233,17 +234,21 @@ }; diag.show(); } - + function tosearch(){ + $("#Form").submit(); + } //删除 function del(Id){ window.top.remove.init({"title":"删除","func":function(success){ if(success){ - var str = ''; - for(var i=0;i < document.getElementsByName('ids').length;i++){ - if(document.getElementsByName('ids')[i].checked){ - if(str=='') str += document.getElementsByName('ids')[i].value; - else str += ',' + document.getElementsByName('ids')[i].value; - } + var str = Id; + if(str == ''){ + for(var i=0;i < document.getElementsByName('ids').length;i++){ + if(document.getElementsByName('ids')[i].checked){ + if(str=='') str += document.getElementsByName('ids')[i].value; + else str += ',' + document.getElementsByName('ids')[i].value; + } + } } if(str==''){ diff --git a/WebRoot/WEB-INF/jsp/sunvote/school/school_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/school/school_edit2.jsp index b14b95c..8b73c2d 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/school/school_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/school/school_edit2.jsp @@ -63,6 +63,8 @@ +
+
@@ -81,7 +83,7 @@
- +
@@ -89,28 +91,28 @@
- +
- +
- +
- +
@@ -121,7 +123,7 @@
- + @@ -145,6 +147,7 @@ $("#btn").val("保存"); $(this).attr({"class":"save_btn_sty","data-state":"save"}); }else if(state=="save"){ + $("#Form").submit(); $(".form-control").attr("disabled","disabled"); $("#btn").val("修改"); $(this).attr({"class":"edit_btn_sty","data-state":"edit"}); diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp index 90f2344..444e198 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp @@ -49,7 +49,7 @@ 所属年级: <%-- --%> - diff --git a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp index 6c67b6e..68ee1c8 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp @@ -28,7 +28,7 @@
-
+
@@ -75,14 +75,13 @@ - + diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp index b07b0ef..082fd8d 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp @@ -181,7 +181,7 @@
- +
@@ -216,6 +216,10 @@ }); window.top.modal.show(); } + + function save(){ + + } diff --git a/WebRoot/static/js/control_template.js b/WebRoot/static/js/control_template.js index 6adc8d8..7bb70ec 100644 --- a/WebRoot/static/js/control_template.js +++ b/WebRoot/static/js/control_template.js @@ -189,24 +189,12 @@ $(function() { /* 提交保存数据 */ $("#save").click(function() { - var url = URL; - - var data = { - title : $(".header_box h1").text(), - //exam_time : parseInt($("#time").text()), - //paper_type : testData.paper_type, - subject_id : testData.subject_id, - grade_id : testData.grade_id, - user_id : testData.user_id, - school_id : testData.school_id, - score : total_score, - questions : [] - }; + var content = []; if ($(".section").length > 0) { var rank = 0; for (i = 0; i < $(".section").length; i++) { - data.questions[i] = { + content[i] = { index: i+1, type: $(".section").eq(i).attr("data-type"), questionNum: $(".section").eq(i).attr("data-questionNum"), @@ -215,15 +203,7 @@ $(function() { }; } } - - if (data.questions.length > 0) { - data = JSON.stringify(data); - dataJson = { - "json" : data - }; - ajax_submit(url, dataJson); - } else - alert("请添加试题"); + self.location.href = URL + JSON.stringify(content) + "&page_score=" + total_score; }); /* ajax封装函数 */ diff --git a/resources/dbconfig.properties b/resources/dbconfig.properties index 11d472b..d8e1471 100644 --- a/resources/dbconfig.properties +++ b/resources/dbconfig.properties @@ -1,5 +1,5 @@ #数据源 1 -url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 +url:jdbc:mysql://47.107.98.47:3306/education?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 #url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml index bd7b52c..815a11a 100644 --- a/resources/mybatis1/api/V1Mapper.xml +++ b/resources/mybatis1/api/V1Mapper.xml @@ -166,26 +166,18 @@ + SELECT sv_teacher.`NAME`, - sv_teacher.`ID`, sv_sclass.CLASS_NAME, - sv_sclass.ID, sv_subject.CNAME, - sv_subject.ID, + SV_COURSEMANAGEMENT.SUBJECT_ID, + SV_COURSEMANAGEMENT.TEACHER_ID, + SV_COURSEMANAGEMENT.CLASS_ID, + SV_COURSEMANAGEMENT.ID, SV_COURSEMANAGEMENT.HEAD_MASTER FROM SV_COURSEMANAGEMENT LEFT JOIN sv_sclass ON SV_COURSEMANAGEMENT.CLASS_ID = sv_sclass.ID - LEFT JOIN sv_schoolgradesubject ON sv_sclass.GRADE_ID = sv_schoolgradesubject.GRADE_ID - AND sv_sclass.SCHOOL_ID = sv_schoolgradesubject.SCHOOL_ID LEFT JOIN sv_teacher ON sv_coursemanagement.TEACHER_ID = sv_teacher.ID LEFT JOIN sv_subject on sv_coursemanagement.SUBJECT_ID = sv_subject.ID WHERE - sv_schoolgradesubject.SCHOOL_ID = #{SCHOOL_ID} + SV_COURSEMANAGEMENT.SCHOOL_ID = #{SCHOOL_ID} @@ -154,21 +153,20 @@ diff --git a/resources/mybatis1/sunvote/GradeMapper.xml b/resources/mybatis1/sunvote/GradeMapper.xml index 6616792..6abf039 100644 --- a/resources/mybatis1/sunvote/GradeMapper.xml +++ b/resources/mybatis1/sunvote/GradeMapper.xml @@ -67,16 +67,21 @@ from where 1=1 - - and - ( - - ) - + + + + + @@ -87,6 +92,48 @@ + + + + + + delete from diff --git a/resources/mybatis1/sunvote/HeadmasterMapper.xml b/resources/mybatis1/sunvote/HeadmasterMapper.xml index c4ca827..cd210cb 100644 --- a/resources/mybatis1/sunvote/HeadmasterMapper.xml +++ b/resources/mybatis1/sunvote/HeadmasterMapper.xml @@ -100,15 +100,8 @@ from where 1=1 - - and - ( - - ) + + and SCHOOL_ID = #{pd.SCHOOL_ID} @@ -118,6 +111,10 @@ from + where 1 = 1 + + and SCHOOL_ID = #{SCHOOL_ID} + diff --git a/resources/mybatis1/sunvote/PageTemplateMapper.xml b/resources/mybatis1/sunvote/PageTemplateMapper.xml index 8de3ea9..51be25e 100644 --- a/resources/mybatis1/sunvote/PageTemplateMapper.xml +++ b/resources/mybatis1/sunvote/PageTemplateMapper.xml @@ -84,6 +84,18 @@ from where 1=1 + + and SCHOOL_ID = #{pd.SCHOOL_ID} + + + and SUBJECT_ID = #{pd.SUBJECT_ID} + + + and GRADE_ID = #{pd.GRADE_ID} + + + and (USER_ID = #{pd.USER_ID} or USER_ID IS NULL) + and ( diff --git a/resources/mybatis1/sunvote/SchoolMapper.xml b/resources/mybatis1/sunvote/SchoolMapper.xml index c8957bf..42e8b1f 100644 --- a/resources/mybatis1/sunvote/SchoolMapper.xml +++ b/resources/mybatis1/sunvote/SchoolMapper.xml @@ -32,12 +32,14 @@ insert into ( + ID, NAME, ADDRESS, PRESIDENT, PHONE, REMARK ) values ( + #{ID}, #{NAME}, #{ADDRESS}, #{PRESIDENT}, diff --git a/resources/mybatis1/sunvote/SubjectMapper.xml b/resources/mybatis1/sunvote/SubjectMapper.xml index 66a4099..3e13b1f 100644 --- a/resources/mybatis1/sunvote/SubjectMapper.xml +++ b/resources/mybatis1/sunvote/SubjectMapper.xml @@ -109,6 +109,10 @@ and sv_schoolgradesubject.SCHOOL_ID = #{SCHOOL_ID} + + and sv_schoolgradesubject.GRADE_ID = #{GRADE_ID} + + group by sv_schoolgradesubject.SUBJECT_ID diff --git a/src/com/fh/controller/sunvote/attachkeyboard/AttachKeyboardController.java b/src/com/fh/controller/sunvote/attachkeyboard/AttachKeyboardController.java index 08272a7..9ca3aee 100644 --- a/src/com/fh/controller/sunvote/attachkeyboard/AttachKeyboardController.java +++ b/src/com/fh/controller/sunvote/attachkeyboard/AttachKeyboardController.java @@ -21,13 +21,12 @@ import org.springframework.web.servlet.ModelAndView; import com.fh.controller.base.BaseController; import com.fh.entity.Page; +import com.fh.service.sunvote.attachkeyboard.AttachKeyboardManager; +import com.fh.service.sunvote.sclass.SClassManager; import com.fh.util.AppUtil; +import com.fh.util.Jurisdiction; 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.attachkeyboard.AttachKeyboardManager; -import com.fh.service.sunvote.sclass.SClassManager; /** * 说明：班级附加键盘 diff --git a/src/com/fh/controller/sunvote/classtype/ClassTypeController.java b/src/com/fh/controller/sunvote/classtype/ClassTypeController.java index 300890e..4389eb8 100644 --- a/src/com/fh/controller/sunvote/classtype/ClassTypeController.java +++ b/src/com/fh/controller/sunvote/classtype/ClassTypeController.java @@ -49,6 +49,7 @@ public class ClassTypeController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); + pd.put("ID", get32UUID()); classtypeService.save(pd); mv.addObject("msg","success"); mv.setViewName("save_result"); diff --git a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java index 57aeee1..dad06d0 100644 --- a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java +++ b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java @@ -218,12 +218,13 @@ public class CourseManagementController extends BaseController { mv.addObject("teachers",teachers); List classs = sclassService.listAll(pd); mv.addObject("classs",classs); - List subjects = subjectService.listAll(pd); + + List subjects = subjectService.listAllSchool(pd); mv.addObject("subjects", subjects); List terms = termService.listAll(pd); mv.addObject("terms", terms); - List grades = gradeService.listAll(pd); + List grades = gradeService.listAllInschool(pd); mv.addObject("grades", grades); mv.addObject("msg", "save"); mv.addObject("pd", pd); @@ -265,7 +266,6 @@ public class CourseManagementController extends BaseController { @ResponseBody public Object deleteAll() throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"批量删除CourseManagement"); - if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限 PageData pd = new PageData(); Map map = new HashMap(); pd = this.getPageData(); diff --git a/src/com/fh/controller/sunvote/grade/GradeController.java b/src/com/fh/controller/sunvote/grade/GradeController.java index 0bf4994..058b1dd 100644 --- a/src/com/fh/controller/sunvote/grade/GradeController.java +++ b/src/com/fh/controller/sunvote/grade/GradeController.java @@ -22,6 +22,7 @@ import org.springframework.web.servlet.ModelAndView; import com.fh.controller.base.BaseController; import com.fh.entity.Page; import com.fh.service.sunvote.grade.GradeManager; +import com.fh.service.sunvote.schoolgradesubject.SchoolGradeSubjectManager; import com.fh.util.AppUtil; import com.fh.util.Jurisdiction; import com.fh.util.ObjectExcelView; @@ -40,6 +41,9 @@ public class GradeController extends BaseController { @Resource(name="gradeService") private GradeManager gradeService; + @Resource(name="schoolgradesubjectService") + private SchoolGradeSubjectManager schoolgradesubjectService; + /**保存 * @param * @throws Exception @@ -58,6 +62,23 @@ public class GradeController extends BaseController { return mv; } + /**保存 + * @param + * @throws Exception + */ + @RequestMapping(value="/save2") + public ModelAndView save2() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"新增Grade"); + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("SCHOOLGRADESUBJECT_ID",get32UUID()); + schoolgradesubjectService.save(pd); + mv.addObject("msg","success"); + mv.setViewName("save_result2"); + return mv; + } + /**删除 * @param out * @throws Exception @@ -97,7 +118,7 @@ public class GradeController extends BaseController { @RequestMapping(value="/list") public ModelAndView list(Page page) throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"列表Grade"); - //if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码) +// if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码) ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); @@ -121,7 +142,6 @@ public class GradeController extends BaseController { @RequestMapping(value="/listcs") public ModelAndView listcs(Page page) throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"列表Grade"); - //if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码) ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); @@ -131,7 +151,7 @@ public class GradeController extends BaseController { } page.setPd(pd); - List varList = gradeService.list(page); //列出Grade列表 + List varList = gradeService.datalistPageInSchool(page); //列出Grade列表 mv.setViewName("sunvote/grade/grade_list2"); mv.addObject("varList", varList); mv.addObject("pd", pd); @@ -162,8 +182,10 @@ public class GradeController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); + List list = gradeService.listAllNot(pd); + mv.addObject("gradeList", list); mv.setViewName("sunvote/grade/grade_edit2"); - mv.addObject("msg", "save"); + mv.addObject("msg", "save2"); mv.addObject("pd", pd); return mv; } @@ -210,6 +232,31 @@ public class GradeController extends BaseController { return AppUtil.returnObject(pd, map); } + /**批量删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/deleteAll2") + @ResponseBody + public Object deleteAll2() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"批量删除Grade"); + PageData pd = new PageData(); + Map map = new HashMap(); + pd = this.getPageData(); + List pdList = new ArrayList(); + String DATA_IDS = pd.getString("DATA_IDS"); + if(null != DATA_IDS && !"".equals(DATA_IDS)){ + String ArrayDATA_IDS[] = DATA_IDS.split(","); + schoolgradesubjectService.deleteAll(ArrayDATA_IDS); + pd.put("msg", "ok"); + }else{ + pd.put("msg", "no"); + } + pdList.add(pd); + map.put("list", pdList); + return AppUtil.returnObject(pd, map); + } + /**导出到excel * @param * @throws Exception diff --git a/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java b/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java index 5293d9a..6b524e1 100644 --- a/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java +++ b/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java @@ -114,6 +114,28 @@ public class HeadmasterController extends BaseController { return mv; } + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/listcs") + public ModelAndView listcs(Page page) throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"列表Headmaster"); + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + String keywords = pd.getString("keywords"); //关键词检索条件 + if(null != keywords && !"".equals(keywords)){ + pd.put("keywords", keywords.trim()); + } + page.setPd(pd); + List varList = headmasterService.list(page); //列出Headmaster列表 + mv.setViewName("sunvote/headmaster/headmaster_list2"); + mv.addObject("varList", varList); + mv.addObject("pd", pd); + return mv; + } + /**去新增页面 * @param * @throws Exception diff --git a/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java b/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java index e307b5f..1902509 100644 --- a/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java +++ b/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java @@ -11,7 +11,6 @@ import java.util.Map; import javax.annotation.Resource; -import org.apache.shiro.session.Session; import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.stereotype.Controller; import org.springframework.web.bind.WebDataBinder; @@ -20,19 +19,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import com.fh.bean.Paper; -import com.fh.bean.Question; import com.fh.controller.base.BaseController; import com.fh.entity.Page; -import com.fh.entity.system.User; +import com.fh.service.sunvote.pagetemplate.PageTemplateManager; +import com.fh.service.sunvote.schoolgradesubject.SchoolGradeSubjectManager; import com.fh.util.AppUtil; -import com.fh.util.Const; +import com.fh.util.Jurisdiction; 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.pagetemplate.PageTemplateManager; -import com.fh.service.sunvote.schoolgradesubject.SchoolGradeSubjectManager; +import com.google.gson.Gson; /** * 说明：试卷模板管理 @@ -74,6 +69,30 @@ public class PageTemplateController extends BaseController { return mv; } + /**保存 + * + * 模板内容（数组） + 题型 + 小题个数 + 每个题目的选项数 + 每个题目的分数 + * @param + * @throws Exception + */ + @RequestMapping(value="/save2") + public ModelAndView save2() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"新增PageTemplate"); + PageData pd = new PageData(); + pd = this.getPageData(); + if(pd.get("PAGETEMPLATE_ID") == null){ + pd.put("PAGETEMPLATE_ID", this.get32UUID()); //主键 + pagetemplateService.save(pd); + }else{ + pagetemplateService.edit(pd); + } + return this.listcs(getPage()); + } + /**删除 * @param out * @throws Exception @@ -81,7 +100,6 @@ public class PageTemplateController extends BaseController { @RequestMapping(value="/delete") public void delete(PrintWriter out) throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"删除PageTemplate"); - if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限 PageData pd = new PageData(); pd = this.getPageData(); pagetemplateService.delete(pd); @@ -134,10 +152,25 @@ public class PageTemplateController extends BaseController { * @param page * @throws Exception */ + @RequestMapping(value = "/listdata", produces = "application/json;charset=UTF-8") + @ResponseBody + public String list() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"列表PageTemplate"); + //if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码) + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = pagetemplateService.listAll(pd); //列出PageTemplate列表 + Gson gson = new Gson(); + return gson.toJson(varList); + } + + /**列表 + * @param page + * @throws Exception + */ @RequestMapping(value="/listcs") public ModelAndView listcs(Page page) throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"列表PageTemplate"); - //if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码) ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); @@ -198,7 +231,6 @@ public class PageTemplateController extends BaseController { @ResponseBody public Object deleteAll() throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"批量删除PageTemplate"); - if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限 PageData pd = new PageData(); Map map = new HashMap(); pd = this.getPageData(); @@ -258,47 +290,23 @@ public class PageTemplateController extends BaseController { @RequestMapping(value="/npaper") public ModelAndView newpaper() throws Exception{ - logBefore(logger, Jurisdiction.getUsername()+"Paper详细信息"); + logBefore(logger, Jurisdiction.getUsername()+"新增模板"); ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - String paperType = pd.getString("PAPER_TYPE") ; - Paper paper = new Paper(); - paper.setTitle(pd.getString("NAME")); - paper.setExam_time(pd.getString("TIME")); - Session session = Jurisdiction.getSession(); - User user = (User)session.getAttribute(Const.SESSION_USER); - paper.setUser_id(user.getUSER_ID()); - paper.setPaper_type(paperType == null || "".equals(paperType.trim()) ? "1" :paperType); - String subjectId = pd.getString("SUBJECT_ID"); - paper.setSubject_id(subjectId == null || "".equals(subjectId.trim())? getSubjectId():subjectId); - String gradeId = pd.getString("GRADE_ID"); - paper.setGrade_id( gradeId== null || "".equals(gradeId.trim())? getGradeID() : gradeId); - String schoolId = pd.getString("SCHOOL_ID") ; - paper.setSchool_id(schoolId == null || "".equals(schoolId.trim())? getSchoolID() : schoolId); - paper.setQuestions(new ArrayList()); - - pd.put("JSON", paper.toJson()); - logger.info(paper.toJson()); - String TEMPLATE_ID = pd.getString("TEMPLATE_ID"); if(TEMPLATE_ID != null && !"".equals(TEMPLATE_ID)){ pd.put("PAGETEMPLATE_ID", TEMPLATE_ID); PageData template = pagetemplateService.findById(pd); mv.addObject("TEMPLEATE", template); } - + pd.put("USER_ID", getUserID()); if(isChineseLanguageClient()){ mv.setViewName("sunvote/teacher/creat_template"); }else{ - mv.setViewName("sunvote/teacher/en_creat_question"); + mv.setViewName("sunvote/teacher/en_creat_template"); } mv.addObject("pd", pd); - if(paperType != null && "2".equals(paperType)){ - mv.addObject("JUMP_URL", "/main/admin"); - }else{ - mv.addObject("JUMP_URL", "/main/teacher"); - } mv.addObject("QX",Jurisdiction.getHC()); //按钮权限 return mv; } diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java index 5a3347d..ad74392 100644 --- a/src/com/fh/controller/sunvote/paper/PaperController.java +++ b/src/com/fh/controller/sunvote/paper/PaperController.java @@ -30,6 +30,7 @@ import com.fh.service.sunvote.pagetemplate.PageTemplateManager; import com.fh.service.sunvote.paper.PaperManager; import com.fh.service.sunvote.paperquestion.PaperQuestionManager; import com.fh.service.sunvote.question.QuestionManager; +import com.fh.service.sunvote.schoolgradesubject.SchoolGradeSubjectManager; import com.fh.util.AppUtil; import com.fh.util.Const; import com.fh.util.Jurisdiction; @@ -57,6 +58,9 @@ public class PaperController extends BaseController { @Resource(name = "v1Service") private V1Manager v1Service ; + @Resource(name="schoolgradesubjectService") + private SchoolGradeSubjectManager schoolgradesubjectService; + @Resource(name="pagetemplateService") private PageTemplateManager pagetemplateService; @@ -411,27 +415,10 @@ public class PaperController extends BaseController { PageData tpd = new PageData(); tpd.put("ID", getUserID()); - List adminInfos = v1Service.getAdminInfo(tpd); - List gradeInfos = new ArrayList(); - List subjectInfos = new ArrayList(); - // 查询学校信息 - for(PageData pad : adminInfos){ - PageData tmpd = new PageData(); - Object gradeId = pad.get("GRADE_ID"); - tmpd.put("SNAME", pad.get("SNAME"));// 学校名称 - tmpd.put("SCHOOL_ID", pad.get("SCHOOL_ID"));//学校ID - tmpd.put("GRADE_ID", pad.get("GRADE_ID"));//年级id - tmpd.put("GNAME", pad.get("GNAME"));//年级名称 - tmpd.put("SUBJECT_ID", pad.get("SUBJECT_ID"));// 科目id - tmpd.put("SCNAME", pad.get("SCNAME"));// 科目名称 - if(gradeId != null && !"".equals(gradeId)){ - gradeInfos.add(tmpd); - }else{ - subjectInfos.add(tmpd); - } - mv.addObject("SNAME", pad.get("SNAME")); - mv.addObject("SCHOOL_ID", pad.get("SCHOOL_ID")); - } + PageData adminInfos = v1Service.getAdminInfo(tpd); + List gradeInfos = schoolgradesubjectService.listAllGrade(adminInfos); + List subjectInfos = schoolgradesubjectService.listAllSubject(adminInfos); + mv.addObject("gradeInfos", gradeInfos); mv.addObject("subjectInfos", subjectInfos); diff --git a/src/com/fh/controller/sunvote/school/SchoolController.java b/src/com/fh/controller/sunvote/school/SchoolController.java index a0c6fa7..262bfc5 100644 --- a/src/com/fh/controller/sunvote/school/SchoolController.java +++ b/src/com/fh/controller/sunvote/school/SchoolController.java @@ -56,6 +56,7 @@ public class SchoolController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); FHLOG.save(getUsername(), "新增学校:" + pd.getString("NAME")); + pd.put("ID", get32UUID()); schoolService.save(pd); mv.addObject("msg","success"); mv.setViewName("save_result"); @@ -98,6 +99,20 @@ public class SchoolController extends BaseController { return mv; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit2") + public ModelAndView edit2() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"修改学校"); + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + schoolService.edit(pd); + return goEdit2(); + } + /**列表 * @param page @@ -211,7 +226,7 @@ public class SchoolController extends BaseController { pd = this.getPageData(); pd = schoolService.findById(pd); //根据ID读取 mv.setViewName("sunvote/school/school_edit2"); - mv.addObject("msg", "edit"); + mv.addObject("msg", "edit2"); 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 299820a..5cd4644 100644 --- a/src/com/fh/controller/sunvote/sclass/SClassController.java +++ b/src/com/fh/controller/sunvote/sclass/SClassController.java @@ -21,17 +21,16 @@ import org.springframework.web.servlet.ModelAndView; import com.fh.controller.base.BaseController; import com.fh.entity.Page; -import com.fh.util.AppUtil; -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.basestation.BasestationManager; import com.fh.service.sunvote.classtype.ClassTypeManager; import com.fh.service.sunvote.grade.GradeManager; import com.fh.service.sunvote.school.SchoolManager; import com.fh.service.sunvote.sclass.SClassManager; import com.fh.service.system.fhlog.FHlogManager; +import com.fh.util.AppUtil; +import com.fh.util.Jurisdiction; +import com.fh.util.ObjectExcelView; +import com.fh.util.PageData; /** * 说明：班级 @@ -67,7 +66,6 @@ public class SClassController extends BaseController { @RequestMapping(value="/save") public ModelAndView save() throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"新增SClass"); - if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限 ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); @@ -78,6 +76,23 @@ public class SClassController extends BaseController { return mv; } + /**保存 + * @param + * @throws Exception + */ + @RequestMapping(value="/save2") + public ModelAndView save2() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"新增SClass"); + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("ID", get32UUID()); + sclassService.save(pd); + mv.addObject("msg","success"); + mv.setViewName("save_result2"); + return mv; + } + /**删除 * @param out * @throws Exception @@ -116,7 +131,6 @@ public class SClassController extends BaseController { @RequestMapping(value="/edit2") public ModelAndView edit2() throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"修改SClass"); - if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限 ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); @@ -220,7 +234,7 @@ public class SClassController extends BaseController { mv.addObject("grades", grades); List classTypes = classtypeService.listAll(pd); mv.addObject("classTypes", classTypes); - mv.addObject("msg", "save"); + mv.addObject("msg", "save2"); mv.addObject("pd", pd); return mv; } diff --git a/src/com/fh/controller/sunvote/subject/SubjectController.java b/src/com/fh/controller/sunvote/subject/SubjectController.java index bd09042..1eab3ff 100644 --- a/src/com/fh/controller/sunvote/subject/SubjectController.java +++ b/src/com/fh/controller/sunvote/subject/SubjectController.java @@ -15,19 +15,20 @@ import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.stereotype.Controller; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; +import org.springframework.web.bind.annotation.RequestBody; 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.service.sunvote.schoolgradesubject.SchoolGradeSubjectManager; +import com.fh.service.sunvote.subject.SubjectManager; import com.fh.util.AppUtil; +import com.fh.util.Jurisdiction; 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.schoolgradesubject.SchoolGradeSubjectManager; -import com.fh.service.sunvote.subject.SubjectManager; +import com.google.gson.Gson; /** * 说明：科目 @@ -75,7 +76,7 @@ public class SubjectController extends BaseController { pd.put("SCHOOLGRADESUBJECT_ID", this.get32UUID()); //主键 schoolgradesubjectService.save(pd); mv.addObject("msg","success"); - mv.setViewName("save_result"); + mv.setViewName("save_result2"); return mv; } @@ -155,6 +156,20 @@ public class SubjectController extends BaseController { return mv; } + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/listdata",produces = "application/json;charset=UTF-8") + @ResponseBody + public String listData() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = subjectService.listAllSchool(pd); //列出Subject列表 + Gson gson = new Gson(); + return gson.toJson(varList); + } + /**去新增页面 * @param * @throws Exception @@ -227,7 +242,6 @@ public class SubjectController extends BaseController { @ResponseBody public Object deleteAll() throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"批量删除Subject"); - if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限 PageData pd = new PageData(); Map map = new HashMap(); pd = this.getPageData(); diff --git a/src/com/fh/controller/sunvote/term/TermController.java b/src/com/fh/controller/sunvote/term/TermController.java index c0cf322..d7f4fc7 100644 --- a/src/com/fh/controller/sunvote/term/TermController.java +++ b/src/com/fh/controller/sunvote/term/TermController.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,14 +18,14 @@ 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.service.sunvote.term.TermManager; import com.fh.util.AppUtil; +import com.fh.util.Jurisdiction; 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.term.TermManager; /** * 说明：学期名称 diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java index 3d2393a..20ce239 100644 --- a/src/com/fh/controller/system/login/LoginController.java +++ b/src/com/fh/controller/system/login/LoginController.java @@ -31,6 +31,7 @@ import com.fh.service.sunvote.event.EventManager; import com.fh.service.sunvote.pagetemplate.PageTemplateManager; import com.fh.service.sunvote.school.SchoolManager; import com.fh.service.sunvote.schooladmin.SchoolAdminManager; +import com.fh.service.sunvote.schoolgradesubject.SchoolGradeSubjectManager; import com.fh.service.sunvote.sclass.SClassManager; import com.fh.service.sunvote.teacher.TeacherManager; import com.fh.service.system.appuser.AppuserManager; @@ -85,6 +86,9 @@ public class LoginController extends BaseController { @Resource(name = "v1Service") private V1Manager v1Service; + @Resource(name="schoolgradesubjectService") + private SchoolGradeSubjectManager schoolgradesubjectService; + @Resource(name="schooladminService") private SchoolAdminManager schooladminService; @@ -292,36 +296,16 @@ public class LoginController extends BaseController { PageData tpd = new PageData(); tpd.put("ID", user.getUSER_ID()); String schoolId = "" ; - List adminInfos = v1Service.getAdminInfo(tpd); - List gradeInfos = new ArrayList(); - List subjectInfos = new ArrayList(); + PageData adminInfos = v1Service.getAdminInfo(tpd); // 查询学校信息 Object tgradleId = "" ; - for(PageData pad : adminInfos){ - PageData tmpd = new PageData(); - Object gradeId = pad.get("GRADE_ID"); - tmpd.put("SNAME", pad.get("SNAME"));// 学校名称 - tmpd.put("SCHOOL_ID", pad.get("SCHOOL_ID"));//学校ID - tmpd.put("GRADE_ID", pad.get("GRADE_ID"));//年级id - tmpd.put("GNAME", pad.get("GNAME"));//年级名称 - tmpd.put("SUBJECT_ID", pad.get("SUBJECT_ID"));// 科目id - tmpd.put("SCNAME", pad.get("SCNAME"));// 科目名称 - if(gradeId != null && !gradeId.equals(tgradleId)){ - tgradleId = gradeId ; - List classInfos = sclassService.listAll(tmpd); - tmpd.put("classInfos", classInfos); - gradeInfos.add(tmpd); - subjectInfos = new ArrayList(); - tmpd.put("subjectInfos", subjectInfos); - } - subjectInfos.add(tmpd); - schoolId = pad.getString("SCHOOL_ID"); - mv.addObject("SNAME", pad.get("SNAME")); - mv.addObject("SCHOOL_ID", pad.get("SCHOOL_ID")); - } + session.setAttribute(USERNAME + Const.ROLE_ID, "admin"); + List gradeInfos = schoolgradesubjectService.listAllGrade(adminInfos); mv.addObject("gradeInfos", gradeInfos); + mv.addObject("adminInfos", adminInfos); + mv.addObject("SCHOOL_ID", adminInfos.get("ID")); session.setAttribute(Const.SESSION_USERNAME, USERNAME); // 放入用户名到session if(isChineseLanguageClient()){ mv.setViewName("sunvote/admin/admin_main"); diff --git a/src/com/fh/service/api/V1Manager.java b/src/com/fh/service/api/V1Manager.java index 43108fa..d094111 100644 --- a/src/com/fh/service/api/V1Manager.java +++ b/src/com/fh/service/api/V1Manager.java @@ -22,7 +22,7 @@ public interface V1Manager { public List getLastWrongQuestionInfo(PageData pd) throws Exception; - public List getAdminInfo(PageData pd) throws Exception; + public PageData getAdminInfo(PageData pd) throws Exception; public List getClassBySchoolAndGradle(PageData pd) throws Exception; diff --git a/src/com/fh/service/api/impl/V1Service.java b/src/com/fh/service/api/impl/V1Service.java index 58058e0..f9e02fc 100644 --- a/src/com/fh/service/api/impl/V1Service.java +++ b/src/com/fh/service/api/impl/V1Service.java @@ -47,8 +47,8 @@ public class V1Service implements V1Manager { } @Override - public List getAdminInfo(PageData pd) throws Exception { - return (List)dao.findForList("V1Mapper.getAdminInfo", pd); + public PageData getAdminInfo(PageData pd) throws Exception { + return (PageData)dao.findForObject("V1Mapper.getAdminInfo", pd); } @Override diff --git a/src/com/fh/service/sunvote/grade/GradeManager.java b/src/com/fh/service/sunvote/grade/GradeManager.java index ca1ad6a..5eceb07 100644 --- a/src/com/fh/service/sunvote/grade/GradeManager.java +++ b/src/com/fh/service/sunvote/grade/GradeManager.java @@ -36,11 +36,20 @@ public interface GradeManager{ */ public List list(Page page)throws Exception; + /**列表 + * @param page + * @throws Exception + */ + public List datalistPageInSchool(Page page)throws Exception; + + public List listAllInschool(PageData pd)throws Exception; + /**列表(全部) * @param pd * @throws Exception */ public List listAll(PageData pd)throws Exception; + public List listAllNot(PageData pd)throws Exception; /**通过id获取数据 * @param pd diff --git a/src/com/fh/service/sunvote/grade/impl/GradeService.java b/src/com/fh/service/sunvote/grade/impl/GradeService.java index d298110..bb56e96 100644 --- a/src/com/fh/service/sunvote/grade/impl/GradeService.java +++ b/src/com/fh/service/sunvote/grade/impl/GradeService.java @@ -52,6 +52,14 @@ public class GradeService implements GradeManager{ public List list(Page page)throws Exception{ return (List)dao.findForList("GradeMapper.datalistPage", page); } + /**列表 + * @param page + * @throws Exception + */ + @SuppressWarnings("unchecked") + public List datalistPageInSchool(Page page)throws Exception{ + return (List)dao.findForList("GradeMapper.datalistPageInSchool", page); + } /**列表(全部) * @param pd @@ -62,6 +70,18 @@ public class GradeService implements GradeManager{ return (List)dao.findForList("GradeMapper.listAll", pd); } + public List listAllNot(PageData pd)throws Exception{ + return (List)dao.findForList("GradeMapper.listAllNot", pd); + } + /**列表(全部) + * @param pd + * @throws Exception + */ + @SuppressWarnings("unchecked") + public List listAllInschool(PageData pd)throws Exception{ + return (List)dao.findForList("GradeMapper.listAllInschool", pd); + } + /**通过id获取数据 * @param pd * @throws Exception diff --git a/src/com/fh/util/Jurisdiction.java b/src/com/fh/util/Jurisdiction.java index 3127239..5a90dce 100644 --- a/src/com/fh/util/Jurisdiction.java +++ b/src/com/fh/util/Jurisdiction.java @@ -22,11 +22,11 @@ public class Jurisdiction { * 根据点击的菜单的xxx.do去菜单中的URL去匹配，当匹配到了此菜单，判断是否有此菜单的权限，没有的话跳转到404页面 * 根据按钮权限，授权按钮(当前点的菜单和角色中各按钮的权限匹对) */ -// String USERNAME = getUsername(); //获取当前登录者loginname -// Session session = getSession(); -// List menuList = (List)session.getAttribute(USERNAME + Const.SESSION_allmenuList); //获取菜单列表 -// return readMenu(menuList,menuUrl,session,USERNAME); - return true; + String USERNAME = getUsername(); //获取当前登录者loginname + Session session = getSession(); + List menuList = (List)session.getAttribute(USERNAME + Const.SESSION_allmenuList); //获取菜单列表 + return readMenu(menuList,menuUrl,session,USERNAME); +// return true; } /**校验菜单权限并初始按钮权限用于页面按钮显示与否(递归处理)