Commit ed9ec1c23ade4efb5ae1fed9575c7410a03c717e
1 parent
ba3e036f
成绩查询 学号改为select2
Showing
5 changed files
with
10 additions
and
7 deletions
src/main/java/com/bsth/controller/sys/UserController.java
| ... | ... | @@ -304,7 +304,7 @@ public class UserController extends BaseController<SysUser, Integer> { |
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | @RequestMapping(value = "/userNameList") |
| 307 | - public List<String> userNameList() { | |
| 307 | + public List<Map<String,String>> userNameList() { | |
| 308 | 308 | return sysUserService.userNameList(); |
| 309 | 309 | } |
| 310 | 310 | ... | ... |
src/main/java/com/bsth/service/subject/impl/SubjectUserServiceImpl.java
| ... | ... | @@ -172,7 +172,7 @@ public class SubjectUserServiceImpl extends BaseServiceImpl<SubjectUser, Integer |
| 172 | 172 | result.put("userId",su.get("userId")); |
| 173 | 173 | result.put("rq",su.get("rq")); |
| 174 | 174 | result.put("name",su.get("name")); |
| 175 | - result.put("userName",su.get("name")); | |
| 175 | + result.put("userName",su.get("userName")); | |
| 176 | 176 | result.put("sum",sum); |
| 177 | 177 | result.put("t",t); |
| 178 | 178 | result.put("f",f); | ... | ... |
src/main/java/com/bsth/service/sys/SysUserService.java
src/main/java/com/bsth/service/sys/impl/SysUserServiceImpl.java
| ... | ... | @@ -182,11 +182,14 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUser, Integer> implem |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | @Override |
| 185 | - public List<String> userNameList(){ | |
| 186 | - List<String> users=new ArrayList<>(); | |
| 185 | + public List<Map<String,String>> userNameList(){ | |
| 186 | + List<Map<String,String>> users=new ArrayList<>(); | |
| 187 | 187 | List<SysUser> userList=sysUserRepository.findByParentID(String.valueOf(SecurityUtils.getCurrentUser().getId()));;//根据教师id查询所属学生id |
| 188 | 188 | for (SysUser user : userList) { |
| 189 | - users.add(String.valueOf(user.getUserName())); | |
| 189 | + Map<String,String> map=new HashMap<>(); | |
| 190 | + map.put("userName",String.valueOf(user.getUserName())); | |
| 191 | + map.put("name",user.getUserName()+"-"+user.getName()); | |
| 192 | + users.add(map); | |
| 190 | 193 | } |
| 191 | 194 | return users; |
| 192 | 195 | } | ... | ... |
src/main/resources/static/pages/subjectUser/subjectUserList.html
| ... | ... | @@ -93,7 +93,7 @@ |
| 93 | 93 | var data=[]; |
| 94 | 94 | data.push({id: "", text:"请选择"}); |
| 95 | 95 | for(var code in result){ |
| 96 | - data.push({id: result[code], text: result[code]}); | |
| 96 | + data.push({id: result[code].userName, text: result[code].userName}); | |
| 97 | 97 | } |
| 98 | 98 | initPinYinSelect2('#userName',data,''); |
| 99 | 99 | }) | ... | ... |