From 86b776e14070d7e00471b591a5325104772e7fc4 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 28 三月 2026 09:58:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxsj' into hxsj
---
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 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..7e04634 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -1,12 +1,14 @@
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;
@@ -21,7 +23,7 @@
@ApiModel
public class ApproveProcess{
/**
- *
+ *
*/
@TableId(type = IdType.AUTO)
private Long id;
@@ -33,6 +35,7 @@
* 娴佺▼缂栧彿
*/
@ApiModelProperty(value = "娴佺▼缂栧彿")
+ @Excel(name = "娴佺▼缂栧彿")
private String approveId;
/**
@@ -43,6 +46,8 @@
/**
* 鐢宠浜哄悕绉�
*/
+ @ApiModelProperty(value = "鐢宠浜哄悕绉�")
+ @Excel(name = "鐢宠浜�")
private String approveUserName;
/**
@@ -54,6 +59,7 @@
* 鐢宠閮ㄩ棬鍚嶇О
*/
@ApiModelProperty(value = "鐢宠閮ㄩ棬鍚嶇О")
+ @Excel(name = "鐢宠閮ㄩ棬")
private String approveDeptName;
/**
@@ -70,6 +76,7 @@
* 鐢宠鍘熷洜
*/
@ApiModelProperty(value = "鐢宠鍘熷洜")
+ @Excel(name = "瀹℃壒浜嬬敱")
private String approveReason;
/**
@@ -80,6 +87,8 @@
/**
* 褰撳墠瀹℃壒鐢ㄦ埛鍚嶇О
*/
+ @ApiModelProperty(value = "褰撳墠瀹℃壒浜�")
+ @Excel(name = "褰撳墠瀹℃壒浜�")
private String approveUserCurrentName;
/**
@@ -87,18 +96,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;
/**
@@ -112,9 +125,14 @@
// @TableField(fill = FieldFill.INSERT)
private Long tenantId;
- /**
- * 瀹℃壒绫诲瀷
- */
+ /** * 瀹℃壒绫诲瀷
+ * 0: "鍗忓悓瀹℃壒绠＄悊琛�",
+ * 1: "鍏嚭绠＄悊瀹℃壒琛�",
+ * 2: "璇峰亣绠＄悊瀹℃壒琛�",
+ * 3: "鍑哄樊绠＄悊瀹℃壒琛�",
+ * 4: "鎶ラ攢绠＄悊瀹℃壒琛�",
+ * 5: "閲囪喘鐢宠瀹℃壒琛�",
+ * 6: "閿�鍞鍗曞鎵硅〃", */
private Integer approveType;
/**
@@ -127,8 +145,15 @@
* 鍒涘缓鏃堕棿
*/
private LocalDateTime createTime;
-
+ /**
+ * 璁惧鎶ヤ慨id
+ */
+ private Long deviceRepairId;
+ /**
+ * 鎶ヤ慨閲戦
+ */
+ private BigDecimal maintenancePrice;
private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3