潘钊 / bsth_control · Commits

Commit ed90f9e52e0a53e35cf9b0e09aad5799499e0c0d

Authored by yiming
1 parent b1cb3067
build: skipped

考生创建时新增班级

Inline Side-by-side
Showing 3 changed files with 26 additions and 5 deletions
src/main/java/com/bsth/service/subject/impl/SubjectUserServiceImpl.java
  View file @ed90f9e
... ... @@ -124,11 +124,17 @@ public class SubjectUserServiceImpl extends BaseServiceImpl<SubjectUser, Integer
124 124 List<Map<String,Object>> results=new ArrayList<>();
125 125 String date=map.get("date").toString();
126 126 String userName=map.get("userName").toString();
  127 + String className=map.get("className").toString();
127 128 try {
128 129 List<String> users=new ArrayList<>();
129 130 if(userName.equals("")){
130 131 SysUser loginUser = SecurityUtils.getCurrentUser();
131   - List<SysUser> userList=sysUserRepository.findByParentID(String.valueOf(loginUser.getId()));;//根据教师id查询所属学生id
  132 + List<SysUser> userList;
  133 + if(className==null || "".equals(className)){
  134 + userList= sysUserRepository.findByParentID(String.valueOf(loginUser.getId()));//根据教师id查询所属学生id
  135 + }else {
  136 + userList= sysUserRepository.findByParentIDAndClassName(String.valueOf(loginUser.getId()),className);
  137 + }
132 138 for (SysUser user : userList) {
133 139 users.add(String.valueOf(user.getId()));
134 140 }
... ...
src/main/resources/static/pages/subjectUser/selectSubject.html
  View file @ed90f9e
... ... @@ -30,9 +30,7 @@
30 30 <form class="form-inline" action="">
31 31 <div class="form-group">
32 32 <span class="item-label">班级: </span>
33   - <select class="form-control" name="className" id="className" style="width: 180px;">
34   - <li class="select2-results__option" role="treeitem" >请选择</li>
35   - </select>
  33 + <select class="form-control" name="className" id="className" style="width: 180px;"></select>
36 34 </div>
37 35 <div class="form-group">
38 36 <span class="item-label" >场景: </span>
... ... @@ -154,6 +152,9 @@
154 152 function getClass(){
155 153 $.get('/user/classList',function(result){
156 154 var data=[];
  155 + if(firstLoad){
  156 + data.push({id: "请选择", text:"请选择"});
  157 + }
157 158 for(var code in result){
158 159 data.push({id: result[code], text: result[code]});
159 160 }
... ...
src/main/resources/static/pages/subjectUser/subjectUserList.html
  View file @ed90f9e
... ... @@ -35,6 +35,10 @@
35 35 <span class="item-label" style="width: 80px;">学号: </span>
36 36 <select class="form-control" name="userName" id="userName" style="width: 180px;"></select>
37 37 </div>
  38 + <div style="display: inline-block;margin-left: 15px;">
  39 + <span class="item-label" style="width: 80px;">学号: </span>
  40 + <select class="form-control" name="className" id="className" style="width: 180px;"></select>
  41 + </div>
38 42 <div class="form-group">
39 43 <input class="btn btn-default" type="button" id="query" value="查询" style="margin-left: 2px;"/>
40 44 </div>
... ... @@ -101,7 +105,8 @@
101 105 $("#query").on('click',function(){
102 106 var date = $("#date").val();
103 107 var userName = $("#userName").val()=='请选择'?'':$("#userName").val();
104   - $get('/subjectUser/subjectUserList',{date:date,userName:userName,type:'query'},function(result){
  108 + var className = $("#className").val()=='请选择'?'':$("#className").val();
  109 + $get('/subjectUser/subjectUserList',{date:date,userName:userName,className:className,type:'query'},function(result){
105 110 var subjectUserList = template('subjectUserList',{list:result});
106 111 $('#forms tbody').html(subjectUserList);
107 112 $('.btn-subjectUserList').on('click', openSubjectUserList);
... ... @@ -125,6 +130,15 @@
125 130 });
126 131 });
127 132 }
  133 +
  134 + $.get('/user/classList',function(result){
  135 + var data=[];
  136 + data.push({id: "请选择", text:"请选择"});
  137 + for(var code in result){
  138 + data.push({id: result[code], text: result[code]});
  139 + }
  140 + initPinYinSelect2('#className',data,'');
  141 + })
128 142 });
129 143 </script>
130 144 <script type="text/html" id="subjectUserList">
... ...