update

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

@@ -307,9 +307,9 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			throw new BizException("考级项目已关闭");
 		}
 
-		StringBuffer expectRegistTime = new StringBuffer(DateUtil.dateToString(examinationBasic.getEnrollStartTime(), "yyyy年MM月dd日"));
+		StringBuffer expectRegistTime = new StringBuffer(DateUtil.dateToString(examinationBasic.getEnrollStartTime(), "yyyy年MM月dd日 HH时mm分"));
 		expectRegistTime.append("-");
-		expectRegistTime.append(DateUtil.dateToString(examinationBasic.getEnrollStartTime(), "yyyy年MM月dd日"));
+		expectRegistTime.append(DateUtil.dateToString(examinationBasic.getEnrollStartTime(), "yyyy年MM月dd日 HH时mm分"));
 
 		TenantInfo tenantInfo = tenantInfoDao.getWithOrgan(examinationBasic.getOrganId());
 		if(Objects.isNull(tenantInfo)){

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

@@ -1,6 +1,7 @@
 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.enums.MessageTypeEnum;
 import com.keao.edu.common.exception.BizException;
@@ -60,6 +61,8 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
     private OrganizationDao organizationDao;
     @Autowired
     private SysMessageService sysMessageService;
+    @Autowired
+    private SysUserDao sysUserDao;
 
     @Override
     public BaseDAO<Long, ExamRegistration> getDAO() {
@@ -292,8 +295,12 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         }else if(StudentRegistrationStatusEnum.AUDIT_REJECT.equals(examRegistration.getStatus())){
             sysMessageService.batchSendMessage(MessageTypeEnum.REGIST_REJECT_PUSH,
                     receiverMap, null, 0, null, JiguangPushPlugin.PLUGIN_NAME);
+
+            SysUser student = sysUserDao.get(er.getStudentId());
+            Map<Integer, String> phoneMap = new HashMap<>(1);
+            phoneMap.put(er.getStudentId(), student.getPhone());
             sysMessageService.batchSendMessage(MessageTypeEnum.REGIST_REJECT_SMS,
-                    receiverMap, null, 0, null, YimeiSmsPlugin.PLUGIN_NAME);
+                    phoneMap, null, 0, null, YimeiSmsPlugin.PLUGIN_NAME);
         }
         examRegistrationDao.update(examRegistration);
     }

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

@@ -322,6 +322,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			throw new BizException("存在未安排教室的学员");
 		}
 		examLifecycleLogDao.insert(new ExamLifecycleLog(examId, "确认考试安排", operatorId));
+
 	}
 
 	@Override

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

@@ -140,11 +140,11 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
                 examOrganizationRelationService.examRegistCutOffPush(exam.getId());
                 continue;
             }
-            if (Objects.nonNull(exam.getActualExamEndTime())
-                    &&exam.getStatus().getOrder()<ExamStatusEnum.EXAM_END.getOrder()
-                    &&now.compareTo(exam.getActualExamEndTime()) >= 0) {
-                exam.setStatus(ExamStatusEnum.EXAM_END);
-            }
+//            if (Objects.nonNull(exam.getActualExamEndTime())
+//                    &&exam.getStatus().getOrder()<ExamStatusEnum.EXAM_END.getOrder()
+//                    &&now.compareTo(exam.getActualExamEndTime()) >= 0) {
+//                exam.setStatus(ExamStatusEnum.EXAM_END);
+//            }
         }
         examinationBasicDao.batchUpdate(exams);
     }