考生创建时新增班级

yiming
1 parent b1cb3067
Showing 3 changed files with 26 additions and 5 deletions
src/main/java/com/bsth/service/subject/impl/SubjectUserServiceImpl.java
src/main/resources/static/pages/subjectUser/selectSubject.html
src/main/resources/static/pages/subjectUser/subjectUserList.html
@@ -124,11 +124,17 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
         List<Map<String,Object>> results=new ArrayList<>();
         String date=map.get("date").toString();
         String userName=map.get("userName").toString();
+        String className=map.get("className").toString();
         try {
             List<String> users=new ArrayList<>();
             if(userName.equals("")){
                 SysUser loginUser = SecurityUtils.getCurrentUser();
-                List<SysUser> userList=sysUserRepository.findByParentID(String.valueOf(loginUser.getId()));;//根据教师id查询所属学生id
+                List<SysUser> userList;
+                if(className==null || "".equals(className)){
+                    userList= sysUserRepository.findByParentID(String.valueOf(loginUser.getId()));//根据教师id查询所属学生id
+                }else {
+                    userList= sysUserRepository.findByParentIDAndClassName(String.valueOf(loginUser.getId()),className);
+                }
                 for (SysUser user : userList) {
                     users.add(String.valueOf(user.getId()));
                 }
@@ -30,9 +30,7 @@
 				<form class="form-inline" action="">
 					<div class="form-group">
 						<span class="item-label">班级: </span>
-						<select class="form-control" name="className" id="className" style="width: 180px;">
-							<li class="select2-results__option" role="treeitem" >请选择</li>
-						</select>
+						<select class="form-control" name="className" id="className" style="width: 180px;"></select>
 					</div>
 					<div class="form-group">
 						<span class="item-label" >场景: </span>
@@ -154,6 +152,9 @@
 	function getClass(){
 		$.get('/user/classList',function(result){
 			var data=[];
+			if(firstLoad){
+				data.push({id: "请选择", text:"请选择"});
+			}
 			for(var code in result){
 				data.push({id: result[code], text: result[code]});
 			}
@@ -35,6 +35,10 @@
 						<span class="item-label" style="width: 80px;">学号: </span>
 						<select class="form-control" name="userName" id="userName" style="width: 180px;"></select>
 					</div>
+					<div style="display: inline-block;margin-left: 15px;">
+						<span class="item-label" style="width: 80px;">学号: </span>
+						<select class="form-control" name="className" id="className" style="width: 180px;"></select>
+					</div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询" style="margin-left: 2px;"/>
                     </div>
@@ -101,7 +105,8 @@
 		$("#query").on('click',function(){
 			var date = $("#date").val();
 			var userName = $("#userName").val()=='请选择'?'':$("#userName").val();
-		    $get('/subjectUser/subjectUserList',{date:date,userName:userName,type:'query'},function(result){
+			var className = $("#className").val()=='请选择'?'':$("#className").val();
+		    $get('/subjectUser/subjectUserList',{date:date,userName:userName,className:className,type:'query'},function(result){
 				var subjectUserList = template('subjectUserList',{list:result});
 				$('#forms tbody').html(subjectUserList);
 				$('.btn-subjectUserList').on('click', openSubjectUserList);
@@ -125,6 +130,15 @@
 				});
 			});
 		}
+
+		$.get('/user/classList',function(result){
+			var data=[];
+			data.push({id: "请选择", text:"请选择"});
+			for(var code in result){
+				data.push({id: result[code], text: result[code]});
+			}
+			initPinYinSelect2('#className',data,'');
+		})
 	});
 </script>
 <script type="text/html" id="subjectUserList">