From fda182841a8258e355365c8ff16f28672b8523e6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 25 九月 2025 11:55:34 +0800
Subject: [PATCH] 联调问题修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAssetServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAssetServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAssetServiceImpl.java
index 8fcf871..f3f7667 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAssetServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAssetServiceImpl.java
@@ -131,7 +131,7 @@
}
private OaApprovalApplicationAsset buildOaApprovalApplicationAsset(OaApprovalApplicationAssetReceiveDTO dto, Integer applicationId) {
- OaApprovalApplicationAsset asset = new OaApprovalApplicationAsset();
+ OaApprovalApplicationAsset asset = BeanUtil.copyProperties(dto, OaApprovalApplicationAsset.class);
asset.setApprovalApplicationId(applicationId);
asset.setType(AssetOperateTypeEnum.RECEIVE.getCode());
return asset;
@@ -170,7 +170,7 @@
if (detail == null) {
throw new ServiceException("记录不存在");
}
-
+ oaApprovalApplicationsService.assembleApplicationDetail(app);
List<Integer> assetMainIds = oaApprovalApplicationAssetItemService.lambdaQuery()
.eq(OaApprovalApplicationAssetItem::getApprovalApplicationId, app.getId())
.list().stream().map(OaApprovalApplicationAssetItem::getAssetMainId)
@@ -202,7 +202,7 @@
if (detail == null) {
throw new ServiceException("记录不存在");
}
-
+ oaApprovalApplicationsService.assembleApplicationDetail(app);
List<Integer> assetMainIds = oaApprovalApplicationAssetItemService.lambdaQuery()
.eq(OaApprovalApplicationAssetItem::getApprovalApplicationId, app.getId())
.list().stream().map(OaApprovalApplicationAssetItem::getAssetMainId)
@@ -311,4 +311,10 @@
});
return pageByType;
}
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public void deleteByApplicationId(Integer applicationId) {
+ this.lambdaUpdate().eq(OaApprovalApplicationAsset::getApprovalApplicationId, applicationId).remove();
+ oaApprovalApplicationsService.removeById(applicationId);
+ }
}
--
Gitblit v1.7.1