From d015cc0b48ca51a2b93b6c60c91dc352a104b1e7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 23 九月 2024 10:41:50 +0800
Subject: [PATCH] 删除密码加密

---
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/RewardPunishmentDetailDto.java |  115 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 86 insertions(+), 29 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..0730615 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,69 @@
 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 rewardPunishmentStandardName;
     //员工(多个用逗号隔开)    
     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,23 +71,10 @@
     public void setId(Long id) {
         this.id = id;
     }
-    //奖惩类型 1:奖励 2:惩罚        
-    public Long getRewardPunishmentStandardId() {
-        return rewardPunishmentStandardId;
-    }
 
-    public void setRewardPunishmentStandardId(Long rewardPunishmentStandardId) {
-        this.rewardPunishmentStandardId = rewardPunishmentStandardId;
-    }
-    //员工(多个用逗号隔开)        
-    public String getPersonId() {
-        return personId;
-    }
+    //备注信息
+    private String memo;
 
-    public void setPersonId(String personId) {
-        this.personId = personId;
-    }
-    //备注信息        
     public String getMemo() {
         return memo;
     }
@@ -49,7 +82,31 @@
     public void setMemo(String memo) {
         this.memo = memo;
     }
-            
+
+    public Long getRewardPunishmentStandardId() {
+        return rewardPunishmentStandardId;
+    }
+
+    public void setRewardPunishmentStandardId(Long rewardPunishmentStandardId) {
+        this.rewardPunishmentStandardId = rewardPunishmentStandardId;
+    }
+
+    public String getPersonId() {
+        return personId;
+    }
+
+    public void setPersonId(String personId) {
+        this.personId = personId;
+    }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
     public Timestamp getCreateTime() {
         return createTime;
     }
@@ -57,12 +114,12 @@
     public void setCreateTime(Timestamp createTime) {
         this.createTime = createTime;
     }
-            
-    public Timestamp getUpdateTime() {
-        return updateTime;
+
+    public void setRewardPunishmentStandardName(String rewardPunishmentStandardName) {
+        this.rewardPunishmentStandardName = rewardPunishmentStandardName;
     }
 
-    public void setUpdateTime(Timestamp updateTime) {
-        this.updateTime = updateTime;
+    public String getRewardPunishmentStandardName() {
+        return rewardPunishmentStandardName;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.2