Merge remote-tracking branch 'origin/master'

# Conflicts:
#	edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomController.java

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

@@ -5,16 +5,13 @@ import com.keao.edu.common.config.FeignConfiguration;
 import com.keao.edu.user.api.client.fallback.EduUserFeignServiceFallback;
 import com.keao.edu.user.api.entity.ExamRoom;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 @FeignClient(contextId = "eduUserFeignService", name = "user-server", configuration = { FeignConfiguration.class }, fallback = EduUserFeignServiceFallback.class)
 public interface EduUserFeignService {
 
-	@RequestMapping(value = "examRoom/get", method = RequestMethod.GET)
-	ExamRoom getExamRoom(Integer id);
+	@GetMapping(value = "examRoom/get")
+	ExamRoom getExamRoom(@RequestParam("id") Integer id);
 
 	@PostMapping(value = "student/apply")
 	Object studentApply(@RequestParam("organId") Integer organId, @RequestParam("phone") String phone);

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/ExamRoomController.java

@@ -1,5 +1,7 @@
 package com.keao.edu.user.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
@@ -71,6 +73,12 @@ public class ExamRoomController extends BaseController {
         return succeed();
     }
 
+    @ApiModelProperty("获取教室")
+    @GetMapping(value = "/get")
+    public ExamRoom getExamRoom(Long id){
+        return examRoomService.get(id);
+    }
+
     @ApiModelProperty("获取考场统计信息")
     @GetMapping(value = "/getExamRoomStatisticsInfo")
     public HttpResponseResult<ExamRoomStatisticsDto> getExamRoomStatisticsInfo(Integer examId){

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

@@ -48,16 +48,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/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -60,10 +60,11 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
 		organ.setParentOrganId(queryUserInfo.getId());
 		organ.setLevel(currentOrganization.getLevel() + 1);
-		organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + queryUserInfo.getId());
+
 		if(user != null && user.getId() != null){
 			Organization organization = organDao.get(user.getId());
 			if(organization == null){
+				organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + user.getId());
 				if(StringUtils.isEmpty(user.getPassword())){
 					sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
 				}
@@ -91,6 +92,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		sysUser.setPhone(organ.getContactPhone());
 		sysUserDao.insert(sysUser);
 
+		organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + sysUser.getId());
 		organ.setId(sysUser.getId());
 		organDao.insert(organ);
 		//新增用户角色

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>
 
     <!-- 根据主键查询一条记录 -->