From 8246d00caf15d8cd787ef59c7e98b887b3977d9b Mon Sep 17 00:00:00 2001 From: Elvis Date: Tue, 26 Mar 2019 11:35:30 +0800 Subject: [PATCH] 修复bug --- WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp | 17 ++++++++++++++--- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp | 12 +----------- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp | 15 +++++++++++++-- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp | 82 ++++++++++++++++++++++++++++++++++++++-------------------------------------------- resources/mybatis1/api/V1Mapper.xml | 45 ++++++++++++++++++++++++--------------------- resources/mybatis1/sunvote/CourseManagementMapper.xml | 5 +++++ resources/mybatis1/sunvote/SubjectMapper.xml | 11 +++++++++-- src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java | 20 ++++++++++++++++++-- src/com/fh/controller/sunvote/schoolgradesubject/SchoolGradeSubjectController.java | 1 - src/com/fh/controller/sunvote/teacher/TeacherController.java | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- src/com/fh/controller/system/login/LoginController.java | 31 ++++--------------------------- src/com/fh/service/api/V1Manager.java | 4 +++- src/com/fh/service/api/impl/V1Service.java | 9 +++++++-- 13 files changed, 210 insertions(+), 130 deletions(-) diff --git a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp index dacf52e..53df532 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp @@ -71,7 +71,7 @@ value="${var.ID}" />${vs.index+1} ${var.CNAME} ${var.ENAME} - + @@ -134,11 +134,22 @@ } } if(str==''){ - + if(Id != ''){ + $.ajax({ + type: "POST", + url: '<%=basePath%>schoolgradesubject/deleteAll.do?tm='+new Date().getTime(), + data: {DATA_IDS:Id}, + dataType:'json', + cache: false, + success: function(data){ + tosearch(); + } + }); + } }else{ $.ajax({ type: "POST", - url: '<%=basePath%>subject/deleteAll.do?tm='+new Date().getTime(), + url: '<%=basePath%>schoolgradesubject/deleteAll.do?tm='+new Date().getTime(), data: {DATA_IDS:str}, dataType:'json', //beforeSend: validateData, diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp index 5c9970d..03e63f0 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp @@ -32,20 +32,10 @@
+
- - - <%-- --%> - - diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp index 082fd8d..c9adb29 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp @@ -105,7 +105,7 @@
所在学校: - -
姓名:
- +
@@ -209,7 +209,18 @@ function edit(Id){ window.top.modal.init({ 'title':'修改信息', - 'url':'<%=basePath%>teacher/goEdit2.do?ID='+Id, + 'url':'<%=basePath%>teacher/goEdit2.do?school_id=${pd.SCHOOL_ID}&ID='+Id, + func:function() { + tosearch(); + } + }); + window.top.modal.show(); + } + + function add(){ + window.top.modal.init({ + 'title':'添加教师', + 'url':'<%=basePath%>teacher/goAdd2.do?school_id=${pd.SCHOOL_ID}', func:function() { tosearch(); } diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp index 3b22197..888c393 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp @@ -48,73 +48,67 @@

欢迎！

-

${pd.TEACHER[0].TEACHER_NAME }

-

${pd.TEACHER[0].SCHOOL_NAME }

+

${pd.TEACHER.TNAME }

+

${pd.TEACHER.SNAME }

+
+
+
-
-

- 班级管理 -

-
    - -

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

    -
    • -     - -
-
+
-

试卷管理

+

轻松考

  • -

    轻松考试卷管理

    - +

    试卷管理

    • -
  • -

    即时测试卷管理

    - - +
  • +

    测验分析

    +
      + +

    • ${var.CLASS_NAME}${var.CNAME} 成绩

      • +       +

- 测验分析 + 即时测

    -
  • -

    轻松考测验分析

    -
      - -

    • ${var.CLASS_NAME} 成绩

      • -       -
    +
  • +

    试卷管理

    • +
  • -

    即时测测验分析

    +

    测验分析

      - -

    • ${var.CLASS_NAME} 成绩

      • + +

    • ${var.CLASS_NAME}${var.CNAME} 成绩

      •
+
+
+

+ 课后练 +

- <%--
    - -

  • ${var.CLASS_NAME} 成绩

    • -     -
--%> +
    +
  • +

    布置练习

    +
    • +
  • +

    练习管理

    +
    • +
  • +

    练习报表

    +
    • +
diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml index 815a11a..66ba75f 100644 --- a/resources/mybatis1/api/V1Mapper.xml +++ b/resources/mybatis1/api/V1Mapper.xml @@ -135,32 +135,35 @@ + + + diff --git a/resources/mybatis1/sunvote/CourseManagementMapper.xml b/resources/mybatis1/sunvote/CourseManagementMapper.xml index c210f34..8fde21b 100644 --- a/resources/mybatis1/sunvote/CourseManagementMapper.xml +++ b/resources/mybatis1/sunvote/CourseManagementMapper.xml @@ -17,6 +17,7 @@ REMARK, GRADE_ID, TERM_ID, + SCHOOL_ID, ID @@ -30,6 +31,7 @@ #{REMARK}, #{GRADE_ID}, #{TERM_ID}, + #{SCHOOL_ID}, #{ID} @@ -46,6 +48,7 @@ END_DATE, GRADE_ID, TERM_ID, + SCHOOL_ID, REMARK ) values ( #{ID}, @@ -56,6 +59,7 @@ #{END_DATE}, #{GRADE_ID}, #{TERM_ID}, + #{SCHOOL_ID}, #{REMARK} ) @@ -81,6 +85,7 @@ REMARK = #{REMARK}, GRADE_ID = #{GRADE_ID}, TERM_ID = #{TERM_ID}, + SCHOOL_ID = #{SCHOOL_ID}, ID = ID where ID = #{ID} diff --git a/resources/mybatis1/sunvote/SubjectMapper.xml b/resources/mybatis1/sunvote/SubjectMapper.xml index 3e13b1f..a29f9a2 100644 --- a/resources/mybatis1/sunvote/SubjectMapper.xml +++ b/resources/mybatis1/sunvote/SubjectMapper.xml @@ -100,7 +100,10 @@ select - + CNAME, + ENAME, + REMARK, + sv_schoolgradesubject.SCHOOLGRADESUBJECT_ID AS ID from @@ -151,6 +157,7 @@ and sv_schoolgradesubject.GRADE_ID = #{GRADE_ID} + and sv_schoolgradesubject.SUBJECT_ID != '' ) diff --git a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java index dad06d0..5e211b5 100644 --- a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java +++ b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java @@ -69,7 +69,6 @@ public class CourseManagementController extends BaseController { @RequestMapping(value="/save") public ModelAndView save() throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"新增CourseManagement"); - if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限 ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); @@ -79,6 +78,22 @@ public class CourseManagementController extends BaseController { mv.setViewName("save_result"); return mv; } + /**保存 + * @param + * @throws Exception + */ + @RequestMapping(value="/save2") + public ModelAndView save2() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"新增CourseManagement"); + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("ID", this.get32UUID()); + coursemanagementService.save(pd); + mv.addObject("msg","success"); + mv.setViewName("save_result2"); + return mv; + } /**删除 * @param out @@ -203,6 +218,7 @@ public class CourseManagementController extends BaseController { mv.addObject("pd", pd); return mv; } + /**去新增页面 * @param * @throws Exception @@ -226,7 +242,7 @@ public class CourseManagementController extends BaseController { mv.addObject("terms", terms); List grades = gradeService.listAllInschool(pd); mv.addObject("grades", grades); - mv.addObject("msg", "save"); + mv.addObject("msg", "save2"); mv.addObject("pd", pd); return mv; } diff --git a/src/com/fh/controller/sunvote/schoolgradesubject/SchoolGradeSubjectController.java b/src/com/fh/controller/sunvote/schoolgradesubject/SchoolGradeSubjectController.java index b251afd..dc6b642 100644 --- a/src/com/fh/controller/sunvote/schoolgradesubject/SchoolGradeSubjectController.java +++ b/src/com/fh/controller/sunvote/schoolgradesubject/SchoolGradeSubjectController.java @@ -184,7 +184,6 @@ public class SchoolGradeSubjectController extends BaseController { @ResponseBody public Object deleteAll() throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"批量删除SchoolGradeSubject"); - 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/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java index 131112e..fb38702 100644 --- a/src/com/fh/controller/sunvote/teacher/TeacherController.java +++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java @@ -97,6 +97,43 @@ public class TeacherController extends BaseController { mv.setViewName("save_result"); return mv; } + + /** + * 保存 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/save2") + public ModelAndView save2() throws Exception { + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("ID", this.get32UUID()); + teacherService.save(pd); + + pd.put("USER_ID", pd.getString("ID")); // ID 主键 + pd.put("LAST_LOGIN", ""); // 最后登录时间 + pd.put("IP", ""); // IP + pd.put("STATUS", "0"); // 状态 + pd.put("SKIN", "default"); + pd.put("RIGHTS", ""); + pd.put("USERNAME", pd.getString("ACCOUT")); + pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64"); + pd.put("PASSWORD", + new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd + .getString("PASSWORD")).toString()); // 密码加密 + + if (null == userService.findByUsername(pd)) { // 判断用户名是否存在 + userService.saveU(pd); // 执行保存 + FHLOG.save(Jurisdiction.getUsername(), + "新增系统用户：" + pd.getString("USERNAME")); + } + + mv.addObject("msg", "success"); + mv.setViewName("save_result2"); + return mv; + } /** * 删除 @@ -135,23 +172,31 @@ public class TeacherController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); teacherService.edit(pd); - - /* - * pd.put("USER_ID", pd.getString("ID")); //ID 主键 pd.put("LAST_LOGIN", - * ""); //最后登录时间 pd.put("IP", ""); //IP pd.put("STATUS", "0"); //状态 - * pd.put("SKIN", "default"); pd.put("RIGHTS", ""); pd.put("USERNAME", - * pd.getString("ACCOUT")); pd.put("ROLE_ID", - * "57bb1e6f138247a0b05cc721a5da1b64"); pd.put("PASSWORD", new - * SimpleHash("SHA-1", pd.getString("ACCOUT"), - * pd.getString("PASSWORD")).toString()); //密码加密 - * - * userService.saveU(pd); - */ - mv.addObject("msg", "success"); mv.setViewName("save_result"); return mv; } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit2") + public ModelAndView edit2() throws Exception { + logBefore(logger, Jurisdiction.getUsername() + "修改Teacher"); + if (!Jurisdiction.buttonJurisdiction(menuUrl, "edit")) { + return null; + } // 校验权限 + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + teacherService.edit(pd); + mv.addObject("msg", "success"); + mv.setViewName("save_result2"); + return mv; + } /** * 列表 @@ -470,6 +515,21 @@ public class TeacherController extends BaseController { mv.addObject("pd", pd); return mv; } + + @RequestMapping(value = "/goAdd2") + public ModelAndView goAdd2() throws Exception { + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + mv.setViewName("sunvote/teacher/teacher_edit2"); + + List schools = schoolService.listAll(pd); + mv.addObject("schools", schools); + + mv.addObject("msg", "save2"); + mv.addObject("pd", pd); + return mv; + } /** * 去修改页面 @@ -506,7 +566,7 @@ public class TeacherController extends BaseController { mv.setViewName("sunvote/teacher/teacher_edit2"); List schools = schoolService.listAll(pd); mv.addObject("schools", schools); - mv.addObject("msg", "edit"); + mv.addObject("msg", "edit2"); mv.addObject("pd", pd); return mv; } diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java index 20ce239..863d187 100644 --- a/src/com/fh/controller/system/login/LoginController.java +++ b/src/com/fh/controller/system/login/LoginController.java @@ -250,33 +250,10 @@ public class LoginController extends BaseController { if ("teacher".equals(changeMenu)) { PageData tpd = new PageData(); tpd.put("ID", user.getUSER_ID()); - List teacherInfos = v1Service.getTeacherInfo(tpd); - pd.put("TEACHER", teacherInfos); - if (teacherInfos != null && teacherInfos.size() > 0) { - PageData sData = teacherInfos.get(0); - session.setAttribute(USERNAME + Const.SCHOOL_ID, - sData.get("SCHOOL_ID")); - session.setAttribute(USERNAME + Const.SCHOOL_NAME, - sData.get("SCHOOL_NAME")); - session.setAttribute(USERNAME + Const.GRADE_ID, - sData.get("GRADE_ID")); - session.setAttribute(USERNAME + Const.GRADE_NAME, - sData.get("GRADE_NAME")); - session.setAttribute(USERNAME + Const.CLASS_ID, - sData.get("CLASS_ID")); - session.setAttribute(USERNAME + Const.CLASS_NAME, - sData.get("CLASS_NAME")); - session.setAttribute(USERNAME + Const.SUBJECT_ID, - sData.get("SUBJECT_ID")); - session.setAttribute(USERNAME + Const.SUBJECT_NAME, - sData.get("SUBJECT_NAME")); - session.setAttribute(USERNAME + Const.TERM_ID, - sData.get("TERM_ID")); - - sData.put("USER_ID", user.getUSER_ID()); - List templateInfos = pagetemplateService.listAll(sData); - mv.addObject("templateInfos", templateInfos); - } + PageData teacherInfo = v1Service.getTeacherInfo(tpd); + List classInfos = v1Service.getTeacherInfoGrade(tpd); + pd.put("TEACHER", teacherInfo); + pd.put("CLASSINFO", classInfos); session.setAttribute(USERNAME + Const.ROLE_ID, "teacher"); session.setAttribute(Const.SESSION_USERNAME, USERNAME); // 放入用户名到session diff --git a/src/com/fh/service/api/V1Manager.java b/src/com/fh/service/api/V1Manager.java index d094111..1e7716c 100644 --- a/src/com/fh/service/api/V1Manager.java +++ b/src/com/fh/service/api/V1Manager.java @@ -16,7 +16,9 @@ public interface V1Manager { public List getQuestionsByPID(PageData pd) throws Exception; - public List getTeacherInfo(PageData pd) throws Exception; + public List getTeacherInfoGrade(PageData pd) throws Exception; + + public PageData getTeacherInfo(PageData pd) throws Exception; public List getQuestionWrongInfo(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 f9e02fc..ed404a1 100644 --- a/src/com/fh/service/api/impl/V1Service.java +++ b/src/com/fh/service/api/impl/V1Service.java @@ -42,8 +42,13 @@ public class V1Service implements V1Manager { } @Override - public List getTeacherInfo(PageData pd) throws Exception { - return (List)dao.findForList("V1Mapper.getTeacherInfo", pd); + public List getTeacherInfoGrade(PageData pd) throws Exception { + return (List)dao.findForList("V1Mapper.getTeacherInfoGrade", pd); + } + + @Override + public PageData getTeacherInfo(PageData pd) throws Exception { + return (PageData)dao.findForObject("V1Mapper.getTeacherInfo", pd); } @Override -- libgit2 0.21.4