From 04abe23808d72c86781c2fa9af358d93455f2bb1 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 13 十一月 2025 17:35:56 +0800
Subject: [PATCH] yys 1.仓储物流增加分类管理 2.仓储物流分类管理导出接口 4.新疆生产管控定制化
---
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 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 18c624c..6fefc5d 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -1,16 +1,19 @@
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;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 瀹℃壒娴佺▼琛�
@@ -33,6 +36,7 @@
* 娴佺▼缂栧彿
*/
@ApiModelProperty(value = "娴佺▼缂栧彿")
+ @Excel(name = "娴佺▼缂栧彿")
private String approveId;
/**
@@ -43,6 +47,8 @@
/**
* 鐢宠浜哄悕绉�
*/
+ @ApiModelProperty(value = "鐢宠浜哄悕绉�")
+ @Excel(name = "鐢宠浜�")
private String approveUserName;
/**
@@ -54,6 +60,7 @@
* 鐢宠閮ㄩ棬鍚嶇О
*/
@ApiModelProperty(value = "鐢宠閮ㄩ棬鍚嶇О")
+ @Excel(name = "鐢宠閮ㄩ棬")
private String approveDeptName;
/**
@@ -70,6 +77,7 @@
* 鐢宠鍘熷洜
*/
@ApiModelProperty(value = "鐢宠鍘熷洜")
+ @Excel(name = "瀹℃壒浜嬬敱")
private String approveReason;
/**
@@ -80,6 +88,8 @@
/**
* 褰撳墠瀹℃壒鐢ㄦ埛鍚嶇О
*/
+ @ApiModelProperty(value = "褰撳墠瀹℃壒浜�")
+ @Excel(name = "褰撳墠瀹℃壒浜�")
private String approveUserCurrentName;
/**
@@ -87,18 +97,22 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "鐢宠鏃ユ湡")
+ @Excel(name = "鐢宠鏃ユ湡" ,dateFormat = "yyyy-MM-dd")
private Date approveTime;
/**
* 瀹℃壒瀹屾垚鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "瀹℃壒瀹屾垚鏃堕棿")
+ @Excel(name = "缁撴潫鏃ユ湡" ,dateFormat = "yyyy-MM-dd")
private Date approveOverTime;
/**
* 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�
*/
@ApiModelProperty(value = "瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�")
+ @Excel(name = "瀹℃壒鐘舵��", readConverterExp = "0=寰呭鏍�,1=瀹℃牳涓�,2=瀹℃牳瀹屾垚,3=瀹℃牳鏈�氳繃,4=宸查噸鏂版彁浜�")
private Integer approveStatus;
/**
@@ -123,6 +137,22 @@
@ApiModelProperty(value = "瀹℃壒澶囨敞")
private String approveRemark;
+ @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;
+
/**
* 鍒涘缓鏃堕棿
*/
--
Gitblit v1.9.3