From 41ab7abd0b0ec0fefb03b60bbaf42c02fbda666b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 15:53:16 +0800
Subject: [PATCH] feat(production): 添加生产订单与销售台账关联功能
---
src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
index ad9a709..0edfc7b 100644
--- a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
+++ b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
@@ -20,13 +19,13 @@
* @date : 2025/9/19 10:27
*/
@Data
-@ApiModel
+@Schema
@TableName("maintenance_task")
public class MaintenanceTask {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String deviceModel;
/**
@@ -35,75 +34,75 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "淇濆吇浠诲姟鍚嶇О")
private String taskName;
- @ApiModelProperty(value = "璁惧id")
+ @Schema(description = "璁惧id")
private Long taskId;
- @ApiModelProperty(value = "棰戞")
+ @Schema(description = "棰戞")
@Excel(name = "棰戞")
private String frequencyType;
- @ApiModelProperty(value = "棰戞璇︽儏")
+ @Schema(description = "棰戞璇︽儏")
@Excel(name = "寮�濮嬫棩鏈熶笌鏃堕棿")
private String frequencyDetail;
- @ApiModelProperty(value = "涓嬫鎵ц鏃堕棿")
+ @Schema(description = "涓嬫鎵ц鏃堕棿")
private LocalDateTime nextExecutionTime;
- @ApiModelProperty(value = "鏈�鍚庢墽琛屾椂闂�")
+ @Schema(description = "鏈�鍚庢墽琛屾椂闂�")
private LocalDateTime lastExecutionTime;
- @ApiModelProperty(value = "鏄惁婵�娲�")
+ @Schema(description = "鏄惁婵�娲�")
private boolean isActive;
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
@Excel(name = "澶囨敞")
private String remarks;
- @ApiModelProperty(value = "褰曞叆浜篿d")
+ @Schema(description = "褰曞叆浜篿d")
private Long registrantId;
- @ApiModelProperty(value = "褰曞叆浜�")
+ @Schema(description = "褰曞叆浜�")
@Excel(name = "褰曞叆浜�")
private String registrant;
- @ApiModelProperty(value = "褰曞叆鏃ユ湡")
+ @Schema(description = "褰曞叆鏃ユ湡")
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate registrationDate;
- @ApiModelProperty(value = "鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
+ @Schema(description = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
private Integer deleted;
@TableField(exist = false)
private String dateStr;
- @ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
+ @Schema(description = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
+ @Schema(description = "璁板綍鍒涘缓鏃堕棿")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
// @JsonFormat(pattern = "yyyy-MM-dd")
// @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
+ @Schema(description = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
+ @Schema(description = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Long tenantId;
--
Gitblit v1.9.3