update

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -99,12 +99,34 @@ public class SysUser implements Serializable{
 	@ApiModelProperty(value = "真实姓名",required = false)
 	private String realName;
 
+	@ApiModelProperty(value = "年级",required = false)
+	private String currentGrade;
+
+	@ApiModelProperty(value = "班级",required = false)
+	private String currentClass;
+
 	@ApiModelProperty(value = "微信号",required = false)
 	private String wechatId;
 	
 	@ApiModelProperty(value = "是否是超管",required = false)
 	private Boolean isSuperAdmin;
 
+	public String getCurrentGrade() {
+		return currentGrade;
+	}
+
+	public void setCurrentGrade(String currentGrade) {
+		this.currentGrade = currentGrade;
+	}
+
+	public String getCurrentClass() {
+		return currentClass;
+	}
+
+	public void setCurrentClass(String currentClass) {
+		this.currentClass = currentClass;
+	}
+
 	public String getOrganName() {
 		return organName;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -278,4 +278,10 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @return
      */
     StudentRegistration queryUserByPhone(String mobile);
+
+    /**
+     * 批量修改学生年级班级
+     * @param studentRegistration
+     */
+    void updateCurrentClass(StudentRegistration studentRegistration);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -4,12 +4,15 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.StudentManageService;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.util.collection.MapUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +33,8 @@ public class StudentManageServiceImpl implements StudentManageService {
     @Autowired
     private StudentManageDao studentManageDao;
     @Autowired
+    private StudentRegistrationDao studentRegistrationDao;
+    @Autowired
     private ClassGroupDao classGroupDao;
     @Autowired
     private StudentPaymentOrderDao studentPaymentOrderDao;
@@ -230,6 +235,14 @@ public class StudentManageServiceImpl implements StudentManageService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateUser(SysUser sysUser) {
+        if(StringUtils.isEmpty(sysUser.getCurrentClass()) || StringUtils.isEmpty(sysUser.getCurrentGrade())){
+            throw new BizException("年级班级不能为空");
+        }
         studentManageDao.updateUser(sysUser);
+        StudentRegistration studentRegistration = new StudentRegistration();
+        studentRegistration.setUserId(sysUser.getId());
+        studentRegistration.setCurrentClass(sysUser.getCurrentClass());
+        studentRegistration.setCurrentGrade(sysUser.getCurrentGrade());
+        studentRegistrationDao.updateCurrentClass(studentRegistration);
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -205,6 +205,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentRegistration.setCreateTime(date);
         studentRegistration.setUpdateTime(date);
         studentRegistration.setUserId(sysUser.getId());
+        studentRegistrationDao.updateCurrentClass(studentRegistration);
         studentRegistrationDao.insert(studentRegistration);
         //增加报名学生数
         musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId(), 1);
@@ -520,6 +521,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                     studentPaymentOrderDetailService.batchAdd(studentPaymentOrderDetails);
                 }
             }
+            studentRegistrationDao.updateCurrentClass(studentRegistration);
             return userId;
         }
     }

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -539,4 +539,8 @@
     <update id="updateUser">
         UPDATE sys_user SET real_name_ = #{realName},id_card_no_=#{idCardNo} WHERE id_=#{id}
     </update>
+    <update id="updateCurrentClass" parameterType="com.ym.mec.biz.dal.entity.StudentRegistration">
+        UPDATE student_registration sr SET sr.current_grade_ = #{currentGrade},sr.current_class_ = #{currentClass},sr.update_time_ = NOW()
+        WHERE sr.user_id_ = #{userId}
+    </update>
 </mapper>