From 9bafd2fe4654617cf3f5243df7a370fec2c86184 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 09 四月 2025 08:52:33 +0800
Subject: [PATCH] fix: 租赁计划修改page方法
---
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java
index 5670ea3..55518a6 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java
@@ -11,7 +11,9 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.Transient;
import java.util.Date;
+import java.util.List;
/**
* @author kdq
@@ -27,16 +29,16 @@
@Table(appliesTo = "receiving_note", comment = "楠屾敹琛�")
public class ReceivingNote extends BaseModel<ReceivingNote> {
/**
- * 鎵跨鍚堝悓Id
+ * 鍚堝悓Id
*/
- @Column(columnDefinition="long comment '鎵跨鍚堝悓Id'")
- private Long lesseeContractId;
+ @Column(columnDefinition="long comment '鍚堝悓Id'")
+ private Long contractId;
- /**
- * 绉熺敤鍚堝悓Id
- */
- @Column(columnDefinition="long comment '绉熺敤鍚堝悓Id'")
- private Long rentContractId;
+// /**
+// * 绉熺敤鍚堝悓Id
+// */
+// @Column(columnDefinition="long comment '绉熺敤鍚堝悓Id'")
+// private Long rentContractId;
@Schema(description = "楠屾敹鍏徃")
@Column(columnDefinition="VARCHAR(64) comment '楠屾敹鍏徃'")
@@ -67,7 +69,7 @@
* 鏉ユ簮绫诲瀷
*/
@Schema(description = "鏉ユ簮绫诲瀷")
- @Column(columnDefinition="INTEGER comment '鏉ユ簮绫诲瀷'")
+ @Column(columnDefinition="INTEGER comment '鏉ユ簮绫诲瀷 0 绉熻祦 1 閲囪喘'")
private String resourceType;
/**
@@ -127,4 +129,15 @@
@Schema(description = "浣跨敤鍏徃")
@Column(columnDefinition="long comment '浣跨敤鍏徃'")
private Long deptId;
+
+ @Transient
+ @TableField(exist = false)
+ private List<ReceivingNoteItem> noteItemList;
+
+ /**
+ * 楠屾敹鍗曞悕绉�
+ */
+ @Schema(description = "楠屾敹鍗曞悕绉�")
+ @Column(columnDefinition="VARCHAR(256) comment '楠屾敹鍗曞悕绉�'")
+ private String noteName;
}
--
Gitblit v1.9.1