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/lavorissue/pojo/LaborIssue.java | 73 ++++++++++++++++++++++++++++++------
1 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
index 2772d6e..af9dd0e 100644
--- a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
+++ b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
@@ -2,9 +2,9 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.approve.utils.StartAndEndDateDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-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;
@@ -17,32 +17,46 @@
*/
@Data
@TableName("labor_issue")
-@ApiModel
-public class LaborIssue {
+@Schema
+public class LaborIssue extends StartAndEndDateDto {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @TableField(exist = false)
+ @Schema(description = "1-宸查鍙栧姵淇濇暟閲� 2-鏈鍙栧姵淇濇暟閲� 3-瓒呮椂宸查鍙栧姵淇濇暟閲� 4-瓒呮椂鏈鍙栧姵淇濇暟閲�")
+ private Integer status;
+
+ @TableField(exist = false)
+ private Integer season;
+
/**
* 閮ㄩ棬鍚嶇О
*/
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Schema(description = "閮ㄩ棬鍚嶇О")
@Excel(name = "閮ㄩ棬鍚嶇О")
@TableField(exist = false)
private String deptName;
/**
+ * 鍔充繚鍗曞彿
+ */
+ @Schema(description = "鍔充繚鍗曞彿")
+ @Excel(name = "鍔充繚鍗曞彿")
+ private String orderNo;
+
+ /**
* 鍛樺伐id
*/
- @ApiModelProperty("鍛樺伐id")
+ @Schema(description = "鍛樺伐id")
private Long staffId;
/**
* 鍛樺伐鍚嶇О
*/
- @ApiModelProperty("鍛樺伐鍚嶇О")
+ @Schema(description = "鍛樺伐鍚嶇О")
@Excel(name = "鍛樺伐鍚嶇О")
@TableField(exist = false)
private String staffName;
@@ -50,21 +64,35 @@
/**
* 鍛樺伐缂栧彿
*/
- @ApiModelProperty("鍛樺伐缂栧彿")
+ @Schema(description = "鍛樺伐缂栧彿")
@Excel(name = "鍛樺伐缂栧彿")
@TableField(exist = false)
private String staffNo;
/**
+ * 鍔充繚绫诲瀷-瀛楀吀
+ */
+ @Schema(description = "鍔充繚绫诲瀷-瀛楀吀")
+ private String dictType;
+
+ /**
+ * 鍔充繚绫诲瀷
+ */
+ @Schema(description = "鍔充繚绫诲瀷")
+ @Excel(name = "鍔充繚绫诲瀷")
+ @TableField(exist = false)
+ private String dictTypeName;
+
+ /**
* 闃插叿鍚嶇О-瀛楀吀
*/
- @ApiModelProperty("闃插叿鍚嶇О-瀛楀吀")
+ @Schema(description = "闃插叿鍚嶇О-瀛楀吀")
private String dictId;
/**
* 闃插叿鍚嶇О
*/
- @ApiModelProperty("闃插叿鍚嶇О")
+ @Schema(description = "闃插叿鍚嶇О")
@Excel(name = "闃插叿鍚嶇О")
@TableField(exist = false)
private String dictName;
@@ -72,14 +100,32 @@
/**
* 棰嗙敤鏁伴噺
*/
- @ApiModelProperty("棰嗙敤鏁伴噺")
+ @Schema(description = "棰嗙敤鏁伴噺")
@Excel(name = "棰嗙敤鏁伴噺")
private Long num;
/**
+ * 杩涘巶鏃ユ湡
+ */
+ @Schema(description = "杩涘巶鏃ユ湡")
+ @Excel(name = "杩涘巶鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date factoryDate;
+
+ /**
+ * 鍙戞斁鏃ユ湡
+ */
+ @Schema(description = "鍙戞斁鏃ユ湡")
+ @Excel(name = "鍙戞斁鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date issueDate;
+
+ /**
* 棰嗙敤鏃ユ湡
*/
- @ApiModelProperty("棰嗙敤鏃ユ湡")
+ @Schema(description = "棰嗙敤鏃ユ湡")
@Excel(name = "棰嗙敤鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -122,4 +168,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3