From f36922706377954cfee49fbf7763f159c83d534b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 17 九月 2025 14:10:44 +0800
Subject: [PATCH] 资产管理-资产入库
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationPurchaseServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 f00eb9b..7d16f94 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
@@ -5,7 +5,7 @@
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.system.dto.OaApprovalApplicationPurchaseDTO;
+import com.ruoyi.system.dto.asset.OaApprovalApplicationPurchaseDTO;
import com.ruoyi.system.emums.ApprovalStatusEnum;
import com.ruoyi.system.mapper.OaApprovalApplicationPurchaseMapper;
import com.ruoyi.system.model.OaApprovalApplicationPurchase;
@@ -96,7 +96,7 @@
/**
* 创建待办数据
*/
- private void createApprovalTodo(Long applicationId, String applicationCode, OaApprovalFlowNode flowNode, Integer deptId) {
+ private void createApprovalTodo(Integer applicationId, String applicationCode, OaApprovalFlowNode flowNode, Integer deptId) {
// 根据审批类型创建待办数据
Integer approvalType = flowNode.getApprovalType();
if (approvalType == null) {
@@ -120,7 +120,7 @@
/**
* 创建上级部门审批待办
*/
- private void createUpperDeptTodo(Long applicationId, String applicationCode, OaApprovalFlowNode flowNode, Integer deptId) {
+ private void createUpperDeptTodo(Integer applicationId, String applicationCode, OaApprovalFlowNode flowNode, Integer deptId) {
// 1. 获取申请部门信息
if (deptId == null) {
throw new ServiceException("未填写申请部门信息");
@@ -154,7 +154,7 @@
/**
* 创建指定部门审批待办
*/
- private void createSpecifiedDeptTodo(Long applicationId, String applicationCode, OaApprovalFlowNode flowNode) {
+ private void createSpecifiedDeptTodo(Integer applicationId, String applicationCode, OaApprovalFlowNode flowNode) {
if (StringUtils.isBlank(flowNode.getApprovalIds())) {
throw new ServiceException("操作失败，审批流程配置异常");
}
@@ -174,7 +174,7 @@
/**
* 创建指定人员审批待办
*/
- private void createSpecifiedUserTodo(Long applicationId, String applicationCode, OaApprovalFlowNode flowNode) {
+ private void createSpecifiedUserTodo(Integer applicationId, String applicationCode, OaApprovalFlowNode flowNode) {
if (StringUtils.isBlank(flowNode.getApprovalIds())) {
throw new ServiceException("操作失败，审批流程配置异常");
}
@@ -192,7 +192,7 @@
/**
* 创建待办数据项
*/
- private void createTodoItem(Long applicationId, String applicationCode, OaApprovalFlowNode flowNode, List<SysUser> userList) {
+ private void createTodoItem(Integer applicationId, String applicationCode, OaApprovalFlowNode flowNode, List<SysUser> userList) {
List<OaApprovalTodo> approvalTodoList = userList.stream().map(item -> {
OaApprovalTodo todo = new OaApprovalTodo();
todo.setApplicationId(applicationId);
@@ -236,9 +236,9 @@
/**
* 构建采购申请详情数据
*/
- private OaApprovalApplicationPurchase buildOaApprovalApplicationPurchase(OaApprovalApplicationPurchaseDTO dto, Long applicationId) {
+ private OaApprovalApplicationPurchase buildOaApprovalApplicationPurchase(OaApprovalApplicationPurchaseDTO dto, Integer applicationId) {
OaApprovalApplicationPurchase purchase = new OaApprovalApplicationPurchase();
- purchase.setApprovalApplicationId(applicationId.intValue());
+ purchase.setApprovalApplicationId(applicationId);
// 使用事项标题，而非采购说明
purchase.setTitle(dto.getTitle());
// 表结构中无 application_date 字段，此处不再设置
@@ -251,11 +251,11 @@
/**
* 构建采购资产明细数据
*/
- private List<OaApprovalApplicationPurchaseItem> buildOaApprovalApplicationPurchaseItems(OaApprovalApplicationPurchaseDTO dto, Long applicationId) {
+ private List<OaApprovalApplicationPurchaseItem> buildOaApprovalApplicationPurchaseItems(OaApprovalApplicationPurchaseDTO dto, Integer applicationId) {
return dto.getPurchaseItems().stream()
.map(item -> {
OaApprovalApplicationPurchaseItem purchaseItem = new OaApprovalApplicationPurchaseItem();
- purchaseItem.setApprovalApplicationId(applicationId.intValue());
+ purchaseItem.setApprovalApplicationId(applicationId);
purchaseItem.setAssetName(item.getAssetName());
purchaseItem.setAssetTypeId(item.getAssetTypeId());
purchaseItem.setSpec(item.getSpec());
--
Gitblit v1.7.1