From a4807ac434eb793e53e87a1be7a09e3c2fb1d520 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Thu, 10 Oct 2024 21:53:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coal/tzDevice/entity/TzDevicePartVo.java      | 15 +++++++++++++++
 .../dto/CreateTzDeviceMaintenanceRecordDto.java   |  2 ++
 .../dto/UpdateTzDeviceMaintenanceRecordDto.java   |  1 +
 .../entity/TzDeviceMaintenanceRecordEntity.java   |  5 +++++
 4 files changed, 23 insertions(+)

diff --git a/src/main/java/cn/lihongjie/coal/tzDevice/entity/TzDevicePartVo.java b/src/main/java/cn/lihongjie/coal/tzDevice/entity/TzDevicePartVo.java
index 80e35bfe..a3446567 100644
--- a/src/main/java/cn/lihongjie/coal/tzDevice/entity/TzDevicePartVo.java
+++ b/src/main/java/cn/lihongjie/coal/tzDevice/entity/TzDevicePartVo.java
@@ -13,6 +13,18 @@ import java.util.*;
 @Embeddable
 public class TzDevicePartVo {
 
+    @Comment("配套附件名称")
+    private String partName;
+
+    @Comment("安装地点")
+    private String installationLocation;
+
+    @Comment("使用参数")
+    private String useParameter;
+
+    @Comment("标牌号")
+    private String nameplateNumber;
+
     @Comment("配套附件型号")
     private String partModel;
 
@@ -45,4 +57,7 @@ public class TzDevicePartVo {
 
     @Comment("使用单位")
     private String usingUnit;
+
+    @Comment("制造单位")
+    private String manufacturingUnit;
 }
diff --git a/src/main/java/cn/lihongjie/coal/tzDeviceMaintenanceRecord/dto/CreateTzDeviceMaintenanceRecordDto.java b/src/main/java/cn/lihongjie/coal/tzDeviceMaintenanceRecord/dto/CreateTzDeviceMaintenanceRecordDto.java
index cd46c450..502a3d1e 100644
--- a/src/main/java/cn/lihongjie/coal/tzDeviceMaintenanceRecord/dto/CreateTzDeviceMaintenanceRecordDto.java
+++ b/src/main/java/cn/lihongjie/coal/tzDeviceMaintenanceRecord/dto/CreateTzDeviceMaintenanceRecordDto.java
@@ -11,6 +11,8 @@ import java.time.LocalDateTime;
 @Data
 public class CreateTzDeviceMaintenanceRecordDto extends OrgCommonDto {
 
+    private String tzDevice;
+
     @Comment("检维修时间")
     private LocalDateTime maintenanceDate;
 
diff --git a/src/main/java/cn/lihongjie/coal/tzDeviceMaintenanceRecord/dto/UpdateTzDeviceMaintenanceRecordDto.java b/src/main/java/cn/lihongjie/coal/tzDeviceMaintenanceRecord/dto/UpdateTzDeviceMaintenanceRecordDto.java
index 707f1bf6..19655901 100644
--- a/src/main/java/cn/lihongjie/coal/tzDeviceMaintenanceRecord/dto/UpdateTzDeviceMaintenanceRecordDto.java
+++ b/src/main/java/cn/lihongjie/coal/tzDeviceMaintenanceRecord/dto/UpdateTzDeviceMaintenanceRecordDto.java
@@ -11,6 +11,7 @@ import java.time.LocalDateTime;
 @Data
 public class UpdateTzDeviceMaintenanceRecordDto extends OrgCommonDto {
 
+    private String tzDevice;
     @Comment("检维修时间")
     private LocalDateTime maintenanceDate;
 
diff --git a/src/main/java/cn/lihongjie/coal/tzDeviceMaintenanceRecord/entity/TzDeviceMaintenanceRecordEntity.java b/src/main/java/cn/lihongjie/coal/tzDeviceMaintenanceRecord/entity/TzDeviceMaintenanceRecordEntity.java
index 0384ff93..f9032989 100644
--- a/src/main/java/cn/lihongjie/coal/tzDeviceMaintenanceRecord/entity/TzDeviceMaintenanceRecordEntity.java
+++ b/src/main/java/cn/lihongjie/coal/tzDeviceMaintenanceRecord/entity/TzDeviceMaintenanceRecordEntity.java
@@ -1,8 +1,10 @@
 package cn.lihongjie.coal.tzDeviceMaintenanceRecord.entity;
 
 import cn.lihongjie.coal.base.entity.OrgCommonEntity;
+import cn.lihongjie.coal.tzDevice.entity.TzDeviceEntity;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 
 import lombok.Data;
@@ -24,6 +26,9 @@ public class TzDeviceMaintenanceRecordEntity extends OrgCommonEntity {
     @ColumnDefault("'0'")
     private String archiveStatus = "0";
 
+    @ManyToOne
+    private TzDeviceEntity tzDevice;
+
     @Comment("检维修时间")
     private LocalDateTime maintenanceDate;