update

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/Student.java

@@ -7,7 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 /**
  * 对应数据库表(student):
  */
-public class Student extends SysUser {
+public class Student{
 
 	@ApiModelProperty(value = "用户编号")
 	private Integer userId;
@@ -29,6 +29,7 @@ public class Student extends SysUser {
 		this.organId = organId;
 		SysUser user = new SysUser();
 		user.setPhone(phone);
+		user.setRealName(phone);
 		this.sysUser = user;
 	}
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/StudentController.java

@@ -41,7 +41,8 @@ public class StudentController extends BaseController {
 	@ApiOperation(value = "学员报名")
 	@PostMapping(value = "apply")
 	public HttpResponseResult apply(Integer organId,String phone) {
-		studentService.addStudent(new Student(organId,phone));
+		Student student = new Student(organId, phone);
+		studentService.addStudent(student);
 		return succeed();
 	}
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -47,16 +47,17 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
     @Override
 	@Transactional(rollbackFor = Exception.class)
     public ExamRegistration addRegistration(ExamRegistration examRegistration) {
+		SysUser sysUser = examRegistration.getSysUser();
 		ExaminationBasic examinationBasic = examinationBasicDao.get(examRegistration.getExaminationBasicId().longValue());
 		if(examinationBasic == null || !examinationBasic.getStatus().equals(ExamStatusEnum.APPLYING)){
 			throw new BizException("项目不在报名中，请核对");
 		}
 		SysUser user = sysUserDao.get(examRegistration.getUserId());
-		user.setBirthdate(examRegistration.getBirthdate());
-		user.setGender(examRegistration.getGender());
+		user.setBirthdate(sysUser.getBirthdate());
+		user.setGender(sysUser.getGender());
 		user.setIdCardNo(examRegistration.getCardNo());
-		user.setRealName(examRegistration.getRealName());
-		user.setNation(examRegistration.getNation());
+		user.setRealName(sysUser.getRealName());
+		user.setNation(sysUser.getNation());
 		sysUserDao.update(user);
 
 		examRegistration.setUserId(examRegistration.getStudentId());

edu-user/edu-user-server/src/main/resources/config/mybatis/StudentMapper.xml

@@ -12,6 +12,7 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
+		<result column="organ_id_" property="organId" />
 		<association property="sysUser" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
 	</resultMap>
 
@@ -28,8 +29,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.api.entity.Student" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO student (user_id_,certificate_photo_,create_time_,update_time_,tenant_id_)
-		VALUES(#{userId},#{certificatePhoto},#{createTime},#{updateTime},#{tenantId})
+		INSERT INTO student (user_id_,certificate_photo_,create_time_,update_time_,tenant_id_,organ_id_)
+		VALUES(#{userId},#{certificatePhoto},NOW(),NOW(),#{tenantId},#{organId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -42,8 +43,8 @@
 			<if test="tenantId != null">
 				tenant_id_ = #{tenantId},
 			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
+			<if test="organId != null">
+				organ_id_ = #{organId},
 			</if>
 			update_time_ = NOW()
 		</set> WHERE user_id_ = #{userId}

edu-user/edu-user-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -61,9 +61,9 @@
             keyProperty="id">
         INSERT INTO sys_user
         (is_super_admin_,im_token_,id_,username_,salt_,phone_,avatar_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,
-        gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_)
+        gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_,tenant_id_)
         VALUES(#{isSuperAdmin},#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},now(),now(),#{wxOpenid},#{qqOpenid},#{userType},
-        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName})
+        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->