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

@@ -10,6 +10,7 @@ import com.keao.edu.thirdparty.ocr.Ocr;
 import com.keao.edu.user.dto.*;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.ExamRegistration;
+import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
 import com.keao.edu.user.page.ApplyListQueryInfo;
 import com.keao.edu.user.page.ExamRecordQueryInfo;
 import com.keao.edu.user.page.ExamRegistrationQueryInfo;
@@ -83,9 +84,16 @@ public class ExamRegistrationController extends BaseController {
         return succeed(examRegistrationService.examList(queryInfo));
     }
 
+    @ApiOperation(value = "更新学员报名状态")
+    @PostMapping(value = "updateExamRegistrationStatus")
+    @PreAuthorize("@pcs.hasPermissions('examRegistration/updateExamREgistrationStatus')")
+    public HttpResponseResult updateExamRegistrationStatus(Long registId, StudentRegistrationStatusEnum status, String memo){
+        examRegistrationService.updateExamRegistrationStatus(registId, status, memo);
+        return succeed();
+    }
+
     @ApiOperation(value = "修改学员报名信息")
     @PostMapping(value = "update")
-    @PreAuthorize("@pcs.hasPermissions('examRegistration/update')")
     public HttpResponseResult update(@RequestBody ExamRegistration examRegistration) {
         examRegistrationService.updateExamRegistration(examRegistration);
         return succeed();

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

@@ -6,6 +6,7 @@ import com.keao.edu.common.page.QueryInfo;
 import com.keao.edu.common.service.BaseService;
 import com.keao.edu.user.dto.*;
 import com.keao.edu.user.entity.ExamRegistration;
+import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
 import com.keao.edu.user.page.ApplyListQueryInfo;
 import com.keao.edu.user.page.ExamRecordQueryInfo;
 import com.keao.edu.user.page.ExamRegistrationQueryInfo;
@@ -25,6 +26,24 @@ public interface ExamRegistrationService extends BaseService<Long, ExamRegistrat
     */
    PageInfo<ExamRegistrationRoomDto> queryExamRegistrationStudents(ExamRegistrationQueryInfo queryInfo);
 
+   /**
+    * @describe 更新报名状态
+    * @author Joburgess
+    * @date 2020.07.24
+    * @param registId:
+    * @param status:
+    * @param memo:
+    * @return void
+    */
+   void updateExamRegistrationStatus(Long registId, StudentRegistrationStatusEnum status, String memo);
+
+   /**
+    * @describe 更新考级报名信息
+    * @author Joburgess
+    * @date 2020.07.24
+    * @param examRegistration:
+    * @return void
+    */
    void updateExamRegistration(ExamRegistration examRegistration);
 
    /**

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

@@ -269,27 +269,28 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
     }
 
     @Override
-    public void updateExamRegistration(ExamRegistration examRegistration) {
-        if (Objects.isNull(examRegistration.getId())) {
+    public void updateExamRegistrationStatus(Long registId, StudentRegistrationStatusEnum status, String memo) {
+        if (Objects.isNull(registId)) {
             throw new BizException("请指定学员报名信息");
         }
-        ExamRegistration er = examRegistrationDao.get(examRegistration.getId().longValue());
+        ExamRegistration er = examRegistrationDao.get(registId);
         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())) {
+        if (!StudentRegistrationStatusEnum.AUDIT_PASS.equals(status)
+                && !StudentRegistrationStatusEnum.AUDIT_REJECT.equals(status)) {
             throw new BizException("审核状态错误");
         }
+        er.setStatus(status);
         Map<Integer, String> receiverMap = new HashMap<>(1);
         receiverMap.put(er.getStudentId(), er.getStudentId().toString());
-        if(StudentRegistrationStatusEnum.AUDIT_PASS.equals(examRegistration.getStatus())){
+        if(StudentRegistrationStatusEnum.AUDIT_PASS.equals(er.getStatus())){
             sysMessageService.batchSendMessage(MessageTypeEnum.REGIST_PASS_PUSH,
                     receiverMap, null, 0, null, JiguangPushPlugin.PLUGIN_NAME);
-        }else if(StudentRegistrationStatusEnum.AUDIT_REJECT.equals(examRegistration.getStatus())){
+        }else if(StudentRegistrationStatusEnum.AUDIT_REJECT.equals(er.getStatus())){
             sysMessageService.batchSendMessage(MessageTypeEnum.REGIST_REJECT_PUSH,
                     receiverMap, null, 0, null, JiguangPushPlugin.PLUGIN_NAME);
 
@@ -299,6 +300,19 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
             sysMessageService.batchSendMessage(MessageTypeEnum.REGIST_REJECT_SMS,
                     phoneMap, null, 0, null, YimeiSmsPlugin.PLUGIN_NAME);
         }
+        examRegistrationDao.update(er);
+    }
+
+    @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("学员报名信息有误");
+        }
+        examRegistration.setStatus(null);
         examRegistrationDao.update(examRegistration);
     }