update

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

@@ -58,7 +58,7 @@ public class ExamRoomController extends BaseController {
         if(Objects.isNull(employee)){
             return failed("用户信息异常");
         }
-        examRoomService.sendExamPlan(employee.getOrganId(), examId);
+        examRoomService.sendExamPlan(employee.getOrganId(), examId, sysUser.getId());
         return succeed();
     }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/enums/ExamStatusEnum.java

@@ -14,7 +14,8 @@ public enum ExamStatusEnum implements BaseEnum<String, ExamStatusEnum> {
     EXAM_ING("EXAM_ING", "考试中"),
     EXAM_END("EXAM_END", "考试结束"),
     RESULT_CONFIRM("RESULT_CONFIRM", "确认考试结果"),
-    CLOSE("CLOSE", "关闭");
+    CLOSE("CLOSE", "关闭"),
+    DELETE("DELETE", "删除");
 
     private String code;
 

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

@@ -60,7 +60,7 @@ public interface ExamRoomService extends BaseService<Long, ExamRoom> {
      * @date 2020.06.29
      * @return void
      */
-    void sendExamPlan(Integer organId, Integer examId);
+    void sendExamPlan(Integer organId, Integer examId, Integer operatorId);
 
     /**
      * @describe 获取考场统计信息

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

@@ -16,6 +16,7 @@ import com.keao.edu.user.api.enums.ExamModeEnum;
 import com.keao.edu.user.dao.*;
 import com.keao.edu.user.dto.ExamRoomDto;
 import com.keao.edu.user.dto.ExamRoomStatisticsDto;
+import com.keao.edu.user.entity.ExamLifecycleLog;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.ExaminationBasic;
@@ -59,6 +60,8 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 	private StudentExamResultDao studentExamResultDao;
 	@Autowired
 	private ExamOrganizationRelationDao examOrganizationRelationDao;
+	@Autowired
+	private ExamLifecycleLogDao examLifecycleLogDao;
 
 	@Override
 	public BaseDAO<Long, ExamRoom> getDAO() {
@@ -266,12 +269,14 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 	}
 
 	@Override
-	public void sendExamPlan(Integer organId, Integer examId) {
+	public void sendExamPlan(Integer organId, Integer examId, Integer operatorId) {
 		List<Integer> nextLevelOrganIds = organizationService.getNextLevelOrganIds(organId, true);
 		int withoutExamRoomStudentNum = examRegistrationDao.countWithoutExamRoomStudentNum(nextLevelOrganIds, examId);
 		if(withoutExamRoomStudentNum>0){
 			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

@@ -148,6 +148,18 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         if(ExamStatusEnum.RESULT_CONFIRM.equals(existsExam.getStatus())){
             throw new BizException("考级项目结果已确认");
         }
+        if(ExamStatusEnum.DELETE.equals(statusEnum)&&!ExamStatusEnum.SETTING.equals(existsExam.getStatus())){
+            throw new BizException("此状态不支持删除");
+        }
+        if(ExamStatusEnum.DELETE.equals(statusEnum)){
+            examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "删除考级项目", operatorId));
+        }
+        if(ExamStatusEnum.RESULT_CONFIRM.equals(statusEnum)){
+            examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "确认考试结果", operatorId));
+        }
+        if(ExamStatusEnum.CLOSE.equals(statusEnum)){
+            examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "关闭考级项目", operatorId));
+        }
         if(ExamStatusEnum.NOT_START.equals(existsExam.getStatus())&&ExamStatusEnum.APPLYING.equals(statusEnum)){
             existsExam.setEnrollStartTime(new Date());
             examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "报名已开启", operatorId));

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

@@ -213,6 +213,7 @@
 
 	<sql id="findExaminationBasicsCondition">
 		<where>
+			eb.status_!='DELETE'
 			<if test="organId!=null">
 				AND eor.organ_id_ = #{organId}
 			</if>