From 608f0d2c05d86510d546a362e44c10feb601b3f1 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 08 四月 2025 08:19:10 +0800
Subject: [PATCH] 优化项优化
---
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java
index 0f8736b..e927120 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java
@@ -1,5 +1,6 @@
package com.by4cloud.platformx.device.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -9,7 +10,9 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.Transient;
import java.util.Date;
+import java.util.List;
/**
* @author kdq
@@ -22,8 +25,12 @@
@Entity
@Table(appliesTo = "device_demand_plan", comment = "璁惧闇�姹傝鍒掍富琛�")
public class DeviceDemandPlan extends BaseModel<DeviceDemandPlan> {
- @Schema(description = "璁惧缂栫爜")
- @Column(columnDefinition="VARCHAR(64) comment '璁惧缂栫爜'")
+
+ @Schema(description = "鍚堝苟璁″垝id")
+ @Column(columnDefinition="long comment '鍚堝苟璁″垝id'")
+ private Long planId;
+ @Schema(description = "缂栫爜")
+ @Column(columnDefinition="VARCHAR(64) comment '缂栫爜'")
private String number;
@Schema(description = "骞村害")
@Column(columnDefinition="int comment '骞村害'")
@@ -31,27 +38,33 @@
@Schema(description = "鑱旂郴浜�")
@Column(columnDefinition="VARCHAR(64) comment '鑱旂郴浜�'")
private String contacts;
- @Schema(description = "鐢虫姤鐘舵�� 0鐢宠涓紝1浜岀骇鍗曚綅瀹℃牳鎷掔粷 2浜岀骇鍗曚綅瀹℃牳閫氳繃 3闆嗗洟瀹℃牳鎷掔粷 4闆嗗洟瀹℃牳閫氳繃")
+ @Schema(description = "鐢虫姤鐘舵�� 0鐢宠涓紝1浜岀骇鍗曚綅瀹℃牳鎷掔粷 2浜岀骇鍗曚綅瀹℃牳閫氳繃 3寰呴泦鍥㈡壒鍑� 4闆嗗洟瀹℃牳鎷掔粷 5闆嗗洟瀹℃牳閫氳繃")
@Column(columnDefinition="int comment '鐢虫姤鐘舵��'")
private Integer status;
@Schema(description = "鐢虫姤绫诲瀷")
@Column(columnDefinition="int comment '鐢虫姤绫诲瀷'")
private Integer type;
+
+ @Schema(description = "鎻愪氦绫诲瀷")
+ @Column(columnDefinition="int comment '鎻愪氦绫诲瀷 0鐭挎彁浜� 1瀛愬崟浣嶆彁浜�'")
+ private Integer type2;
@Schema(description = "鐢虫姤鍏徃id")
- @Column(columnDefinition="int comment '鐢虫姤鍏徃id'")
- private Integer declareCompId;
+ @Column(columnDefinition="long comment '鐢虫姤鍏徃id'")
+ private Long declareCompId;
@Schema(description = "鐢虫姤鍏徃")
@Column(columnDefinition="VARCHAR(64) comment '鐢虫姤鍏徃'")
private String declareCompName;
@Schema(description = "濉姤鍏徃id")
- @Column(columnDefinition="int comment '濉姤鍏徃id'")
- private Integer releaseCompId;
+ @Column(columnDefinition="long comment '濉姤鍏徃id'")
+ private Long releaseCompId;
@Schema(description = "濉姤鍏徃")
@Column(columnDefinition="VARCHAR(64) comment '濉姤鍏徃'")
private String releaseCompName;
@Schema(description = "濉姤浜�")
@Column(columnDefinition="VARCHAR(64) comment '濉姤浜�'")
private String releasePerson;
+ @Column(columnDefinition = "double(10,2) comment '璁″垝鎬婚'")
+ private Double amount;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "濉姤鏃堕棿")
@@ -62,4 +75,8 @@
@Schema(description = "涓婃姤鏃堕棿")
@Column(columnDefinition = "datetime comment '涓婃姤鏃堕棿'")
private Date sendDate;
+
+ @Transient
+ @TableField(exist = false)
+ private List<DeviceDemandTotal> totalList;
}
--
Gitblit v1.9.1