From 0786f0234a0ce7ce7071561b9a9947f9d5e19c7e Mon Sep 17 00:00:00 2001 From: Elvis Date: Thu, 18 Apr 2019 11:37:03 +0800 Subject: [PATCH] 修改教师不能删除的bug --- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp | 10 ++++++++++ WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- resources/mybatis1/sunvote/StudentMapper.xml | 1 + src/com/fh/controller/sunvote/homework/HomeworkController.java | 2 ++ src/com/fh/controller/sunvote/teacher/TeacherController.java | 13 +++++++++++++ src/com/fh/controller/system/login/LoginController.java | 2 +- 6 files changed, 74 insertions(+), 4 deletions(-) diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp index 03e63f0..cf72fd3 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp @@ -78,6 +78,16 @@ + 所教科目: + + + + + 保存 取消 diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp index 87988d9..9a043ec 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp @@ -47,7 +47,8 @@ - + + @@ -59,6 +60,7 @@ 账号 性别 教师卡编号 + 科目 操作 @@ -74,7 +76,8 @@ - + + @@ -90,6 +93,7 @@ ${var.ACCOUT} ${var.SEX == 1? "男":"女"} ${var.KEYPAD_ID} + ${myelfun:findSubjectCName(var.SUBJECT_IDS)} @@ -109,7 +113,7 @@
- +
@@ -207,6 +211,11 @@ window.top.loading.remove(); }); + //检索 + function tosearch(){ + $("#Form").submit(); + } + function edit(Id){ window.top.modal.init({ 'title':'修改信息', @@ -231,6 +240,41 @@ function save(){ + } + + function del(Id){ + window.top.remove.init({"title":"删除","func":function(success){ + if(success){ + var all = typeof Id == "undefined" ? true : false; + var str = Id; + if(all){ + 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; + } + } + } + + $.ajax({ + type: "POST", + url: '<%=basePath%>teacher/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/resources/mybatis1/sunvote/StudentMapper.xml b/resources/mybatis1/sunvote/StudentMapper.xml index fdf4b2e..d6b3f97 100644 --- a/resources/mybatis1/sunvote/StudentMapper.xml +++ b/resources/mybatis1/sunvote/StudentMapper.xml @@ -95,6 +95,7 @@ where CLASS_ID = #{CLASS_ID} + order by (sv_student.NUMBER ) * 1,(sv_student.KEYPAD_ID * 1),(sv_student.SNO*1) diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java index 7169a48..9dbee6b 100644 --- a/src/com/fh/controller/sunvote/homework/HomeworkController.java +++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java @@ -689,6 +689,7 @@ public class HomeworkController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("HOMEWORK_ID", this.get32UUID()); + pd.put("SUBJECT_ID", homeworkService.querySubjectId(pd)); homeworkService.save(pd); ResponseGson responseGson = new ResponseGson(); responseGson.setData(pd.getString("HOMEWORK_ID")); @@ -711,6 +712,7 @@ public class HomeworkController extends BaseController { hpd.put("CODE", get32UUID()); hpd.put("NAME", homework.getNAME()); if(homework.getSUBJECT_ID() == null){ + pd.put("TEACHER_ID", homework.getTEACHER_ID()); List slist = homeworkService.querySubjectId(pd); if(slist.size() > 0){ homework.setSUBJECT_ID(slist.get(0).getString("SUBJECT_ID")); diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java index 39b7779..ed8443d 100644 --- a/src/com/fh/controller/sunvote/teacher/TeacherController.java +++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java @@ -25,6 +25,8 @@ import com.fh.controller.base.BaseController; import com.fh.entity.Page; import com.fh.service.api.V1Manager; import com.fh.service.sunvote.school.SchoolManager; +import com.fh.service.sunvote.subject.SubjectManager; +import com.fh.service.sunvote.subject.impl.SubjectService; import com.fh.service.sunvote.teacher.TeacherManager; import com.fh.service.system.fhlog.FHlogManager; import com.fh.service.system.user.UserManager; @@ -57,6 +59,8 @@ public class TeacherController extends BaseController { @Resource(name = "v1Service") private V1Manager v1Service; + @Resource(name="subjectService") + private SubjectManager subjectService; /** * 保存 * @@ -584,6 +588,11 @@ public class TeacherController extends BaseController { List schools = schoolService.listAll(pd); mv.addObject("schools", schools); + List subjects = subjectService.listAllSchool(pd); + mv.addObject("subjects", subjects); + + + mv.addObject("msg", "save2"); mv.addObject("pd", pd); return mv; @@ -624,6 +633,8 @@ public class TeacherController extends BaseController { mv.setViewName("sunvote/teacher/teacher_edit2"); List schools = schoolService.listAll(pd); mv.addObject("schools", schools); + List subjects = subjectService.listAllSchool(pd); + mv.addObject("subjects", subjects); mv.addObject("msg", "edit2"); mv.addObject("pd", pd); return mv; @@ -646,6 +657,8 @@ public class TeacherController extends BaseController { mv.setViewName("sunvote/teacher/teacher_edit3"); List schools = schoolService.listAll(pd); mv.addObject("schools", schools); + List subjects = subjectService.listAllSchool(pd); + mv.addObject("subjects", subjects); 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 5fa16f0..7225053 100644 --- a/src/com/fh/controller/system/login/LoginController.java +++ b/src/com/fh/controller/system/login/LoginController.java @@ -274,8 +274,8 @@ public class LoginController extends BaseController { }else if("admin".equals(changeMenu)){ PageData tpd = new PageData(); tpd.put("ID", user.getUSER_ID()); - String schoolId = "" ; PageData adminInfos = v1Service.getAdminInfo(tpd); + String schoolId = adminInfos.getString("SCHOOL_ID"); // 查询学校信息 Object tgradleId = "" ; -- libgit2 0.21.4