From 03587b58b343956f910a653c37b9a7bcd84e4af9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 九月 2025 18:54:03 +0800
Subject: [PATCH] 资产管理-资产领用列表 阿里云OSS文件上传
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationPurchaseServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationPurchaseServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationPurchaseServiceImpl.java
index 7d928d4..33e9534 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationPurchaseServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationPurchaseServiceImpl.java
@@ -4,13 +4,12 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.dto.asset.OaApprovalApplicationPurchaseDTO;
import com.ruoyi.system.emums.ApprovalStatusEnum;
+import com.ruoyi.system.emums.ApprovalTypeEnum;
import com.ruoyi.system.mapper.OaApprovalApplicationPurchaseMapper;
import com.ruoyi.system.model.OaApprovalApplicationPurchase;
import com.ruoyi.system.model.OaApprovalApplicationPurchaseItem;
import com.ruoyi.system.model.OaApprovalApplications;
import com.ruoyi.system.model.OaApprovalFlowNode;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.OaApprovalApplicationPurchaseItemService;
import com.ruoyi.system.service.OaApprovalApplicationPurchaseService;
import com.ruoyi.system.service.OaApprovalApplicationsService;
@@ -41,8 +40,6 @@
private final OaApprovalApplicationPurchaseItemService oaApprovalApplicationPurchaseItemService;
private final OaApprovalFlowNodeService oaApprovalFlowNodeService;
private final OaApprovalTodoService oaApprovalTodoService;
- private final ISysUserService sysUserService;
- private final ISysDeptService sysDeptService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -51,7 +48,7 @@
OaApprovalApplications applications = buildOaApprovalApplications(dto);
// 2. 如果是提交操作，获取流程节点并创建待办
- OaApprovalFlowNode firstFlowNode = getFirstFlowNode(dto.getApprovalId());
+ OaApprovalFlowNode firstFlowNode = getFirstFlowNode(ApprovalTypeEnum.PURCHASE.getCode());
applications.setCurrentFlowNodeId(firstFlowNode.getId());
oaApprovalApplicationsService.save(applications);
@@ -91,7 +88,7 @@
private OaApprovalApplications buildOaApprovalApplications(OaApprovalApplicationPurchaseDTO dto) {
OaApprovalApplications applications = new OaApprovalApplications();
applications.setApplicationCode(generateApplicationCode());
- applications.setApprovalId(dto.getApprovalId());
+ applications.setApprovalId(ApprovalTypeEnum.PURCHASE.getCode());
applications.setApplicantUserId(dto.getApplicantUserId());
applications.setApplicantName(dto.getApplicantName());
applications.setDeptId(dto.getDeptId());
--
Gitblit v1.7.1