From c036f64ea6f544ffeb7506325b04f5d4ec5d24b6 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Sun, 29 Sep 2024 17:48:41 +0800
Subject: [PATCH] 湖北水库：设备管理添加价格排序
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java
index 4f003c2..4d119ac 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java
@@ -5,15 +5,15 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
import org.springblade.core.mp.base.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -25,6 +25,9 @@
*/
@Data
@TableName("SG_DEVICE")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
public class SgDeviceDO implements Serializable {
private static final long serialVersionUID = 1L;
@@ -47,6 +50,14 @@
*/
@TableField(exist = false)
private String typeName;
+ /**
+ * 设备进度
+ */
+ @TableField(exist = false)
+ private String deviceProgress;
+
+ @TableField(exist = false)
+ private String progress;
/**
* 项目id
*/
@@ -72,6 +83,7 @@
/**
* 创建人
*/
+ @TableField(exist = false)
private Long createUser;
/**
@@ -81,7 +93,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
-
+ /**
+ * 工序步骤
+ */
+ @TableField(exist = false)
+ private List<SgGxStepDO> stepDOList;
/**
* 修改时间
*/
@@ -89,6 +105,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+ private Integer status;
+ /**
+ * 价格
+ */
+ private String price;
}
--
Gitblit v1.9.3