From 5703d0e9865df3ba05bb02bc382ce59fbf5f7da0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 12 八月 2022 16:59:06 +0800
Subject: [PATCH] Merge branch 'genchuang' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
index 12cf42a..f9cbda8 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
@@ -1,18 +1,17 @@
package com.gkhy.safePlatform.targetDuty.entity;
import java.sql.Timestamp;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.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;
/**
- * (TargetExamine)表实体类
+ * 安全目标考核(TargetExamine)表实体类
*
* @author xurui
- * @since 2022-07-22 09:30:01
+ * @since 2022-08-12 08:07:53
*/
@SuppressWarnings("serial")
@TableName("target_examine")
@@ -30,7 +29,7 @@
}
//关联的目标指标/外键
- private Long targetId;
+ private Long targetId;
public Long getTargetId() {
return targetId;
@@ -40,7 +39,7 @@
this.targetId = targetId;
}
//责任部门id/外键
- private Long dutyDepartmentId;
+ private Long dutyDepartmentId;
public Long getDutyDepartmentId() {
return dutyDepartmentId;
@@ -50,7 +49,7 @@
this.dutyDepartmentId = dutyDepartmentId;
}
//考核指标
- private String examineValue;
+ private String examineValue;
public String getExamineValue() {
return examineValue;
@@ -59,8 +58,8 @@
public void setExamineValue(String examineValue) {
this.examineValue = examineValue;
}
- //制定部门/外键
- private Long makerDepartmentId;
+ //制定部门id/外键
+ private Long makerDepartmentId;
public Long getMakerDepartmentId() {
return makerDepartmentId;
@@ -70,8 +69,8 @@
this.makerDepartmentId = makerDepartmentId;
}
//制定日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Timestamp makeDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp makeDate;
public Timestamp getMakeDate() {
return makeDate;
@@ -81,7 +80,7 @@
this.makeDate = makeDate;
}
//上报值
- private String uploadValue;
+ private String uploadValue;
public String getUploadValue() {
return uploadValue;
@@ -91,8 +90,8 @@
this.uploadValue = uploadValue;
}
//上报时间
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Timestamp uploadDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp uploadDate;
public Timestamp getUploadDate() {
return uploadDate;
@@ -102,7 +101,7 @@
this.uploadDate = uploadDate;
}
//考核结果 1:合格 2：不合格
- private Integer examineResult;
+ private Integer examineResult;
public Integer getExamineResult() {
return examineResult;
@@ -112,7 +111,7 @@
this.examineResult = examineResult;
}
//考核人ID/外键
- private Long examinePersonId;
+ private Long examinePersonId;
public Long getExaminePersonId() {
return examinePersonId;
@@ -121,9 +120,19 @@
public void setExaminePersonId(Long examinePersonId) {
this.examinePersonId = examinePersonId;
}
+ //考核人名称
+ private String examinePersonName;
+
+ public String getExaminePersonName() {
+ return examinePersonName;
+ }
+
+ public void setExaminePersonName(String examinePersonName) {
+ this.examinePersonName = examinePersonName;
+ }
//考核时间
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Timestamp examineDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp examineDate;
public Timestamp getExamineDate() {
return examineDate;
--
Gitblit v1.9.2