预报名、启蒙问卷、报名注册逻辑修改

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/BaseStudentDto.java

@@ -31,6 +31,17 @@ public class BaseStudentDto extends BaseEntity {
     @ApiModelProperty("班级")
     private String currentClass;
 
+    /** 性别 */
+    private Integer gender;
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPreRegistration.java

@@ -13,9 +13,6 @@ public class StudentPreRegistration extends BaseStudentDto {
 	private String musicGroupId;
 	
 	private String school;
-	
-	/** 性别 */
-	private boolean gender;
 
 	/** 第一专业 */
 	private Integer subjectFirst;
@@ -65,14 +62,6 @@ public class StudentPreRegistration extends BaseStudentDto {
 		this.school = school;
 	}
 
-	public void setGender(boolean gender){
-		this.gender = gender;
-	}
-	
-	public boolean isGender(){
-		return this.gender;
-	}
-			
 	public void setSubjectFirst(Integer subjectFirst){
 		this.subjectFirst = subjectFirst;
 	}

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

@@ -1198,11 +1198,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         SysUser user = studentDao.getUserByPhone(baseStudent.getPhone());
         if (user == null || user.getId() == null) {
             user = new SysUser();
-            user.setPhone(baseStudent.getPhone());
+            BeanUtils.copyProperties(baseStudent,user);
             user.setUsername(baseStudent.getUserName());
-            user.setOrganId(baseStudent.getOrganId());
             user.setUserType("STUDENT");
-            user.setTenantId(baseStudent.getTenantId());
             // 注册账户信息
             teacherDao.addSysUser(user);
             Integer userId = user.getId();