From c247f5bf64c98595cc7e4efc9e1ae7ff1df79c11 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 14:05:32 +0800
Subject: [PATCH] refactor(swagger): 迁移Swagger注解到OpenAPI 3.0
---
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 66 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 16 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..020b71e 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;
@@ -9,9 +10,9 @@
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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 瀹℃壒娴佺▼琛�
@@ -19,10 +20,10 @@
*/
@Data
@TableName("approve_process")
-@ApiModel
+@Schema
public class ApproveProcess{
/**
- *
+ *
*/
@TableId(type = IdType.AUTO)
private Long id;
@@ -33,7 +34,7 @@
/**
* 娴佺▼缂栧彿
*/
- @ApiModelProperty(value = "娴佺▼缂栧彿")
+ @Schema(description = "娴佺▼缂栧彿")
@Excel(name = "娴佺▼缂栧彿")
private String approveId;
@@ -45,7 +46,7 @@
/**
* 鐢宠浜哄悕绉�
*/
- @ApiModelProperty(value = "鐢宠浜哄悕绉�")
+ @Schema(description = "鐢宠浜哄悕绉�")
@Excel(name = "鐢宠浜�")
private String approveUserName;
@@ -57,7 +58,7 @@
/**
* 鐢宠閮ㄩ棬鍚嶇О
*/
- @ApiModelProperty(value = "鐢宠閮ㄩ棬鍚嶇О")
+ @Schema(description = "鐢宠閮ㄩ棬鍚嶇О")
@Excel(name = "鐢宠閮ㄩ棬")
private String approveDeptName;
@@ -74,7 +75,7 @@
/**
* 鐢宠鍘熷洜
*/
- @ApiModelProperty(value = "鐢宠鍘熷洜")
+ @Schema(description = "鐢宠鍘熷洜")
@Excel(name = "瀹℃壒浜嬬敱")
private String approveReason;
@@ -86,7 +87,7 @@
/**
* 褰撳墠瀹℃壒鐢ㄦ埛鍚嶇О
*/
- @ApiModelProperty(value = "褰撳墠瀹℃壒浜�")
+ @Schema(description = "褰撳墠瀹℃壒浜�")
@Excel(name = "褰撳墠瀹℃壒浜�")
private String approveUserCurrentName;
@@ -94,7 +95,7 @@
* 鐢宠鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "鐢宠鏃ユ湡")
+ @Schema(description = "鐢宠鏃ユ湡")
@Excel(name = "鐢宠鏃ユ湡" ,dateFormat = "yyyy-MM-dd")
private Date approveTime;
@@ -102,14 +103,14 @@
* 瀹℃壒瀹屾垚鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "瀹℃壒瀹屾垚鏃堕棿")
+ @Schema(description = "瀹℃壒瀹屾垚鏃堕棿")
@Excel(name = "缁撴潫鏃ユ湡" ,dateFormat = "yyyy-MM-dd")
private Date approveOverTime;
/**
* 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�
*/
- @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�")
+ @Schema(description = "瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�")
@Excel(name = "瀹℃壒鐘舵��", readConverterExp = "0=寰呭鏍�,1=瀹℃牳涓�,2=瀹℃牳瀹屾垚,3=瀹℃牳鏈�氳繃,4=宸查噸鏂版彁浜�")
private Integer approveStatus;
@@ -125,22 +126,55 @@
private Long tenantId;
/**
- * 瀹℃壒绫诲瀷
+ * 瀹℃壒绫诲瀷 1-鍏嚭绠＄悊 2-璇峰亣绠＄悊 3-鍑哄樊绠＄悊 4-鎶ラ攢绠＄悊 5-閲囪喘瀹℃壒 6-鎶ヤ环瀹℃壒 7-鍙戣揣瀹℃壒 8-鍗遍櫓浣滀笟瀹℃壒
*/
private Integer approveType;
+
+ @TableField(exist = false)
+ private String approveTypeName;
/**
* 瀹℃壒澶囨敞
*/
- @ApiModelProperty(value = "瀹℃壒澶囨敞")
+ @Schema(description = "瀹℃壒澶囨敞")
private String approveRemark;
+
+ @Excel(name = "寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd",width = 30)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Schema(description = "寮�濮嬫椂闂�")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date startDate;
+
+ @Excel(name = "缁撴潫鏃堕棿", dateFormat = "yyyy-MM-dd",width = 30)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Schema(description = "缁撴潫鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date endDate;
+
+ private BigDecimal price;
+
+ private String location;
/**
* 鍒涘缓鏃堕棿
*/
private LocalDateTime createTime;
-
+ /**
+ * 璁惧鎶ヤ慨id
+ */
+ private Long deviceRepairId;
+ /**
+ * 鎶ヤ慨閲戦
+ */
+ private BigDecimal maintenancePrice;
private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+}
--
Gitblit v1.9.3