Merge remote-tracking branch 'cloud-schoolapi/ywx'

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

@@ -258,4 +258,7 @@ public interface UserMapper extends TkMapper<TUser> {
 
     //批量更新用户信息
     void batchUpdateUser(@Param("users") List<TUser> users);
+
+    //更新学生信息
+    void updateStudent(@Param("user") TUser user);
 }

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/ClassStudentService.java

@@ -218,6 +218,7 @@ public class ClassStudentService {
                             throw new Exception("准考证号长度不符合要求");
                         }
                     }
+                    if (examno.equals("")) examno = null;
                     stu.setExamno(examno);
                     Integer userid = user.getUserid();
                     stu.setUserid(userid);
@@ -310,6 +311,7 @@ public class ClassStudentService {
         user.setLoginpwd(N_Utils.getMD5Pwd("123456"));
         user.setUsersex(model.getUsersex());
         user.setStudentno(model.getStudentno());
+        if (examno.equals("")) examno = null;
         user.setExamno(examno);
         user.setCreateid(model.getCreateid());
         user.setSchoolid(schoolid);
@@ -396,7 +398,7 @@ public class ClassStudentService {
         }
         String examno = model.getExamno();
         if (N_Utils.isNotEmpty(examno)) {
-            TSchool school = schoolMapper.getSchoolInfoById(u.getSchoolid());
+            TSchool school = schoolMapper.getSchoolInfoByUserid(model.getStudentid());
             Integer limitenolen = school.getLimitenolen();
             if (!N_Utils.isEmptyInteger(limitenolen) && !limitenolen.equals(examno.length())) {
                 return new ResultVo(1, "准考证号长度不符合要求");
@@ -408,6 +410,7 @@ public class ClassStudentService {
         user.setUsersex(model.getUsersex());
         user.setUsername(model.getStudentname());
         user.setStudentno(model.getStudentno());
+        if (examno.equals("")) examno = null;
         user.setExamno(examno);
         user.setLoginname(model.getStudentno());
         user.setUserphone(model.getUserphone());
@@ -429,7 +432,7 @@ public class ClassStudentService {
             user.setUsertime(null);
         }
         user.setCreatetime(N_Utils.getSecondTimestamp());
-        userMapper.updateByPrimaryKeySelective(user);
+        userMapper.updateStudent(user);
         return new ResultVo(0, "修改成功");
     }
 

suser/src/main/resources/mapper/gradeclass/SchoolMapper.xml

@@ -17,11 +17,11 @@
 
     <!--更加用户id获取当前学校id和年份-->
     <select id="getSchoolInfoByUserid" resultType="com.xhkjedu.suser.model.gradeclass.TSchool">
-        select s.schoolid,s.year from t_user u left join t_school s on u.schoolid=s.schoolid
+        select s.schoolid,s.year,limitenolen from t_user u left join t_school s on u.schoolid=s.schoolid
         where u.userid=#{userid}
     </select>
     <!--获取学校基本信息-->
     <select id="getSchoolInfoById" resultType="com.xhkjedu.suser.model.gradeclass.TSchool">
-        select usernum,limitenolen from t_school where schoolid=#{schoolid}
+        select usernum,limitenolen,schoolname from t_school where schoolid=#{schoolid}
     </select>
 </mapper>

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

@@ -298,4 +298,12 @@
             where userid=#{u.userid}
         </foreach>
     </update>
+    <!--更新学生信息-->
+    <update id="updateStudent">
+        update t_user set username=#{user.username},loginname=#{user.loginname},studentno=#{user.studentno},examno=#{user.examno}
+        ,usertime =#{user.usertime},createtime=#{user.createtime},usersex=#{user.usersex}
+        <if test="user.userphone!=null and user.userphone!=''">,userphone =#{user.userphone}</if>
+        <if test="user.bindphoned!=null">,bindphoned =#{user.bindphoned}</if>
+        where userid=#{user.userid}
+    </update>
 </mapper>