From 6da289fff756eaecc600422d77c4afff1ddebab0 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 23 五月 2025 15:23:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java | 75 +++++++++++++++++++++++++++++--------
1 files changed, 59 insertions(+), 16 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
index 0481ec4..e6f7157 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
@@ -2,8 +2,15 @@
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.data.annotation.Id;
+
+import java.math.BigDecimal;
/**
* 鏍囧噯宸ュ簭瀵硅薄 aps_standard_process
@@ -11,63 +18,98 @@
* @author hjy
* @date 2025-04-23
*/
+
+@Schema(description = "鏍囧噯宸ュ簭瀹炰綋")
public class ApsStandardProcess extends BaseEntity
{
private static final long serialVersionUID = 1L;
+ @Id
+ @TableId(type = IdType.AUTO)
/** 涓婚敭id */
+ @JsonFormat(shape = JsonFormat.Shape.STRING)
+ /** 涓婚敭id */
+ @Schema(description = "涓婚敭id", type = "Long")
private Long id;
/** 宸ュ簭缂栫爜 */
+ @Schema(description = "宸ュ簭缂栫爜", type = "String")
@Excel(name = "宸ュ簭缂栫爜")
private String processNumber;
/** 宸ュ簭鍚嶇О */
+ @Schema(description = "宸ュ簭鍚嶇О", type = "String")
@Excel(name = "宸ュ簭鍚嶇О")
private String processName;
/** 璧勬簮缁� */
+ @Schema(description = "璧勬簮缁�", type = "String")
@Excel(name = "璧勬簮缁�")
private String resourceGroupName;
+ /** 涓撲笟 */
+ @Schema(description = "涓撲笟", type = "String")
+ @Excel(name = "涓撲笟")
+ private String major;
/** 浜ц兘妯″瀷: 鐙崰/鍚堟壒 */
- @Excel(name = "浜ц兘妯″瀷: 鐙崰/鍚堟壒")
+ @Schema(description = "浜ц兘妯″瀷", type = "String")
+ @Excel(name = "浜ц兘妯″瀷")
private String model;
/** 璁捐浜ц兘 */
+ @Schema(description = "璁捐浜ц兘", type = "String")
@Excel(name = "璁捐浜ц兘")
- private String designCapacity;
+ private BigDecimal designCapacity;
/** 宸ュ巶Id */
- @Excel(name = "宸ュ巶Id")
+ @Schema(description = "宸ュ巶Id", type = "String")
+// @Excel(name = "宸ュ巶Id")
private String plantId;
/** 宸ュ巶 */
- @Excel(name = "宸ュ巶")
+ @Schema(description = "閫傜敤宸ュ巶", type = "String")
+ @Excel(name = "閫傜敤宸ュ巶")
private String plant;
/** 杞﹂棿Id */
- @Excel(name = "杞﹂棿Id")
+ @Schema(description = "杞﹂棿Id", type = "String")
+// @Excel(name = "杞﹂棿Id")
private String workShopId;
/** 杞﹂棿 */
- @Excel(name = "杞﹂棿")
+ @Schema(description = "閫傜敤杞﹂棿", type = "String")
+ @Excel(name = "閫傜敤杞﹂棿")
private String workShop;
/** 鏃ュ巻Id */
- @Excel(name = "鏃ュ巻Id")
+ @Schema(description = "鏃ュ巻Id", type = "Long")
+// @Excel(name = "鏃ュ巻Id")
private Long workCalenderId;
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- private String delFlag;
-
- /** 浜ц兘妯″瀷Id */
- @Excel(name = "浜ц兘妯″瀷Id")
- private Long modelId;
-
/** 鏃ュ巻鎻忚堪 */
+ @Schema(description = "鏃ュ巻鎻忚堪", type = "String")
@Excel(name = "鏃ュ巻鎻忚堪")
private String workCalender;
+
+ /** 浜ц兘妯″瀷Id */
+ @Schema(description = "浜ц兘妯″瀷Id", type = "Long")
+// @Excel(name = "浜ц兘妯″瀷Id")
+ private Long modelId;
+
+
+ /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ @Schema(description = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�", type = "String")
+ private String delFlag;
+
+
+
+ public String getMajor() {
+ return major;
+ }
+
+ public void setMajor(String major) {
+ this.major = major;
+ }
public void setId(Long id)
{
@@ -119,12 +161,12 @@
return model;
}
- public void setDesignCapacity(String designCapacity)
+ public void setDesignCapacity(BigDecimal designCapacity)
{
this.designCapacity = designCapacity;
}
- public String getDesignCapacity()
+ public BigDecimal getDesignCapacity()
{
return designCapacity;
}
@@ -230,6 +272,7 @@
.append("updateTime", getUpdateTime())
.append("modelId", getModelId())
.append("workCalender", getWorkCalender())
+ .append("major", getMajor())
.toString();
}
}
--
Gitblit v1.9.3