From 4cb12d21253d754152b7591fe49fa131fed1b3c8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 14:37:28 +0800
Subject: [PATCH] refactor(production): 移除销售台账关联逻辑并优化生产订单创建流程
---
src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java b/src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java
index 2cad42f..869d84f 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java
@@ -10,8 +10,7 @@
import java.time.LocalDateTime;
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 lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -27,7 +26,7 @@
@Getter
@Setter
@TableName("safe_contingency_plan")
-@ApiModel(value = "SafeContingencyPlan瀵硅薄", description = "瀹夊叏鐢熶骇--搴旀�ラ妗堟煡闃�")
+@Schema(name = "SafeContingencyPlan瀵硅薄", description = "瀹夊叏鐢熶骇--搴旀�ラ妗堟煡闃�")
public class SafeContingencyPlan implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,34 +34,34 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("搴旀�ラ妗堢紪鐮�")
+ @Schema(description = "搴旀�ラ妗堢紪鐮�")
private String planCode;
- @ApiModelProperty("搴旀�ラ妗堝悕绉�")
+ @Schema(description = "搴旀�ラ妗堝悕绉�")
private String planName;
- @ApiModelProperty("棰勬绫诲瀷")
+ @Schema(description = "棰勬绫诲瀷")
private String planType;
- @ApiModelProperty("閫傜敤鑼冨洿")
+ @Schema(description = "閫傜敤鑼冨洿")
private String applyScope;
- @ApiModelProperty("鏍稿績璐ｄ换浜�")
+ @Schema(description = "鏍稿績璐ｄ换浜�")
private Integer coreResponsorUserId;
- @ApiModelProperty("鏍稿績璐ｄ换浜�")
+ @Schema(description = "鏍稿績璐ｄ换浜�")
@TableField(exist = false)
private String coreResponsorUserName;
- @ApiModelProperty("搴旀�ュ缃楠�")
+ @Schema(description = "搴旀�ュ缃楠�")
private String execSteps;
- @ApiModelProperty("鍙戝竷鐢熸晥鏃堕棿")
+ @Schema(description = "鍙戝竷鐢熸晥鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate publishTime;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
@TableField(fill = FieldFill.INSERT)
@@ -73,7 +72,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏈�鍚庝慨璁㈡椂闂�")
+ @Schema(description = "鏈�鍚庝慨璁㈡椂闂�")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -84,4 +83,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3