Joburgess 5 éve
szülő
commit
c285de492a

+ 2 - 0
edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExaminationBasicDao.java

@@ -12,6 +12,8 @@ public interface ExaminationBasicDao extends BaseDAO<Long, ExaminationBasic> {
 
     int batchUpdate(@Param("exams") List<ExaminationBasic> exams);
 
+    ExaminationBasic lockExam(@Param("examId") Long examId);
+
     ExaminationBasicDto getExaminationBasic(Integer examId);
 
     List<ExaminationBasicDto> findExaminationBasics(Map<String, Object> params);

+ 5 - 5
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamManualLedgerServiceImpl.java

@@ -7,7 +7,7 @@ import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.user.dao.ExamManualLedgerDao;
 import com.keao.edu.user.dao.ExamOrganizationRelationDao;
-import com.keao.edu.user.dao.SysUserDao;
+import com.keao.edu.user.dao.ExaminationBasicDao;
 import com.keao.edu.user.dto.ExamManualLedgerStatisticsDto;
 import com.keao.edu.user.entity.ExamManualLedger;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
@@ -27,9 +27,9 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 	@Autowired
 	private ExamManualLedgerDao examManualLedgerDao;
 	@Autowired
-	private SysUserDao sysUserDao;
-	@Autowired
 	private ExamOrganizationRelationDao examOrganizationRelationDao;
+	@Autowired
+	private ExaminationBasicDao examinationBasicDao;
 
 	@Override
 	public BaseDAO<Long, ExamManualLedger> getDAO() {
@@ -45,7 +45,7 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 		if(Objects.isNull(examManualLedger.getAmount())){
 			throw new BizException("请指定交易金额");
 		}
-		sysUserDao.lockUser(examManualLedger.getOperatorUserId());
+		examinationBasicDao.lockExam(examManualLedger.getExaminationBasicId());
 		if(Objects.nonNull(examManualLedger.getTargetOrganId())&&examManualLedger.getTargetOrganId()>0){
 			ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examManualLedger.getExaminationBasicId(), examManualLedger.getTargetOrganId());
 			if(Objects.isNull(examOrganizationRelation)){
@@ -83,8 +83,8 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 		if(Objects.isNull(id)){
 			throw new BizException("请指定需要删除的支出记录");
 		}
-		sysUserDao.lockUser(operatorId);
 		ExamManualLedger examManualLedger = examManualLedgerDao.get(id);
+		examinationBasicDao.lockExam(examManualLedger.getExaminationBasicId());
 		if(Objects.nonNull(examManualLedger.getTargetOrganId())&&examManualLedger.getTargetOrganId()>0){
 			ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examManualLedger.getExaminationBasicId(), examManualLedger.getTargetOrganId());
 			if(Objects.isNull(examOrganizationRelation)){

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

@@ -255,4 +255,7 @@
 			#{examId}
 		</foreach>
 	</select>
+    <select id="lockExam" resultMap="ExaminationBasic">
+		SELECT id_,name_ FROM examination_basic WHERE id_=#{examId}
+	</select>
 </mapper>