修改教师不能删除的bug

孙向锦
1 parent 7674d9e4
Showing 6 changed files with 74 additions and 4 deletions
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
resources/mybatis1/sunvote/StudentMapper.xml
src/com/fh/controller/sunvote/homework/HomeworkController.java
src/com/fh/controller/sunvote/teacher/TeacherController.java
src/com/fh/controller/system/login/LoginController.java
@@ -78,6 +78,16 @@
 								<td><input type="text" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="width:98%;"/></td>
 							</tr>
 							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">所教科目:</td>
+								<td>
+									<select class="chosen-select form-control" name="SUBJECT_IDS" id="SUBJECT_IDS" data-placeholder="所教科目">
+									<c:forEach var="item" items="${subjects}">
+										<option value="${item.ID}"  <c:if test="${pd.SUBJECT_IDS==item.ID}">selected="true"</c:if>>${item.CNAME}</option>
+									</c:forEach>
+								</select>
+								</td>
+							</tr>
+							<tr>
 								<td style="text-align: center;" colspan="10">
 									<a class="btn btn-mini btn-primary" onclick="save();">保存</a>
 									<a class="btn btn-mini btn-danger" onclick="window.top.modal.remove();">取消</a>
@@ -47,7 +47,8 @@
 					<col style="width: 15%" />
 					<col style="width: 15%" />
 					<col style="width: 7%" />
-					<col style="width: 15%" />
+					<col style="width: 8%" />
+					<col style="width: 7%" />
 					<col style="width: 9%" />
 					<thead>
 						<tr>
@@ -59,6 +60,7 @@
 							<th class="center">账号</th>
 							<th class="center">性别</th>
 							<th class="center">教师卡编号</th>
+							<th class="center">科目</th>
 							<th class="center">操作</th>
 						</tr>
 					</thead>
@@ -74,7 +76,8 @@
 						<col style="width: 15%" />
 						<col style="width: 15%" />
 						<col style="width: 7%" />
-						<col style="width: 15%" />
+						<col style="width: 8%" />
+						<col style="width: 7%" />
 						<col style="width: 9%" />
 						<tbody>
 							<!-- 开始循环 -->
@@ -90,6 +93,7 @@
 											<td class='center'>${var.ACCOUT}</td>
 											<td class='center'>${var.SEX == 1? "男":"女"}</td>
 											<td class='center'>${var.KEYPAD_ID}</td>
+											<td class='center'>${myelfun:findSubjectCName(var.SUBJECT_IDS)}</td>
 											<td><a onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
 										</tr>
@@ -109,7 +113,7 @@
 					<input type="button"  onclick="add();" value="添加老师" />
 				</div>
 				<div class="removeAll">
-					<input type="button" onclick="deleteAll()" value="删除" />
+					<input type="button" onclick="del()" value="删除" />
 				</div>
 				<div class="page_box">
 					<div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
@@ -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();
 		}
 	</script>
@@ -95,6 +95,7 @@
 		<include refid="tableName"></include>
 		where 
 			CLASS_ID = #{CLASS_ID}
+		order by  (sv_student.NUMBER ) * 1,(sv_student.KEYPAD_ID * 1),(sv_student.SNO*1)
 	</select>
 	<!-- 通过ID获取数据 -->
@@ -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<String> responseGson = new ResponseGson<String>();
 		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<PageData> slist = homeworkService.querySubjectId(pd);
 				if(slist.size() > 0){
 					homework.setSUBJECT_ID(slist.get(0).getString("SUBJECT_ID"));
@@ -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<PageData> schools = schoolService.listAll(pd);
 		mv.addObject("schools", schools);
+		List<PageData> 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<PageData> schools = schoolService.listAll(pd);
 		mv.addObject("schools", schools);
+		List<PageData> 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<PageData> schools = schoolService.listAll(pd);
 		mv.addObject("schools", schools);
+		List<PageData> subjects = subjectService.listAllSchool(pd);
+		mv.addObject("subjects", subjects);
 		mv.addObject("msg", "edit2");
 		mv.addObject("pd", pd);
 		return mv;
@@ -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 = "" ;