教师基本信息中班级添加年份

suser/src/main/java/com/xhkjedu/suser/controller/system/UserController.java

@@ -4,10 +4,10 @@ import com.alibaba.fastjson.JSON;
 import com.xhkjedu.suser.model.system.TUser;
 import com.xhkjedu.suser.service.system.UserService;
 import com.xhkjedu.suser.utils.UserUtil;
-import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.suser.vo.assess.AssessParams;
 import com.xhkjedu.suser.vo.system.TeacherVo;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.LinkedMultiValueMap;
@@ -37,159 +37,170 @@ public class UserController {
     private String ssourl;
 
     /**
-     *功能描述 登录接口--非学生
+     * 功能描述 登录接口--非学生
+     *
+     * @param * @param user
+     * @return com.xhkjedu.vo.ResultVo
      * @author WN
      * @date 2020/6/1
-     * @param  * @param user
-     * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/login")
-    public ResultVo login(@RequestBody TUser user,HttpServletRequest request){
+    public ResultVo login(@RequestBody TUser user, HttpServletRequest request) {
 //        if (N_Utils.isEmpty(user.getUltype())) return new ResultVo(1,"请更新新版本");
-        N_Utils.validation(new Object[]{user.getLoginname(),"登录名",2,user.getLoginpwd(),"登录密码",2});
+        N_Utils.validation(new Object[]{user.getLoginname(), "登录名", 2, user.getLoginpwd(), "登录密码", 2});
         if (user.getLoginname().length() > 18) return new ResultVo(1, "账号长度超过18个字符");
         Integer usertype = user.getUsertype();
         if (usertype != null && usertype == 2) {//学生登录
             return userService.loginStudent(user, request);
         } else {//教师、管理员登录
-            return userService.getUserByLoginnameAndPwd(user,request);
+            return userService.getUserByLoginnameAndPwd(user, request);
         }
     }
 
     //教师登录
     @PostMapping("/login_teacher")
-    public ResultVo loginTeacher(@RequestBody TUser user,HttpServletRequest request){
+    public ResultVo loginTeacher(@RequestBody TUser user, HttpServletRequest request) {
 //        if (N_Utils.isEmpty(user.getUltype())) return new ResultVo(1,"请更新新版本");
-        N_Utils.validation(new Object[]{user.getLoginname(),"登录名",2,user.getLoginpwd(),"登录密码",2});
+        N_Utils.validation(new Object[]{user.getLoginname(), "登录名", 2, user.getLoginpwd(), "登录密码", 2});
         if (user.getLoginname().length() > 18) return new ResultVo(1, "账号长度超过18个字符");
-        return userService.loginTeacher(user,request);
+        return userService.loginTeacher(user, request);
     }
 
     /**
-     *功能描述  登录--学生登录
+     * 功能描述  登录--学生登录
+     *
+     * @param * @param user
+     * @return com.xhkjedu.vo.ResultVo
      * @author WN
      * @date 2020/6/1
-     * @param  * @param user
-     * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/loginstu")
-    public ResultVo loginStudent(@RequestBody TUser user,HttpServletRequest request){
-        N_Utils.validation(new Object[]{user.getLoginname(),"登录名",2,user.getLoginpwd(),"登录密码",2});
+    public ResultVo loginStudent(@RequestBody TUser user, HttpServletRequest request) {
+        N_Utils.validation(new Object[]{user.getLoginname(), "登录名", 2, user.getLoginpwd(), "登录密码", 2});
         if (user.getLoginname().length() > 18) return new ResultVo(1, "账号长度超过18个字符");
-        return userService.loginStudent(user,request);
+        return userService.loginStudent(user, request);
     }
 
     /**
      * 添加用户信息
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 9:44
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/add")
-    public ResultVo add(@RequestBody TUser user){
+    public ResultVo add(@RequestBody TUser user) {
         return userService.save(user);
     }
 
     /**
      * 修改用户信息
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 9:51
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/update")
-    public ResultVo update(@RequestBody TUser user){
-        N_Utils.validation(new Object[]{user.getUserid(),"用户id",1});
+    public ResultVo update(@RequestBody TUser user) {
+        N_Utils.validation(new Object[]{user.getUserid(), "用户id", 1});
         return userService.update(user);
     }
 
     /**
      * 删除用户
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 9:59
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/delete")
-    public ResultVo delete(@RequestBody TUser user){
-        N_Utils.validation(new Object[]{user.getUserid(),"用户id",1,user.getDeleteid(),"删除人id",1});
+    public ResultVo delete(@RequestBody TUser user) {
+        N_Utils.validation(new Object[]{user.getUserid(), "用户id", 1, user.getDeleteid(), "删除人id", 1});
         return userService.deleteById(user);
     }
 
     /**
      * 获取用户列表
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 10:06
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/list")
-    public ResultVo list(@RequestBody TUser user){
-        N_Utils.validation(new Object[]{user.getPage(),"显示页码",1,user.getPageSize(),"显示条数",1,user.getSchoolid(),"学校id",1});
+    public ResultVo list(@RequestBody TUser user) {
+        N_Utils.validation(new Object[]{user.getPage(), "显示页码", 1, user.getPageSize(), "显示条数", 1, user.getSchoolid(), "学校id", 1});
         return userService.findAll(user);
     }
 
     /**
      * 获取用户详情
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 10:23
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/detail")
-    public ResultVo detail(@RequestBody TUser user){
+    public ResultVo detail(@RequestBody TUser user) {
         Integer userid = user.getUserid();
-        N_Utils.validation(new Object[]{userid,"用户id",1});
+        N_Utils.validation(new Object[]{userid, "用户id", 1});
         return userService.findById(userid);
     }
 
     /**
      * 修改用户密码
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 10:30
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/update_pwd")
-    public ResultVo updatePwd(@RequestBody TUser user){
-        N_Utils.validation(new Object[]{user.getUserid(),"用户id",1,user.getOldpwd(),"原密码",2,user.getLoginpwd(),"新密码",2});
+    public ResultVo updatePwd(@RequestBody TUser user) {
+        N_Utils.validation(new Object[]{user.getUserid(), "用户id", 1, user.getOldpwd(), "原密码", 2, user.getLoginpwd(), "新密码", 2});
         return userService.updatePwd(user);
     }
 
     /**
      * 修改用户头像
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 10:37
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/update_headpic")
-    public ResultVo updateHeadPic(@RequestBody TUser user){
-        N_Utils.validation(new Object[]{user.getUserid(),"用户id",1});
+    public ResultVo updateHeadPic(@RequestBody TUser user) {
+        N_Utils.validation(new Object[]{user.getUserid(), "用户id", 1});
         return userService.updateHeadPic(user);
     }
 
     /**
      * 检查登录账号是否存在
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 10:43
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/check_loginname")
-    public ResultVo checkLoginName(@RequestBody TUser user){
+    public ResultVo checkLoginName(@RequestBody TUser user) {
         String loginname = user.getLoginname();
-        N_Utils.validation(new Object[]{loginname,"登录名",2});
+        N_Utils.validation(new Object[]{loginname, "登录名", 2});
         return userService.checkLoginName(loginname);
     }
 
     /**
      * 导入教师
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [file, user]
      * @Author ywx
      * @Date 2020/6/5 8:42
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/import_teacher")
     public ResultVo importTeacher(MultipartFile file, TUser user) {
@@ -197,152 +208,161 @@ public class UserController {
     }
 
     /**
-     *功能描述  设置操作密码
+     * 功能描述  设置操作密码
+     *
+     * @param * @param user
+     * @return com.xhkjedu.vo.ResultVo
      * @author WN
      * @date 2020/6/17
-     * @param  * @param user
-     * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/update_opepass")
-    public ResultVo updateOpepass(@RequestBody TUser user){
+    public ResultVo updateOpepass(@RequestBody TUser user) {
         N_Utils.validation(new Object[]{
-                user.getUserid(),"用户id",1,
-                user.getOpepassword(),"操作密码",2
+                user.getUserid(), "用户id", 1,
+                user.getOpepassword(), "操作密码", 2
         });
         userService.updateOpepasswordByUserId(user);
-        return new ResultVo(0,"设置操作密码成功");
+        return new ResultVo(0, "设置操作密码成功");
     }
 
     /**
-     *功能描述  验证操作密码是否正确
+     * 功能描述  验证操作密码是否正确
+     *
+     * @param * @param user
+     * @return com.xhkjedu.vo.ResultVo
      * @author WN
      * @date 2020/6/17
-     * @param  * @param user
-     * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/validate_opepass")
-    public ResultVo validateOpepass(@RequestBody TUser user){
+    public ResultVo validateOpepass(@RequestBody TUser user) {
         N_Utils.validation(new Object[]{
-                user.getUserid(),"用户id",1,
-                user.getOpepassword(),"操作密码",2
+                user.getUserid(), "用户id", 1,
+                user.getOpepassword(), "操作密码", 2
         });
         Integer result = userService.getUserIdByOpepassword(user);
-        if(result==1){
-            return new ResultVo(0,"操作密码验证成功");
-        }else{
-            return new ResultVo(1,"操作密码输入有误");
+        if (result == 1) {
+            return new ResultVo(0, "操作密码验证成功");
+        } else {
+            return new ResultVo(1, "操作密码输入有误");
         }
 
     }
 
     /**
      * 教师基本信息
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/29 16:23
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/teacher_info")
-    public ResultVo teacherInfo(@RequestBody TUser user){
+    public ResultVo teacherInfo(@RequestBody TUser user) {
         Integer userid = user.getUserid();
-        N_Utils.validation(new Object[]{userid,"用户id",1});
-        TeacherVo teacherVo = userService.getTeacherInfo(userid, user.getClasstype());
-        return new ResultVo(0,"获取教师基本信息成功",teacherVo);
+        N_Utils.validation(new Object[]{userid, "用户id", 1, user.getSchoolid(), "学校id", 1});
+        TeacherVo teacherVo = userService.getTeacherInfo(user.getSchoolid(), userid, user.getClasstype());
+        return new ResultVo(0, "获取教师基本信息成功", teacherVo);
     }
 
     /**
      * 重置密码
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/7/30 14:25
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/reset_pwd")
-    public ResultVo resetPwd(@RequestBody TUser user){
-        N_Utils.validation(new Object[]{user.getUserid(),"用户id",1,user.getLoginpwd(),"密码",2});
+    public ResultVo resetPwd(@RequestBody TUser user) {
+        N_Utils.validation(new Object[]{user.getUserid(), "用户id", 1, user.getLoginpwd(), "密码", 2});
         return userService.resetPwd(user);
     }
 
     /**
      * 生成修改码
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/10/13 15:08
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/update_code")
     public ResultVo updateCode(@RequestBody TUser user) {
         String userphone = user.getUserphone();
-        N_Utils.validation(new Object[]{userphone,"手机号",2});
+        N_Utils.validation(new Object[]{userphone, "手机号", 2});
         return userService.updateCode(userphone);
     }
 
     /**
      * 通过短信修改密码
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/10/13 15:12
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/update_pwd_byCode")
     public ResultVo updatePwdByCode(@RequestBody TUser user) {
         String userphone = user.getUserphone();
         String loginpwd = user.getLoginpwd();
         Integer msgcode = user.getMsgcode();
-        N_Utils.validation(new Object[]{userphone,"手机号",2,loginpwd,"密码",2,msgcode,"验证码",1});
+        N_Utils.validation(new Object[]{userphone, "手机号", 2, loginpwd, "密码", 2, msgcode, "验证码", 1});
         return userService.updatePwdByCode(user);
     }
 
     /**
      * 生成登录确认码
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/10/13 15:18
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/login_code")
     public ResultVo loginCode(@RequestBody TUser user) {
         String userphone = user.getUserphone();
-        N_Utils.validation(new Object[]{userphone,"手机号",2});
+        N_Utils.validation(new Object[]{userphone, "手机号", 2});
         return userService.loginCode(userphone);
     }
 
     /**
      * 验证码登录
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/10/13 15:35
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/login_byCode")
-    public ResultVo loginByCode(@RequestBody TUser user,HttpServletRequest request) {
-        if (N_Utils.isEmpty(user.getUltype())) return new ResultVo(1,"请更新新版本");
+    public ResultVo loginByCode(@RequestBody TUser user, HttpServletRequest request) {
+        if (N_Utils.isEmpty(user.getUltype())) return new ResultVo(1, "请更新新版本");
         String userphone = user.getUserphone();
         Integer msgcode = user.getMsgcode();
-        N_Utils.validation(new Object[]{userphone,"手机号",2,msgcode,"验证码",1});
+        N_Utils.validation(new Object[]{userphone, "手机号", 2, msgcode, "验证码", 1});
         return userService.loginByCode(user, request);
     }
 
     /**
      * 批量修改用户密码
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/10/30 16:04
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/batch_update_pwd")
-    public ResultVo batchUpdatePwd(@RequestBody TUser user){
-        N_Utils.validation(new Object[]{user.getSchoolid(),"学校id",1,user.getLoginpwd(),"新密码",2});
-        if (N_Utils.isListEmpty(user.getUsertypes())) return new ResultVo(1,"用户类型集合不能为空");
+    public ResultVo batchUpdatePwd(@RequestBody TUser user) {
+        N_Utils.validation(new Object[]{user.getSchoolid(), "学校id", 1, user.getLoginpwd(), "新密码", 2});
+        if (N_Utils.isListEmpty(user.getUsertypes())) return new ResultVo(1, "用户类型集合不能为空");
         return userService.batchUpdatePwd(user);
     }
 
     //校验登录状态成功
     @PostMapping("/check_login")
-    public ResultVo checkLogin(@RequestBody TUser user){
+    public ResultVo checkLogin(@RequestBody TUser user) {
         Integer userid = user.getUserid();
         String loginpwd = user.getLoginpwd();
-        N_Utils.validation(new Object[]{userid,"用户id",1,loginpwd,"登录密码",2});
+        N_Utils.validation(new Object[]{userid, "用户id", 1, loginpwd, "登录密码", 2});
         return userService.checkLogin(userid, loginpwd);
     }
 
@@ -357,30 +377,31 @@ public class UserController {
 
     /**
      * 用户名登录
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user, request]
      * @Author ywx
      * @Date 2021/11/18 9:52
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/login_byName")
-    public ResultVo loginByName(@RequestBody TUser user,HttpServletRequest request) {
+    public ResultVo loginByName(@RequestBody TUser user, HttpServletRequest request) {
         String loginname = user.getLoginname();
-        N_Utils.validation(new Object[]{loginname,"token",2});
+        N_Utils.validation(new Object[]{loginname, "token", 2});
         MultiValueMap<String, String> param = new LinkedMultiValueMap<>();
-        param.add("token",loginname);
+        param.add("token", loginname);
         String str = UserUtil.sendFormData(ssourl, param);
         ResultVo result = JSON.parseObject(str, ResultVo.class);
         if (result.getCode() != 0) return result;
-        Map map = JSON.parseObject(result.getObj().toString(),Map.class);
+        Map map = JSON.parseObject(result.getObj().toString(), Map.class);
         user.setLoginname(map.get("loginname").toString());
         return userService.loginByName(user, request);
     }
 
     @PostMapping("/get_headtime")
-    public ResultVo getHeadTime(@RequestBody TUser user){
+    public ResultVo getHeadTime(@RequestBody TUser user) {
         Integer userid = user.getUserid();
-        N_Utils.validation(new Object[]{userid,"用户id",1});
+        N_Utils.validation(new Object[]{userid, "用户id", 1});
         Integer headtime = userService.getHeadTime(userid);
-        return new ResultVo(0,"获取头像是否可以修改成功",headtime);
+        return new ResultVo(0, "获取头像是否可以修改成功", headtime);
     }
 }

suser/src/main/java/com/xhkjedu/suser/mapper/system/UserMapper.java

@@ -21,148 +21,164 @@ import java.util.Map;
 public interface UserMapper extends TkMapper<TUser> {
 
     /**
-     *功能描述  根据帐号密码获取用户
+     * 功能描述  根据帐号密码获取用户
+     *
+     * @param * @param loginname
+     * @return com.xhkjedu.model.system.TUser
      * @author WN
      * @date 2020/5/29
-     * @param  * @param loginname
-     * @return com.xhkjedu.model.system.TUser
      */
     UserVo getUserByLoginname(String loginname);
 
     /**
      * 删除用户
+     *
+     * @return java.lang.Integer
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 9:59
-     * @return java.lang.Integer
      **/
     Integer deleteById(@Param("user") TUser user);
 
     /**
      * 获取用户列表
+     *
+     * @return java.util.List<com.xhkjedu.suser.vo.system.UserVo>
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 10:07
-     * @return java.util.List<com.xhkjedu.suser.vo.system.UserVo>
      **/
     List<UserVo> findAll(@Param("user") TUser user);
 
     /**
      * 获取用户详情
+     *
+     * @return com.xhkjedu.suser.vo.system.UserVo
      * @Param [userid]
      * @Author ywx
      * @Date 2020/6/2 10:23
-     * @return com.xhkjedu.suser.vo.system.UserVo
      **/
     UserVo findById(@Param("userid") Integer userid);
 
     /**
      * 修改用户密码
+     *
+     * @return java.lang.Integer
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 10:30
-     * @return java.lang.Integer
      **/
     Integer updatePwd(@Param("user") TUser user);
 
     /**
      * 修改用户头像
+     *
+     * @return java.lang.Integer
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 10:36
-     * @return java.lang.Integer
      **/
     Integer updateHeadPic(@Param("user") TUser user);
 
     /**
      * 检查登录账号是否存在
+     *
+     * @return java.lang.Integer
      * @Param [loginname]
      * @Author ywx
      * @Date 2020/6/2 10:44
-     * @return java.lang.Integer
      **/
     Integer checkLoginName(@Param("loginname") String loginname);
 
     /**
      * 根据登录账号获取用户详情
+     *
+     * @return com.xhkjedu.model.system.TUser
      * @Param [loginname]
      * @Author ywx
      * @Date 2020/6/3 9:33
-     * @return com.xhkjedu.model.system.TUser
      **/
     TUser getObjByLoginName(@Param("loginname") String loginname);
 
     /**
      * 修改用户状态
+     *
+     * @return void
      * @Param [userid, userstate]
      * @Author ywx
      * @Date 2020/6/4 9:08
-     * @return void
      **/
-    void updateState(@Param("userid") Integer userid,@Param("userstate") int userstate);
+    void updateState(@Param("userid") Integer userid, @Param("userstate") int userstate);
 
     /**
-     *功能描述 设置操作密码
-     * @author WN
-     * @date 2020/6/17
-     * @param  * @param userid
+     * 功能描述 设置操作密码
+     *
+     * @param *           @param userid
      * @param opepassword
      * @return void
+     * @author WN
+     * @date 2020/6/17
      */
-    void updateOpepasswordByUserId(@Param("userid") Integer userid,@Param("opepassword") String opepassword);
+    void updateOpepasswordByUserId(@Param("userid") Integer userid, @Param("opepassword") String opepassword);
 
     /**
-     *功能描述 验证用户操作密码是否正确
-     * @author WN
-     * @date 2020/6/17
-     * @param  * @param userid
+     * 功能描述 验证用户操作密码是否正确
+     *
+     * @param *           @param userid
      * @param opepassword
      * @return java.lang.Integer
+     * @author WN
+     * @date 2020/6/17
      */
-    Integer getUserIdByOpepassword(@Param("userid") Integer userid,@Param("opepassword") String opepassword);
+    Integer getUserIdByOpepassword(@Param("userid") Integer userid, @Param("opepassword") String opepassword);
 
     /**
      * 教师基本信息
+     *
+     * @return com.xhkjedu.suser.vo.system.TeacherVo
      * @Param [userid]
      * @Author ywx
      * @Date 2020/6/29 16:24
-     * @return com.xhkjedu.suser.vo.system.TeacherVo
      **/
-    TeacherVo getTeacherInfo(Integer userid, Integer classtype);
+    TeacherVo getTeacherInfo(Integer userid, Integer classtype, Integer year);
 
     /**
      * 更新学生硬件绑定信息
+     *
+     * @return void
      * @Param [user]
      * @Author ywx
      * @Date 2020/9/18 11:38
-     * @return void
      **/
     void updateBindMac(@Param("user") UserVo user);
 
     /**
      * 根据登录账号和硬件地址获取用户信息
+     *
+     * @return com.xhkjedu.suser.vo.system.UserVo
      * @Param [loginname, mac]
      * @Author ywx
      * @Date 2020/9/21 16:17
-     * @return com.xhkjedu.suser.vo.system.UserVo
      **/
     UserVo getUserByLoginnameMac(String loginname, String mac);
 
     /**
      * 通过短信修改密码
+     *
+     * @return void
      * @Param [user]
      * @Author ywx
      * @Date 2020/10/13 15:17
-     * @return void
      **/
     void updatePwdByCode(@Param("user") TUser user);
 
     /**
      * 批量修改用户密码
+     *
+     * @return void
      * @Param [user]
      * @Author ywx
      * @Date 2020/10/30 16:04
-     * @return void
      **/
     void batchUpdatePwd(@Param("user") TUser user);
 

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -459,16 +459,16 @@ public class UserService extends JedisUtil {
         Integer createid = tUser.getCreateid();
         N_Utils.validation(new Object[]{schoolid, "学校id", 1, createid, "创建人id", 1});
         try {
-            Map<Integer, Map<String,Integer>> gclasses = new HashMap<>();//年级下班级集合
+            Map<Integer, Map<String, Integer>> gclasses = new HashMap<>();//年级下班级集合
             List<Map> classes = classMapper.listClass(schoolid, 1);
-            Map<Integer, List<Map>> grades = classes.stream().collect(Collectors.groupingBy(c->(Integer) c.get("gradeid")));
+            Map<Integer, List<Map>> grades = classes.stream().collect(Collectors.groupingBy(c -> (Integer) c.get("gradeid")));
             for (Map.Entry<Integer, List<Map>> g : grades.entrySet()) {
-                Map<String,Integer> cmap = new HashMap<>();
+                Map<String, Integer> cmap = new HashMap<>();
                 List<Map> list = g.getValue();
                 for (Map m : list) {
-                    cmap.put(m.get("classname").toString(),(Integer) m.get("classid"));
+                    cmap.put(m.get("classname").toString(), (Integer) m.get("classid"));
                 }
-                gclasses.put(g.getKey(),cmap);
+                gclasses.put(g.getKey(), cmap);
             }
 
             Map<String, Object> map = PoiUtils.readExcelTeacher(file, gclasses);
@@ -500,7 +500,7 @@ public class UserService extends JedisUtil {
                 //处理用户班级
                 //先删除任教班级
                 Integer year = schoolMapper.getYearById(schoolid);
-                classTeacherMapper.deleteByUserid(userid,year);
+                classTeacherMapper.deleteByUserid(userid, year);
 
                 Integer grageid = user.getGrageid();
                 if (N_Utils.isEmptyInteger(grageid)) continue;//年级为空处理下一条数据
@@ -575,8 +575,9 @@ public class UserService extends JedisUtil {
      * @Author ywx
      * @Date 2020/6/29 16:23
      **/
-    public TeacherVo getTeacherInfo(Integer userid, Integer classtype) {
-        return userMapper.getTeacherInfo(userid, classtype);
+    public TeacherVo getTeacherInfo(Integer schoolid, Integer userid, Integer classtype) {
+        Integer year = schoolMapper.getYearById(schoolid);
+        return userMapper.getTeacherInfo(userid, classtype, year);
     }
 
     /**

suser/src/main/resources/mapper/system/UserMapper.xml

@@ -90,7 +90,7 @@
         <result property="headpic" column="headpic"></result>
         <result property="subjectname" column="subjectname"></result>
         <collection property="classlist" ofType="com.xhkjedu.suser.vo.gradeclass.ClassVo"
-                    javaType="java.util.List" select="listTeacherClass" column="{userid=userid,classtype=classtype}">
+                    javaType="java.util.List" select="listTeacherClass" column="{userid=userid,classtype=classtype,year=year}">
         </collection>
     </resultMap>
 
@@ -103,7 +103,7 @@
     <select id="listTeacherClass" resultMap="teacherClass">
         select c.classid,c.classname,c.gradeid from t_class c
         left join t_class_teacher ct on c.classid=ct.classid
-        where ct.teacherid=#{userid} and c.classstate=1
+        where ct.teacherid=#{userid} and c.classstate=1 and c.year=#{year}
         <if test="classtype!=null and classtype!=0">
             <if test="classtype!=11">and c.classtype=#{classtype}</if>
             <if test="classtype==11">and c.classtype in(1,2)</if>
@@ -117,7 +117,7 @@
     <!--教师基本信息-->
     <select id="getTeacherInfo" resultMap="teacherInfoMap">
         select u.userid,u.username,u.headpic,group_concat(distinct s.subjectname order by s.subjectorder)subjectname
-        ,#{classtype} classtype,u.usertime
+        ,#{classtype} classtype,u.usertime,#{year} year
         from t_user u
         left join t_teacher_powersb ts on u.userid = ts.teacherid
         left join t_subject_book sb on ts.lsbid=sb.lsbid