update

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

@@ -77,7 +77,7 @@ public class ExamRegistrationController extends BaseController {
     @PostMapping(value = "update")
     @PreAuthorize("@pcs.hasPermissions('examRegistration/update')")
     public HttpResponseResult update(@RequestBody ExamRegistration examRegistration) {
-        examRegistrationService.update(examRegistration);
+        examRegistrationService.updateExamRegistration(examRegistration);
         return succeed();
     }
 

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

@@ -25,6 +25,8 @@ public interface ExamRegistrationService extends BaseService<Long, ExamRegistrat
     */
    PageInfo<ExamRegistration> queryExamRegistrationStudents(ExamRegistrationQueryInfo queryInfo);
 
+   void updateExamRegistration(ExamRegistration examRegistration);
+
    /**
     * @describe 统计招生信息
     * @author Joburgess

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

@@ -174,7 +174,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
             for (ExamRegistration examRegistration : dataList) {
                 examRegistration.setOrganization(new Organization(examRegistration.getOrganId(), organIdNameMap.get(examRegistration.getOrganId())));
                 examRegistration.getSubject().setName(subjectIdNameMap.get(examRegistration.getSubjectId()));
-                examRegistration.getSysUser().setCertificatePhoto(idPhotoMap.get(examRegistration.getSubjectId()));
+                examRegistration.getSysUser().setCertificatePhoto(idPhotoMap.get(examRegistration.getStudentId()));
                 examRegistration.setExaminationBasic(new ExaminationBasic(examRegistration.getExaminationBasicId(), examIdNameMap.get(examRegistration.getExaminationBasicId())));
             }
         }
@@ -250,6 +250,25 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
     }
 
     @Override
+    public void updateExamRegistration(ExamRegistration examRegistration) {
+        if(Objects.isNull(examRegistration.getId())){
+            throw new BizException("请指定学员报名信息");
+        }
+        ExamRegistration er = examRegistrationDao.get(examRegistration.getId().longValue());
+        if(Objects.isNull(er)) {
+            throw new BizException("学员报名信息不存在");
+        }
+        if(!StudentRegistrationStatusEnum.AUDIT_WAIT.equals(er.getStatus())){
+            throw new BizException("审核状态错误");
+        }
+        if(!StudentRegistrationStatusEnum.AUDIT_PASS.equals(examRegistration.getStatus())
+            &&!StudentRegistrationStatusEnum.AUDIT_REJECT.equals(examRegistration.getStatus())){
+            throw new BizException("审核状态错误");
+        }
+        examRegistrationDao.update(examRegistration);
+    }
+
+    @Override
     public ExamRegistrationDto getExamRegistration(Long examRegistrationId) {
         return examRegistrationDao.getExamRegistration(examRegistrationId);
     }

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

@@ -71,9 +71,6 @@
 			<if test="lastExamLevel != null">
 				last_exam_level_ = #{lastExamLevel},
 			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
 			<if test="tenantId != null">
 				tenant_id_ = #{tenantId},
 			</if>
@@ -102,7 +99,7 @@
 				status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="memo!=null">
-				memo_ = #{memo}
+				memo_ = #{memo},
 			</if>
 				update_time_ = NOW()
 		</set> WHERE id_ = #{id}
@@ -147,6 +144,7 @@
 			er.exam_music_theory_level_,
 			er.card_no_,
 			er.student_id_,
+			er.memo_,
 			su.real_name_ sys_user_real_name_,
 			er.last_exam_certificate_url_,
 			er.last_music_theory_certificate_url_,