From 7ed65656296a198162b91cdf311c197aebcff0e8 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 02 四月 2025 15:25:44 +0800
Subject: [PATCH] 台账 验收 新增名称字段对应 列表及条件搜索调整
---
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 9bfd7bf..fc026bc 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.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -20,9 +21,13 @@
@Data
@Entity
@Table(appliesTo = "device_demand_plan", comment = "璁惧闇�姹傝鍒掍富琛�")
-public class DeviceDemandPlan extends DeviceBaseModel<DeviceDemandPlan>{
- @Schema(description = "璁惧缂栫爜")
- @Column(columnDefinition="VARCHAR(64) comment '璁惧缂栫爜'")
+public class DeviceDemandPlan extends BaseModel<DeviceDemandPlan> {
+
+ @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 '骞村害'")
@@ -30,27 +35,33 @@
@Schema(description = "鑱旂郴浜�")
@Column(columnDefinition="VARCHAR(64) comment '鑱旂郴浜�'")
private String contacts;
- @Schema(description = "鐢虫姤鐘舵��")
+ @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 = "濉姤鏃堕棿")
--
Gitblit v1.9.1