Joburgess пре 5 година
родитељ
комит
94f43b7b29

+ 4 - 1
edu-common/src/main/java/com/keao/edu/common/enums/MessageTypeEnum.java

@@ -8,7 +8,10 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     EXAM_REGISTRATION_CLOSE_SMS("EXAM_REGISTRATION_CLOSE_SMS", "关闭报名"),
     EXAM_CLOSE_SMS("EXAM_CLOSE_SMS", "项目关闭"),
     EXAM_REGIST_TIME_CHANGE_SMS("EXAM_REGIST_TIME_CHANGE_SMS", "报名时间调整"),
-    EXAM_REGIST_EXPIRE_SMS("EXAM_REGIST_EXPIRE_SMS", "报名截至");
+    EXAM_REGIST_EXPIRE_SMS("EXAM_REGIST_EXPIRE_SMS", "报名截至"),
+    REGIST_PASS_PUSH("REGIST_PASS_PUSH", "报名审核通过"),
+    REGIST_REJECT_PUSH("REGIST_REJECT_PUSH", "报名审核未通过"),
+    REGIST_REJECT_SMS("REGIST_REJECT_SMS", "报名审核未通过");
 
     MessageTypeEnum(String code, String msg) {
         this.code = code;

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

@@ -2,11 +2,15 @@ package com.keao.edu.user.service.impl;
 
 
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.common.enums.MessageTypeEnum;
 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.IdGeneratorService;
+import com.keao.edu.common.service.SysMessageService;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
+import com.keao.edu.thirdparty.message.provider.JiguangPushPlugin;
+import com.keao.edu.thirdparty.message.provider.YimeiSmsPlugin;
 import com.keao.edu.user.dao.*;
 import com.keao.edu.user.dto.ExamRecordDto;
 import com.keao.edu.user.dto.ExamRegistrationDto;
@@ -54,6 +58,8 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
     private ExamRegistrationPaymentService examRegistrationPaymentService;
     @Autowired
     private OrganizationDao organizationDao;
+    @Autowired
+    private SysMessageService sysMessageService;
 
     @Override
     public BaseDAO<Long, ExamRegistration> getDAO() {
@@ -278,6 +284,17 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
                 && !StudentRegistrationStatusEnum.AUDIT_REJECT.equals(examRegistration.getStatus())) {
             throw new BizException("审核状态错误");
         }
+        Map<Integer, String> receiverMap = new HashMap<>(1);
+        receiverMap.put(er.getStudentId(), er.getStudentId().toString());
+        if(StudentRegistrationStatusEnum.AUDIT_PASS.equals(examRegistration.getStatus())){
+            sysMessageService.batchSendMessage(MessageTypeEnum.REGIST_PASS_PUSH,
+                    receiverMap, null, 0, null, JiguangPushPlugin.PLUGIN_NAME);
+        }else if(StudentRegistrationStatusEnum.AUDIT_REJECT.equals(examRegistration.getStatus())){
+            sysMessageService.batchSendMessage(MessageTypeEnum.REGIST_REJECT_PUSH,
+                    receiverMap, null, 0, null, JiguangPushPlugin.PLUGIN_NAME);
+            sysMessageService.batchSendMessage(MessageTypeEnum.REGIST_REJECT_SMS,
+                    receiverMap, null, 0, null, YimeiSmsPlugin.PLUGIN_NAME);
+        }
         examRegistrationDao.update(examRegistration);
     }
 

+ 3 - 0
edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRoomMapper.xml

@@ -270,6 +270,9 @@
 			<if test="examId!=null">
 				AND er.examination_basic_id_ = #{examId}
 			</if>
+			<if test="search!=null and search!=''">
+				AND (er.id_=#{search})
+			</if>
 		</where>
 	</sql>