Joburgess 5 năm trước cách đây
mục cha
commit
7cf9906dea

+ 0 - 6
edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamRoomServiceImpl.java

@@ -263,8 +263,6 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		}
 
 		examinationBasicDao.update(examinationBasic);
-
-		examTeacherSalaryService.teacherSalarySettlementWithExam(examinationBasic.getId());
 	}
 
 	@Override
@@ -368,8 +366,6 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			List<Long> registIds = examRoomStudents.stream().map(ExamRoomStudentRelation::getExamRegistrationId).collect(Collectors.toList());
 			examCertificationDao.updateExamAddress(examLocation.getAddress(), registIds);
 		}
-
-		examTeacherSalaryService.teacherSalarySettlementWithExam(examRoom.getExaminationBasicId());
 		return examRoom;
 	}
 
@@ -418,8 +414,6 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			examinationBasic.setActualExamEndTime(DateUtils.ceiling(examRoomExamTime.getExamEndTime(), Calendar.DAY_OF_MONTH));
 		}
 		examinationBasicDao.update(examinationBasic);
-
-		examTeacherSalaryService.teacherSalarySettlementWithExam(examRoom.getExaminationBasicId());
 	}
 
 	@Override

+ 0 - 2
edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -192,7 +192,6 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		}
 		if(!CollectionUtils.isEmpty(examRoomStudentRelations)){
 			examRoomStudentRelationDao.batchInsert(examRoomStudentRelations);
-			examTeacherSalaryService.teacherSalarySettlementWithExam(examRoom.getExaminationBasicId());
 			examRoom.setExamRoomStudentNum(examRoomStudentRelationDao.countStudentsWithRoom(examRoom.getId()));
 			examRoomDao.update(examRoom);
 		}
@@ -450,7 +449,6 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		studentExamResultDao.deleteWithRegists(registIds);
 		examRoom.setExamRoomStudentNum(examRoomStudentRelationDao.countStudentsWithRoom(examRoom.getId()));
 		examRoomDao.update(examRoom);
-		examTeacherSalaryService.teacherSalarySettlementWithExam(examRoom.getExaminationBasicId());
 	}
 
 	@Override

+ 4 - 4
edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExaminationBasicServiceImpl.java

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