From 22bdadd4dc84ddca2482d9a53c4871aa63d87013 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 21 十一月 2025 13:33:42 +0800
Subject: [PATCH] yys 1.报销管理增加报销金额字段
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 1 +
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 8 ++++++++
src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java | 8 ++++++++
src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java | 9 +++++++++
4 files changed, 26 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 c1114bd..7c5bcee 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -1,6 +1,7 @@
package com.ruoyi.approve.pojo;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@@ -84,6 +85,13 @@
private Long approveUserCurrentId;
/**
+ * 鎶ラ攢閲戦
+ */
+ @ApiModelProperty(value = "鎶ラ攢閲戦")
+ @Excel(name = "鎶ラ攢閲戦")
+ private BigDecimal price;
+
+ /**
* 褰撳墠瀹℃壒鐢ㄦ埛鍚嶇О
*/
@ApiModelProperty(value = "褰撳墠瀹℃壒浜�")
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 e866bbf..67f7173 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -80,6 +80,7 @@
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
ApproveProcess approveProcess = new ApproveProcess();
approveProcess.setApproveId(approveID);
+ approveProcess.setPrice(approveProcessVO.getPrice());
approveProcess.setApproveUser(approveProcessVO.getApproveUser());
approveProcess.setApproveUserName(sysUser.getNickName());
approveProcess.setApproveDeptId(approveProcessVO.getApproveDeptId());
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
index 69d5dea..4424b1c 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
@@ -1,15 +1,23 @@
package com.ruoyi.approve.vo;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
import java.util.List;
@Data
public class ApproveGetAndUpdateVo {
private List<String> tempFileIds;
+
+ /**
+ * 鎶ラ攢閲戦
+ */
+ private BigDecimal price;
//瀹℃壒id
@NotBlank(message = "娴佺▼缂栧彿涓嶈兘涓虹┖")
private String id;
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
index 1fb353e..7f0aa5d 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
@@ -1,9 +1,12 @@
package com.ruoyi.approve.vo;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -12,6 +15,7 @@
private List<String> tempFileIds;
private Long id;
+
private Long approveDeptId;
@@ -27,6 +31,11 @@
private String approveReason;
/**
+ * 鎶ラ攢閲戦
+ */
+ private BigDecimal price;
+
+ /**
* 瀹℃壒绫诲瀷
*/
private Integer approveType;
--
Gitblit v1.9.3