From b5c4def616b7509ee86c8df91e42ae8bbc3a391f Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 15 五月 2023 20:00:59 +0800
Subject: [PATCH] 999

---
 zhang-content/src/main/java/com/ruoyi/domain/ZHonor.java |  128 ++++++++++--------------------------------
 1 files changed, 31 insertions(+), 97 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZHonor.java b/zhang-content/src/main/java/com/ruoyi/domain/ZHonor.java
index 949a091..d7db7f8 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZHonor.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZHonor.java
@@ -3,8 +3,15 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+import org.hibernate.validator.constraints.EAN;
+
+import javax.print.attribute.standard.MediaSize;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -15,152 +22,79 @@
  * @since 2023-03-14
  */
 @TableName("z_honor")
+@Data
 public class ZHonor implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     /**
      * 鏈汉id
      */
-    private Integer userId;
+    private Long userId;
 
     /**
      * 绫诲埆,0锛氳瘉浠躲��1锛氳崳瑾夈��2锛氳祫璐�
      */
+    @Excel(name = "绫诲埆(璇佷欢銆佽崳瑾夈�佽祫璐�)",readConverterExp = "0=璇佷欢,1=鑽h獕,2=璧勮川")
     private Integer type;
 
     /**
      * 鍚嶇О
      */
+    @Excel(name = "鍚嶇О")
     private String name;
 
     /**
      * 璇佸彿/涓撲笟
      */
+    @Excel(name = "璇佸彿/涓撲笟")
     private String idNo;
 
     /**
      * 绾у埆
      */
+    @Excel(name = "绾у埆")
     private String grade;
 
     /**
      * 鏈夋晥鏈�
      */
-    private LocalDateTime validityDate;
+    @Excel(name = "鏈夋晥鏈�", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date validityDate;
 
     /**
      * 鑾峰緱鏃堕棿
      */
-    private LocalDateTime getDate;
+    @Excel(name = "鑾峰緱鏃堕棿", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date getDate;
 
     /**
      * 瀛樻斁浣嶇疆
      */
+    @Excel(name = "瀛樻斁浣嶇疆")
     private String location;
 
     /**
      * 澶囨敞
      */
+    @Excel(name = "澶囨敞")
     private String remark;
 
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date createTime;
 
-    public Integer getId() {
-        return id;
-    }
+    /**
+     * 鐢靛瓙鏂囦欢璺緞
+     */
+    private String url;
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
 
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getIdNo() {
-        return idNo;
-    }
-
-    public void setIdNo(String idNo) {
-        this.idNo = idNo;
-    }
-
-    public String getGrade() {
-        return grade;
-    }
-
-    public void setGrade(String grade) {
-        this.grade = grade;
-    }
-
-    public LocalDateTime getValidityDate() {
-        return validityDate;
-    }
-
-    public void setValidityDate(LocalDateTime validityDate) {
-        this.validityDate = validityDate;
-    }
-
-    public LocalDateTime getGetDate() {
-        return getDate;
-    }
-
-    public void setGetDate(LocalDateTime getDate) {
-        this.getDate = getDate;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "ZHonor{" +
-        "id=" + id +
-        ", userId=" + userId +
-        ", type=" + type +
-        ", name=" + name +
-        ", idNo=" + idNo +
-        ", grade=" + grade +
-        ", validityDate=" + validityDate +
-        ", getDate=" + getDate +
-        ", location=" + location +
-        ", remark=" + remark +
-        "}";
-    }
 }

--
Gitblit v1.9.1