From 99968f83982943669af3829ea6bc3bbe745cada4 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期一, 21 十一月 2022 08:41:48 +0800
Subject: [PATCH] 安全物资和设备管理相关rpc接口
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java
index 038d1ef..fe498a8 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java
@@ -1,16 +1,17 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
-
+import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 设备检测明细(EquipmentTestDetail)表实体类
*
* @author xurui
- * @since 2022-07-19 15:08:23
+ * @since 2022-08-29 08:37:54
*/
@SuppressWarnings("serial")
@TableName("equipment_test_detail")
@@ -28,7 +29,7 @@
}
//具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
- private Integer infoTpe;
+ private Integer infoTpe;
public Integer getInfoTpe() {
return infoTpe;
@@ -38,7 +39,7 @@
this.infoTpe = infoTpe;
}
//设备ID/外键
- private Long equipmentId;
+ private Long equipmentId;
public Long getEquipmentId() {
return equipmentId;
@@ -48,7 +49,7 @@
this.equipmentId = equipmentId;
}
//检测人/外键
- private Long testPersonId;
+ private Long testPersonId;
public Long getTestPersonId() {
return testPersonId;
@@ -57,8 +58,19 @@
public void setTestPersonId(Long testPersonId) {
this.testPersonId = testPersonId;
}
+ //检测人名称
+ private String testPersonName;
+
+ public String getTestPersonName() {
+ return testPersonName;
+ }
+
+ public void setTestPersonName(String testPersonName) {
+ this.testPersonName = testPersonName;
+ }
//检测日期
- private Timestamp testDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp testDate;
public Timestamp getTestDate() {
return testDate;
@@ -68,7 +80,7 @@
this.testDate = testDate;
}
//检测人单位/外键
- private Long testPersonDepartmentId;
+ private Long testPersonDepartmentId;
public Long getTestPersonDepartmentId() {
return testPersonDepartmentId;
@@ -77,8 +89,18 @@
public void setTestPersonDepartmentId(Long testPersonDepartmentId) {
this.testPersonDepartmentId = testPersonDepartmentId;
}
+ //检测人单位名称
+ private String testPersonDepartmentName;
+
+ public String getTestPersonDepartmentName() {
+ return testPersonDepartmentName;
+ }
+
+ public void setTestPersonDepartmentName(String testPersonDepartmentName) {
+ this.testPersonDepartmentName = testPersonDepartmentName;
+ }
//检测内容
- private String testMemo;
+ private String testMemo;
public String getTestMemo() {
return testMemo;
@@ -88,7 +110,7 @@
this.testMemo = testMemo;
}
//检测结果 1：正常 2：异常
- private Integer testResult;
+ private Integer testResult;
public Integer getTestResult() {
return testResult;
@@ -98,7 +120,7 @@
this.testResult = testResult;
}
//检测状态
- private String testStatus;
+ private String testStatus;
public String getTestStatus() {
return testStatus;
@@ -107,5 +129,15 @@
public void setTestStatus(String testStatus) {
this.testStatus = testStatus;
}
-
+ //是否删除 0:未删除 1:删除
+ private Integer delFlag;
+
+ public Integer getDelFlag() {
+ return delFlag;
+ }
+
+ public void setDelFlag(Integer delFlag) {
+ this.delFlag = delFlag;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.2