From 763c537040d45334190f470cd5ba056610d3aa36 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 16 四月 2026 11:01:36 +0800
Subject: [PATCH] feat: 部件的导入修改
---
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index af7b343..f3a19a3 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotation.*;
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 lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,6 +16,7 @@
@TableName("product_process")
@Data
@ExcelIgnoreUnannotated
+@ApiModel(value = "productProcess", description = "宸ュ簭琛�")
public class ProductProcess implements Serializable {
private static final long serialVersionUID = 1L;
@@ -24,27 +27,36 @@
/**
* 宸ュ簭鍚嶇О
*/
- @Excel(name = "宸ュ簭鍚嶇О")
+ @Excel(name = "閮ㄤ欢鍚嶇О")
private String name;
/**
* 宸ュ簭缂栧彿
*/
- @Excel(name = "宸ュ簭缂栧彿")
+ @Excel(name = "閮ㄤ欢缂栧彿")
private String no;
-
- /**
- * 澶囨敞
- */
- @Excel(name = "澶囨敞")
- private String remark;
/**
* 宸ヨ祫瀹氶
*/
@Excel(name = "宸ヨ祫瀹氶")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal salaryQuota;
+
+
+ @ApiModelProperty("绫诲瀷1-鍔犲伐锛�2-鍒澘鍐疯姱鍒朵綔銆�3-绠¤矾缁勫銆�4-缃愪綋杩炴帴鍙婅皟璇曪紝5-娴嬭瘯鎵撳帇锛�6-鍏朵粬")
+ private Integer type;
+
+ @TableField(exist = false)
+ @Excel(name = "閮ㄤ欢绫诲瀷")
+ private String ProductProcessType;
+
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞")
+ private String remark;
/**
* 鍒涘缓鏃堕棿
@@ -68,5 +80,15 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鏄惁璐ㄦ")
+ private Boolean isQuality;
+
+
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3