Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300

This commit is contained in:
wangli 2025-02-27 10:13:35 +08:00
commit 3910c71b8e

View File

@ -762,8 +762,14 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
@Transactional(rollbackFor = Exception.class)
public Long approveCreateVisaChangeRecord(VisaChangeApproveCreateReq req) {
/*校验*/
validVisaChangeForm(req);
ChangeRecord changeRecord = this.getById(req.getId());
if (NumberUtil.isPositiveNumber(changeRecord.getId())) {
// 编辑态下校验单据状态
AssertUtil.isTrue(!StringUtils.hasText(changeRecord.getApprovalId())
|| (StringUtils.hasText(changeRecord.getApprovalId()) && !Objects.equals(VisaStatusEnum.APPROVING.name(), changeRecord.getApprovalStatus())),
"当前单据审批中,不允许操作");
}
validVisaChangeForm(req);
ChangeRecord oldChangeRecord = BeanUtil.copyProperties(changeRecord, ChangeRecord.class);
List<VisaDetailByIdResponse.VisaUploadFile> visaUploadFiles = this.buildAttachUploadFile(req.getId());