From be9eaa59298523bb8eb644d8f38b507d24ca5fb7 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 11:47:36 +0800
Subject: [PATCH] 1.固定资产核算接口、采购异常类-至军泰伟业 2.选择工艺路线项目后选择工序，点击提交报错，修改bug
---
src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java | 79 +++++++++++++++++++++++++++++++++------
1 files changed, 67 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
index 5835645..bf8edae 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
@@ -1,23 +1,78 @@
package com.ruoyi.approve.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.sales.pojo.CommonFile;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
@Data
public class ApproveProcessVO {
+ /**
+ * 涓存椂鏂囦欢id鍒楄〃
+ */
+ private List<String> tempFileIds;
+ /**
+ * 瀹℃壒娴佺▼id
+ */
+ private Long id;
- //閮ㄩ棬id
- // private Long deptId;
- //閮ㄩ棬鍚嶇О
- @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
- private String deptName;
- //瀹℃壒浜� ids
- // private String approverIds;
- //瀹℃壒浜哄悕绉�
- @NotBlank(message = "瀹℃壒浜轰笉鑳戒负绌�")
- private String approverNames;
- //瀹℃壒浜嬬敱
- @NotBlank(message = "11")
+ private String approveId;
+ /**
+ * 瀹℃壒閮ㄩ棬id
+ */
+ private Long approveDeptId;
+ /**
+ * 瀹℃壒鏃堕棿
+ */
+ private String approveTime;
+ /**
+ * 鐢宠浜篿d
+ */
+ // 鐢宠浜�
+ private Long approveUser;
+ /**
+ * 瀹℃壒浜篿d鍒楄〃
+ */
+ // 瀹℃壒浜�
+ private String approveUserIds;
+ /**
+ * 瀹℃壒鐞嗙敱
+ */
private String approveReason;
+
+ @Excel(name = "寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd",width = 30)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date startDate;
+
+ @Excel(name = "缁撴潫鏃堕棿", dateFormat = "yyyy-MM-dd",width = 30)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date endDate;
+
+ private BigDecimal price;
+
+ private String location;
+
+ /**
+ * 瀹℃壒绫诲瀷
+ */
+ private Integer approveType;
+ /**
+ * 璁惧鎶ヤ慨id
+ */
+ private Long deviceRepairId;
+ /**
+ * 鎶ヤ慨閲戦
+ */
+ private BigDecimal maintenancePrice;
}
--
Gitblit v1.9.3