|
@@ -16,10 +16,7 @@ import com.keao.edu.user.dto.ExaminationBasicDto;
|
|
import com.keao.edu.user.entity.*;
|
|
import com.keao.edu.user.entity.*;
|
|
import com.keao.edu.user.enums.ExamStatusEnum;
|
|
import com.keao.edu.user.enums.ExamStatusEnum;
|
|
import com.keao.edu.user.page.ExaminationQueryInfo;
|
|
import com.keao.edu.user.page.ExaminationQueryInfo;
|
|
-import com.keao.edu.user.service.ExamOrganizationRelationService;
|
|
|
|
-import com.keao.edu.user.service.ExaminationBasicService;
|
|
|
|
-import com.keao.edu.user.service.OrganizationService;
|
|
|
|
-import com.keao.edu.user.service.StudentExamResultService;
|
|
|
|
|
|
+import com.keao.edu.user.service.*;
|
|
import com.keao.edu.util.collection.MapUtil;
|
|
import com.keao.edu.util.collection.MapUtil;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.time.DateUtils;
|
|
import org.apache.commons.lang3.time.DateUtils;
|
|
@@ -65,6 +62,8 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
|
|
private ExamRoomDao examRoomDao;
|
|
private ExamRoomDao examRoomDao;
|
|
@Autowired
|
|
@Autowired
|
|
private TenantInfoDao tenantInfoDao;
|
|
private TenantInfoDao tenantInfoDao;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ExamTeacherSalaryService examTeacherSalaryService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public BaseDAO<Long, ExaminationBasic> getDAO() {
|
|
public BaseDAO<Long, ExaminationBasic> getDAO() {
|
|
@@ -232,6 +231,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
|
|
}
|
|
}
|
|
examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "确认考试结果", operatorId));
|
|
examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "确认考试结果", operatorId));
|
|
studentExamResultService.examResultConfirmPush(examId);
|
|
studentExamResultService.examResultConfirmPush(examId);
|
|
|
|
+ examTeacherSalaryService.teacherSalarySettlementWithExam(examId);
|
|
}else if(ExamStatusEnum.CLOSE.equals(statusEnum)){
|
|
}else if(ExamStatusEnum.CLOSE.equals(statusEnum)){
|
|
examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "关闭考级项目", operatorId));
|
|
examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "关闭考级项目", operatorId));
|
|
examOrganizationRelationService.examStatusChangePush(examId, statusEnum);
|
|
examOrganizationRelationService.examStatusChangePush(examId, statusEnum);
|