From 1bdd6405e8caffc058066bdd26cb6de1ea9cf7ea Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 09 八月 2022 18:35:39 +0800
Subject: [PATCH] 8-9fix

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java |   52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 51 insertions(+), 1 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
index ce9eb14..b0bc8bd 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
@@ -24,6 +24,8 @@
     private String model;
     //单位部门外键    
     private Long departmentId;
+    //单位部门名称
+    private String departmentName;
     //设置部位    
     private String setPart;
     //生产日期    
@@ -52,8 +54,12 @@
     private Timestamp nextTakecareDate;
     //负责人ID外键    
     private Long leadingPersonId;
+    //负责人姓名
+    private String leadingPersonName;
     //负责人部门外键    
     private Long leadingPersonDepartmentId;
+    //负责人部门名称
+    private String leadingPersonDepartmentName;
     //供应商    
     private String supplyName;
     //使用说明    
@@ -76,6 +82,8 @@
     private String checkContent;
     //负责部门/外键    
     private Long leadingDepartmentId;
+    //负责部门名称
+    private String leadingDepartmentName;
     //检查指标    
     private String checkPoint;
     //预警值    
@@ -90,7 +98,9 @@
     private Timestamp actualStopDate;
     //停用提交人/外键    
     private Long stopSubmitPersonId;
-    //停用提交日期    
+    //停用提交人名称
+    private String stopSubmitPersonName;
+    //停用提交日期
     private Timestamp stopSubmitDate;
     //恢复理由    
     private String recoveryReason;
@@ -162,6 +172,22 @@
         this.takecareDetailList = takecareDetailList;
     }
 
+    public String getLeadingPersonName() {
+        return leadingPersonName;
+    }
+
+    public void setLeadingPersonName(String leadingPersonName) {
+        this.leadingPersonName = leadingPersonName;
+    }
+
+
+    public String getStopSubmitPersonName() {
+        return stopSubmitPersonName;
+    }
+
+    public void setStopSubmitPersonName(String stopSubmitPersonName) {
+        this.stopSubmitPersonName = stopSubmitPersonName;
+    }
     //ID
     public Long getId() {
         return id;
@@ -579,4 +605,28 @@
     public List<EquipmentCheckStandardDetail> getCheckStandardeDetailList() {
         return checkStandardeDetailList;
     }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
+    public String getLeadingPersonDepartmentName() {
+        return leadingPersonDepartmentName;
+    }
+
+    public void setLeadingPersonDepartmentName(String leadingPersonDepartmentName) {
+        this.leadingPersonDepartmentName = leadingPersonDepartmentName;
+    }
+
+    public String getLeadingDepartmentName() {
+        return leadingDepartmentName;
+    }
+
+    public void setLeadingDepartmentName(String leadingDepartmentName) {
+        this.leadingDepartmentName = leadingDepartmentName;
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.2