From 81bda9441c1de11d78e518dbe5ee632ba7144c90 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 31 三月 2025 11:55:57 +0800
Subject: [PATCH] 验收明细和出租台账中可按设备单次验收或出租 所有验收明细中设备数量与合同中设备数量一致修改合同状态 所有台账明细中设备数量与合同中设备数量一致修改合同状态

---
 platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceLeasingLedger.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceLeasingLedger.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceLeasingLedger.java
index b205abf..e2ba23c 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceLeasingLedger.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceLeasingLedger.java
@@ -1,5 +1,6 @@
 package com.by4cloud.platformx.device.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.by4cloud.platformx.common.data.mybatis.BaseModel;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -9,8 +10,9 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.Transient;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @Entity
@@ -78,4 +80,20 @@
 	@Schema(description = "鎵跨鍏徃")
 	@Column(columnDefinition="bigint comment '鎵跨鍏徃'")
 	private Long lesseeContractId;
+
+	/**
+	 * 鍙拌处鏄庣粏
+	 */
+	@Transient
+	@TableField(exist = false)
+	private List<DeviceLeasingLedgerItem> ledgerItemList;
+
+	/**
+	 * 鍑虹鏃ユ湡
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@Schema(description = "鍑虹鏃ユ湡")
+	@Column(columnDefinition="datetime comment '鍒拌揣楠屾敹鏃ユ湡'")
+	private Date deliveryDate;
+
 }

--
Gitblit v1.9.1