Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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

@@ -47,7 +47,7 @@ public class ExamRegistrationController extends BaseController {
     @ApiOperation(value = "报名")
     @PostMapping(value = "add")
     @PreAuthorize("@pcs.hasPermissions('examRegistration/add')")
-    public HttpResponseResult add(ExamRegistration examRegistration) {
+    public HttpResponseResult<ExamRegistration> add(ExamRegistration examRegistration) {
         SysUser student = sysUserFeignService.queryUserInfo();
         examRegistration.setStudentId(student.getId());
         return succeed(examRegistrationService.addRegistration(examRegistration));

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

@@ -48,4 +48,10 @@ public class ExaminationBasicController extends BaseController {
         examinationBasicService.closeExam(examId, reason);
         return succeed();
     }
+
+    @ApiOperation("获取考级姓名信息")
+    @PostMapping(value = "/getInfo")
+    public HttpResponseResult<ExaminationBasic> getInfo(Integer examId){
+        return succeed(examinationBasicService.getInfo(examId));
+    }
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamRegistration.java

@@ -10,7 +10,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
  */
 public class ExamRegistration extends Student {
 
-	private Long id;
+	private Integer id;
 	
 	@ApiModelProperty(value = "考级项目编号")
 	private Integer examinationBasicId;
@@ -63,11 +63,11 @@ public class ExamRegistration extends Student {
 
 	private String tenantId;
 	
-	public void setId(Long id){
+	public void setId(Integer id){
 		this.id = id;
 	}
 	
-	public Long getId(){
+	public Integer getId(){
 		return this.id;
 	}
 

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

@@ -7,7 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 /**
  * 对应数据库表(student):
  */
-public class Student {
+public class Student extends SysUser {
 
 	@ApiModelProperty(value = "用户编号")
 	private Integer userId;

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

@@ -52,4 +52,12 @@ public interface ExaminationBasicService extends BaseService<Long, ExaminationBa
      * @return void
      */
     void closeExam(Integer examId, String reason);
+
+    /**
+     * 获取考级项目信息
+     * @param examId
+     * @return
+     */
+    ExaminationBasic getInfo(Integer examId);
+
 }

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

@@ -1,17 +1,17 @@
 package com.keao.edu.user.service.impl;
 
 
+import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.page.QueryInfo;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
-import com.keao.edu.user.dao.ExamCertificationDao;
-import com.keao.edu.user.dao.ExamRegistrationDao;
-import com.keao.edu.user.dao.ExaminationBasicDao;
-import com.keao.edu.user.dao.StudentDao;
+import com.keao.edu.user.dao.*;
 import com.keao.edu.user.entity.ExamCertification;
 import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.ExaminationBasic;
+import com.keao.edu.user.enums.ExamStatusEnum;
 import com.keao.edu.user.service.ExamRegistrationService;
 import com.keao.edu.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +32,8 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
 	private ExamCertificationDao examCertificationDao;
 	@Autowired
 	private ExaminationBasicDao examinationBasicDao;
+	@Autowired
+	private SysUserDao sysUserDao;
 
 	@Override
 	public BaseDAO<Long, ExamRegistration> getDAO() {
@@ -67,11 +69,22 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
     @Override
 	@Transactional(rollbackFor = Exception.class)
     public ExamRegistration addRegistration(ExamRegistration examRegistration) {
+		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.setIdCardNo(examRegistration.getCardNo());
+		user.setRealName(examRegistration.getRealName());
+		user.setNation(examRegistration.getNation());
+		sysUserDao.update(user);
+
 		examRegistration.setUserId(examRegistration.getStudentId());
 		studentDao.insert(examRegistration);
 		examRegistrationDao.insert(examRegistration);
 
-		ExaminationBasic examinationBasic = examinationBasicDao.get(examRegistration.getExaminationBasicId().longValue());
 		ExamCertification examCertification = new ExamCertification();
 		examCertification.setExaminationBasicId(examRegistration.getExaminationBasicId());
 		examCertification.setStudentId(examRegistration.getStudentId());

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

@@ -147,4 +147,9 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
 		examinationBasic.setStatus(ExamStatusEnum.CLOSE);
 		examinationBasicDao.update(examinationBasic);
 	}
+
+    @Override
+    public ExaminationBasic getInfo(Integer examId) {
+		return examinationBasicDao.get(examId.longValue());
+	}
 }