Merge remote-tracking branch 'origin/master'

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

@@ -27,8 +27,8 @@ public class ExamSubjectController extends BaseController {
     @ApiOperation("获取考试项目专业")
     @ApiImplicitParam(name = "ExamId", value = "考试项目id", required = true, dataType = "Integer")
     @GetMapping(value = "/getExamSubjects")
-    public HttpResponseResult<List<ExamSubjectDto>> getExamSubjects(Integer ExamId) {
-        return succeed(examSubjectService.getExamSubjects(ExamId));
+    public HttpResponseResult<List<ExamSubjectDto>> getExamSubjects(Integer examId) {
+        return succeed(examSubjectService.getExamSubjects(examId));
     }
 
     @ApiOperation("获取与考级项目无关的专业")

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

@@ -29,44 +29,51 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(value = "student")
 public class StudentController extends BaseController {
 
-	@Autowired
-	private StudentService studentService;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private StudentService studentService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
-	@ApiOperation(value = "学员列表")
-	@GetMapping(value = "list")
+    @ApiOperation(value = "学员列表")
+    @GetMapping(value = "list")
     @PreAuthorize("@pcs.hasPermissions('student/list')")
-	public HttpResponseResult<PageInfo<Student>> list(QueryInfo queryInfo) {
-		return succeed(studentService.queryStudentPage(queryInfo));
-	}
+    public HttpResponseResult<PageInfo<Student>> list(QueryInfo queryInfo) {
+        return succeed(studentService.queryStudentPage(queryInfo));
+    }
 
-	@ApiOperation(value = "学员报考列表")
-	@PostMapping(value = "applyList")
+    @ApiOperation(value = "学员报考列表")
+    @PostMapping(value = "applyList")
     @PreAuthorize("@pcs.hasPermissions('student/applyList')")
-	public HttpResponseResult<PageInfo<StudentExamPaymentDto>> applyList(StudentApplyQueryInfo queryInfo) {
-		return succeed(studentService.queryApplyList(queryInfo));
-	}
+    public HttpResponseResult<PageInfo<StudentExamPaymentDto>> applyList(StudentApplyQueryInfo queryInfo) {
+        return succeed(studentService.queryApplyList(queryInfo));
+    }
 
-	@ApiOperation(value = "查询学员")
-	@GetMapping(value = "get")
+    @ApiOperation(value = "查询学员")
+    @GetMapping(value = "get")
     @PreAuthorize("@pcs.hasPermissions('student/get')")
-	public HttpResponseResult<Student> get(Integer id) {
-		return succeed(studentService.get(id));
-	}
+    public HttpResponseResult<Student> get(Integer id) {
+        return succeed(studentService.get(id));
+    }
 
-	@ApiOperation(value = "学员报名")
-	@PostMapping(value = "apply")
-	public HttpResponseResult apply(Integer organId,String phone) {
-		Student student = new Student(organId, phone);
-		studentService.addStudent(student);
-		return succeed();
-	}
+    @ApiOperation(value = "学员报名")
+    @PostMapping(value = "apply")
+    public HttpResponseResult apply(Integer organId, String phone) {
+        Student student = new Student(organId, phone);
+        studentService.addStudent(student);
+        return succeed();
+    }
+
+    @ApiOperation(value = "获取学生信息")
+    @GetMapping(value = "getStudent")
+    public HttpResponseResult<Student> getStudent() {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        return succeed(studentService.getStudent(user.getId()));
+    }
+
+    @ApiOperation(value = "更新学员基本信息")
+    @PostMapping(value = "updateInfo")
+    public HttpResponseResult<Student> updateInfo(Student student) {
+        return succeed(studentService.updateInfo(student));
+    }
 
-	@ApiOperation(value = "获取学生信息")
-	@GetMapping(value = "getStudent")
-	public HttpResponseResult<Student> getStudent() {
-		SysUser user = sysUserFeignService.queryUserInfo();
-		return succeed(studentService.getStudent(user.getId()));
-	}
 }

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

@@ -51,4 +51,11 @@ public interface StudentService extends BaseService<Integer, Student> {
      * @return
      */
     Student getStudent(Integer userId);
+
+    /**
+     * 更新学员基本信息
+     * @param student
+     * @return
+     */
+    Student updateInfo(Student student);
 }

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

@@ -1,7 +1,6 @@
 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;
@@ -34,12 +33,8 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
     @Autowired
     private StudentDao studentDao;
     @Autowired
-    private ExamCertificationDao examCertificationDao;
-    @Autowired
     private ExaminationBasicDao examinationBasicDao;
     @Autowired
-    private SysUserDao sysUserDao;
-    @Autowired
     private OrganizationService organizationService;
     @Autowired
     private PayService payService;
@@ -62,18 +57,10 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> addRegistration(ExamRegistration examRegistration) throws Exception {
-        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(sysUser.getBirthdate());
-        user.setGender(sysUser.getGender());
-        user.setIdCardNo(examRegistration.getCardNo());
-        user.setRealName(sysUser.getRealName());
-        user.setNation(sysUser.getNation());
-        sysUserDao.update(user);
 
         //考试级别信息
         ExamSubjectSong examSubjectSong = examSubjectSongDao.get(examRegistration.getExamSubjectSongId());

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

@@ -65,14 +65,14 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
         if (user != null && user.getId() != null) {
             Student stu = studentDao.get(user.getId());
-            if(stu == null){
+            if (stu == null) {
                 student.setUserId(user.getId());
                 student.setTenantId(user.getTenantId());
                 studentDao.insert(student);
                 sysUser.setId(user.getId());
                 sysUser.setUserType(user.getUserType() + ",STUDENT");
                 sysUserDao.update(sysUser);
-            }else{
+            } else {
                 throw new BizException("用户已存在");
             }
             return;
@@ -82,7 +82,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         sysUser.setTenantId(organization.getTenantId());
         sysUser.setUserType("STUDENT");
         sysUserDao.insert(sysUser);
-        ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getRealName(),null));
+        ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getRealName(), null));
         sysUser.setImToken(imResult.getToken());
         sysUserDao.update(sysUser);
         student.setUserId(sysUser.getId());
@@ -108,11 +108,11 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     public PageInfo<Student> queryStudentPage(QueryInfo queryInfo) {
         PageInfo<Student> studentPageInfo = queryPage(queryInfo);
         List<Student> rows = studentPageInfo.getRows();
-        if(rows != null && rows.size() > 0){
+        if (rows != null && rows.size() > 0) {
             List<Integer> studentIds = rows.stream().map(e -> e.getUserId()).collect(Collectors.toList());
             //获取考试次数
-            Map<Integer,Integer> examNumMap = MapUtil.convertIntegerMap(studentExamResultDao.countExamNum(studentIds, queryInfo.getTenantId()));
-            rows.forEach(e->{
+            Map<Integer, Integer> examNumMap = MapUtil.convertIntegerMap(studentExamResultDao.countExamNum(studentIds, queryInfo.getTenantId()));
+            rows.forEach(e -> {
                 e.setExamNum(examNumMap.get(e.getUserId()));
             });
         }
@@ -135,7 +135,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             Map<Integer, String> basicNameMap = this.getMap("examination_basic", "id_", "name_", basicIds, Integer.class, String.class);
             Map<Integer, String> organNameMap = this.getMap("organization", "id_", "name_", basicIds, Integer.class, String.class);
             Map<Integer, String> subjectNameMap = this.getMap("subject", "id_", "name_", basicIds, Integer.class, String.class);
-            dataList.forEach(e->{
+            dataList.forEach(e -> {
                 e.setExamBaseName(basicNameMap.get(e.getExamRegistration().getExaminationBasicId()));
                 e.setOrganName(organNameMap.get(e.getExamRegistration().getOrganId()));
                 e.setOrganName(subjectNameMap.get(e.getExamRegistration().getSubjectId()));
@@ -152,4 +152,14 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     public Student getStudent(Integer userId) {
         return studentDao.getStudent(userId);
     }
+
+    @Override
+    @Transactional
+    public Student updateInfo(Student student) {
+        student.setId(student.getUserId());
+        if (sysUserDao.update(student) <= 0 || studentDao.update(student) <= 0) {
+            throw new BizException("学生信息更新失败，请重试");
+        }
+        return student;
+    }
 }