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