From fe1b02a121c173e9b2d56bbe5a1982e0e69e0548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 28 四月 2026 18:06:08 +0800
Subject: [PATCH] feat(production): 新增生产工单管理功能 - 创建 ProductionOperationTask 实体类定义工单数据结构 - 实现 ProductionOperationTaskController 提供工单的增删改查接口 - 开发 ProductionOperationTaskService 和实现类处理业务逻辑 - 配置 ProductionOperationTaskMapper 及 XML 文件实现数据库操作 - 添加 ProductionOperationTaskVo 视图对象用于数据展示 - 扩展 ProductionOrder 实体类增加生产订单相关属性 - 更新 ProductionOrderMapper.xml 完善订单查询映射配置 - 优化 ProductionOrderPickRecordMapper.xml 记录物料领取明细 - 新增 ProductionOrderRoutingOperationParam 参数配置实体 - 完善 工序参数处理逻辑
---
src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java
index a53ea3d..a0611d9 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java
@@ -1,22 +1,17 @@
package com.ruoyi.safe.pojo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
-import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
/**
* <p>
@@ -29,7 +24,7 @@
@Getter
@Setter
@TableName("safe_training_details")
-@ApiModel(value = "SafeTrainingDetails瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--璁板綍璇︽儏")
+@Schema(name = "SafeTrainingDetails瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--璁板綍璇︽儏")
public class SafeTrainingDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -37,14 +32,14 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鐢ㄦ埛琛ㄦ牸锛坲ser锛変富閿�")
+ @Schema(description = "鐢ㄦ埛琛ㄦ牸锛坲ser锛変富閿�")
@NotBlank(message = "鐢ㄦ埛id涓嶈兘涓虹┖")
private Long userId;
- @ApiModelProperty("鍏宠仈瀹夊叏鍩硅鑰冩牳id")
+ @Schema(description = "鍏宠仈瀹夊叏鍩硅鑰冩牳id")
private Integer safeTrainingId;
- @ApiModelProperty("鑰冩牳缁撴灉")
+ @Schema(description = "鑰冩牳缁撴灉")
private String examinationResults;
@TableField(fill = FieldFill.INSERT)
@@ -67,29 +62,32 @@
private Integer tenantId;
- @ApiModelProperty("鍩硅鏃ユ湡")
+ @Schema(description = "鍩硅鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private LocalDate trainingDate;
- @ApiModelProperty("璇剧▼缂栧彿")
+ @Schema(description = "璇剧▼缂栧彿")
@TableField(exist = false)
private String courseCode;
- @ApiModelProperty("鍩硅鍐呭")
+ @Schema(description = "鍩硅鍐呭")
@TableField(exist = false)
private String trainingContent;
- @ApiModelProperty("鍩硅璇炬椂")
+ @Schema(description = "鍩硅璇炬椂")
@TableField(exist = false)
private Double classHour;
- @ApiModelProperty("璇鹃瀛﹀垎")
+ @Schema(description = "璇鹃瀛﹀垎")
@TableField(exist = false)
private String projectCredits;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
@TableField(exist = false)
private String remarks;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3