From 2dad3e25f93f4307e53ed1ed8af64a826c7a3628 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 04 八月 2022 11:08:06 +0800
Subject: [PATCH] 事故状态fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/RewardPunishmentDetailDto.java | 84 ++++++++++++++++++++++++++++++------------
1 files changed, 60 insertions(+), 24 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/RewardPunishmentDetailDto.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/RewardPunishmentDetailDto.java
index 7a56299..8d94843 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/RewardPunishmentDetailDto.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/RewardPunishmentDetailDto.java
@@ -1,23 +1,67 @@
package com.gkhy.safePlatform.targetDuty.model.dto.resp;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.sql.Timestamp;
import java.io.Serializable;
+import java.util.Date;
public class RewardPunishmentDetailDto implements Serializable {
private Long id;
- //奖惩类型 1:奖励 2:惩罚
+ //奖惩标准/外键
private Long rewardPunishmentStandardId;
//员工（多个用逗号隔开）
private String personId;
- //备注信息
- private String memo;
-
- private Timestamp createTime;
-
- private Timestamp updateTime;
+ //被奖惩者
+ private String personName;
-
+ //奖惩类型 1:奖励 2:惩罚
+ private Integer standardType;
+
+ private Timestamp createTime;
+
+ public Integer getStandardType() {
+ return standardType;
+ }
+
+ public void setStandardType(Integer standardType) {
+ this.standardType = standardType;
+ }
+ //奖惩内容
+ private String content;
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+ //奖惩名称
+ private String qName;
+
+ public String getqName() {
+ return qName;
+ }
+
+ public void setqName(String qName) {
+ this.qName = qName;
+ }
+
+ //依据
+ private String reason;
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
public Long getId() {
return id;
}
@@ -25,7 +69,7 @@
public void setId(Long id) {
this.id = id;
}
- //奖惩类型 1:奖励 2:惩罚
+
public Long getRewardPunishmentStandardId() {
return rewardPunishmentStandardId;
}
@@ -33,7 +77,7 @@
public void setRewardPunishmentStandardId(Long rewardPunishmentStandardId) {
this.rewardPunishmentStandardId = rewardPunishmentStandardId;
}
- //员工（多个用逗号隔开）
+
public String getPersonId() {
return personId;
}
@@ -41,28 +85,20 @@
public void setPersonId(String personId) {
this.personId = personId;
}
- //备注信息
- public String getMemo() {
- return memo;
+
+ public String getPersonName() {
+ return personName;
}
- public void setMemo(String memo) {
- this.memo = memo;
+ public void setPersonName(String personName) {
+ this.personName = personName;
}
-
+
public Timestamp getCreateTime() {
return createTime;
}
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
- }
-
- public Timestamp getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Timestamp updateTime) {
- this.updateTime = updateTime;
}
}
\ No newline at end of file
--
Gitblit v1.9.2