fengji 修复预报名添加字段错误

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

@@ -84,7 +84,7 @@ public class Student extends SysUser {
 	private String parentName;
 
 	@ApiModelProperty(value = "备注")
-	private String remake;
+	private String remark;
 
 	@ApiModelProperty(value = "单位名称")
 	private String unitName;
@@ -326,12 +326,12 @@ public class Student extends SysUser {
 		this.parentName = parentName;
 	}
 
-	public String getRemake() {
-		return remake;
+	public String getRemark() {
+		return remark;
 	}
 
-	public void setRemake(String remake) {
-		this.remake = remake;
+	public void setRemark(String remark) {
+		this.remark = remark;
 	}
 
 	public String getUnitName() {

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

@@ -43,7 +43,7 @@ public class StudentPreRegistration extends BaseStudentDto {
 	private String parentName;
 
 	/** 备注 */
-	private String remake;
+	private String remark;
 
 	/** 单位名称 */
 	private String unitName;
@@ -158,11 +158,11 @@ public class StudentPreRegistration extends BaseStudentDto {
 	}
 
 	public String getRemake() {
-		return remake;
+		return remark;
 	}
 
 	public void setRemake(String remake) {
-		this.remake = remake;
+		this.remark = remark;
 	}
 
 	public String getUnitName() {

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

@@ -147,14 +147,23 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         		throw new BizException("您已注册，请直接下载APP！");
         	}
         	userId = user.getId();
-        	user.setOrganId(studentPreRegistration.getOrganId());
+            if (studentPreRegistration.getOrganId() != null) {
+                user.setOrganId(studentPreRegistration.getOrganId());
+            }
+            if (studentPreRegistration.getParentName() != null) {
+                user.setRealName(studentPreRegistration.getParentName());
+            }
+            if (studentPreRegistration.getUserName() != null) {
+                user.setUsername(studentPreRegistration.getUserName());
+            }
             user.setUpdateTime(date);
             teacherDao.updateUser(user);
         }else{
         	user = new SysUser();
             user.setPhone(studentPreRegistration.getPhone());
-            user.setUsername(studentPreRegistration.getUserName());
             user.setOrganId(studentPreRegistration.getOrganId());
+            user.setRealName(studentPreRegistration.getParentName());
+            user.setUsername(studentPreRegistration.getUserName());
             user.setUserType("STUDENT");
             user.setCreateTime(date);
             user.setUpdateTime(date);
@@ -173,9 +182,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         student.setSchoolName(studentPreRegistration.getSchool());
         student.setCurrentGradeNum(studentPreRegistration.getCurrentGradeNum());
         student.setCurrentClass(studentPreRegistration.getCurrentClass());
-        student.setOrganId(studentPreRegistration.getOrganId());
-        student.setParentName(studentPreRegistration.getParentName());
-        student.setRemake(studentPreRegistration.getRemake());
+        student.setRemark(studentPreRegistration.getRemake());
         student.setUnitName(studentPreRegistration.getUnitName());
         studentDao.insert(student);
         TenantContextHolder.clearTenantId();

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

@@ -87,7 +87,7 @@
             operating_tag_,
         </if>
         teacher_id_,create_time_,update_time_,service_tag_update_time_,cooperation_organ_id_,
-        care_package_,come_on_package_,member_rank_setting_id_,membership_start_time_,membership_end_time_,current_grade_num_,current_class_,tenant_id_)
+        care_package_,come_on_package_,member_rank_setting_id_,membership_start_time_,membership_end_time_,current_grade_num_,current_class_,tenant_id_,remark_,unit_name_)
         VALUES
         (#{userId},#{schoolName},#{subjectIdList},
         <if test="serviceTag != null">
@@ -97,7 +97,7 @@
             #{operatingTag},
         </if>
         #{teacherId},NOW(),NOW(),NOW(),#{cooperationOrganId},
-         #{carePackage},#{comeOnPackage},#{memberRankSettingId},#{membershipStartTime},#{membershipEndTime},#{currentGradeNum},#{currentClass},#{tenantId})
+         #{carePackage},#{comeOnPackage},#{memberRankSettingId},#{membershipStartTime},#{membershipEndTime},#{currentGradeNum},#{currentClass},#{tenantId},#{remark}, #{unitName})
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Student">