From f38209014ee21c1a4e376a841cae3a3f86b9e18f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期日, 28 九月 2025 14:48:34 +0800
Subject: [PATCH] 开票、抄表接口
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml | 4 ++--
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAssetServiceImpl.java | 9 +++++++--
2 files changed, 9 insertions(+), 4 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 f3f7667..fdb9954 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
@@ -133,7 +133,7 @@
private OaApprovalApplicationAsset buildOaApprovalApplicationAsset(OaApprovalApplicationAssetReceiveDTO dto, Integer applicationId) {
OaApprovalApplicationAsset asset = BeanUtil.copyProperties(dto, OaApprovalApplicationAsset.class);
asset.setApprovalApplicationId(applicationId);
- asset.setType(AssetOperateTypeEnum.RECEIVE.getCode());
+ asset.setType(dto.getType());
return asset;
}
@@ -227,6 +227,7 @@
vo.setTitle(detail.getTitle());
vo.setAssetTypeId(detail.getAssetTypeId());
vo.setOperateTime(detail.getOperateTime());
+ vo.setExpectReturnDate(detail.getExpectReturnDate());
vo.setItems(assetMainVOS);
return vo;
}
@@ -277,8 +278,12 @@
// 4. 保存归还明细
OaApprovalApplicationAsset detail = BeanUtil.copyProperties(dto, OaApprovalApplicationAsset.class);
detail.setApprovalApplicationId(applications.getId());
+ detail.setBorrowApplicationId(dto.getApprovalApplicationId());
detail.setType(AssetOperateTypeEnum.RETURN.getCode());
-
+ OaApprovalApplicationAsset asset = lambdaQuery().eq(OaApprovalApplicationAsset::getApprovalApplicationId, dto.getApprovalApplicationId()).one();
+ if (Objects.nonNull(asset)) {
+ detail.setAssetTypeId(asset.getAssetTypeId());
+ }
this.save(detail);
// 5. 保存关联的资产项
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
index 93a0186..0dac4af 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
@@ -72,9 +72,9 @@
LEFT JOIN oa_approval_applications oaa ON oaaai.approval_application_id = oaa.id
<where>
oaaa.type = 2 AND oaaa.borrow_application_id = #{applicationId}
- <if test="assetIds != null and assetIds.size() > 0">
+ <if test="assetMainIds != null and assetMainIds.size() > 0">
AND oaaai.asset_main_id IN
- <foreach collection="assetIds" item="id" open="(" separator="," close=")">
+ <foreach collection="assetMainIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
--
Gitblit v1.7.1