From fc3b0c4bfef4e1452916190fcfca7b11ddd83e13 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 23 五月 2026 14:02:35 +0800
Subject: [PATCH] feat(approve): 添加报销金额字段支持
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 2 ++
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 5 +++++
src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java | 3 +++
src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java | 5 +++++
4 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 7e04634..0ba6abb 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -149,6 +149,11 @@
* 璁惧鎶ヤ慨id
*/
private Long deviceRepairId;
+
+ /**
+ * 鎶ラ攢閲戦
+ */
+ private BigDecimal price;
/**
* 鎶ヤ慨閲戦
*/
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index 3a1206b..78a0fc4 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -84,6 +84,7 @@
approveProcess.setApproveUserName(sysUser.getNickName());
approveProcess.setApproveDeptId(approveProcessVO.getApproveDeptId());
approveProcess.setApproveDeptName(sysDept.getDeptName());
+ approveProcess.setPrice(approveProcessVO.getPrice());
approveProcess.setApproveUserNames(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
approveProcess.setApproveTime(StringUtils.isEmpty(approveProcessVO.getApproveTime()) ? null : dateFormat.parse(approveProcessVO.getApproveTime()));
approveProcess.setApproveReason(approveProcessVO.getApproveReason());
@@ -190,6 +191,7 @@
approve.setApproveUserCurrentId(Long.parseLong(split[0]));
approve.setApproveUserCurrentName(sysUsers.stream().filter(user -> user.getUserId().equals(Long.parseLong(split[0]))).collect(Collectors.toList()).get(0).getNickName());
}
+ approve.setPrice(approveGetAndUpdateVo.getPrice());
updateById(approve);
//淇敼瀹℃壒浜�
// 鍏堝垹闄� 鍚庢柊澧�
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
index 69d5dea..7b3b3d2 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
@@ -4,6 +4,7 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -28,4 +29,6 @@
* 瀹℃壒绫诲瀷
*/
private Integer approveType;
+
+ private BigDecimal price;
}
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
index ae3cf9e..a20ecac 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
@@ -56,4 +56,9 @@
* 鎶ヤ慨閲戦
*/
private BigDecimal maintenancePrice;
+
+ /**
+ * 鎶ラ攢閲戦
+ */
+ private BigDecimal price;
}
--
Gitblit v1.9.3