From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java | 108 +++++++++++++++++++++++++++++++----------------------
1 files changed, 63 insertions(+), 45 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
index 48ed252..1108671 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
@@ -1,9 +1,10 @@
package com.ruoyi.common.core.domain.entity;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
@@ -17,7 +18,7 @@
/**
* 瀛楀吀绫诲瀷琛� sys_dict_type
- *
+ *
* @author ruoyi
*/
@@ -25,56 +26,73 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_dict_type")
-public class SysDictType implements Serializable
-{
- private static final long serialVersionUID = 1L;
+@ExcelIgnoreUnannotated
+public class SysDictType implements Serializable {
+ private static final long serialVersionUID = 1L;
- /** 瀛楀吀涓婚敭 */
- @Excel(name = "瀛楀吀涓婚敭", cellType = ColumnType.NUMERIC)
- @TableId(value = "dict_id",type = IdType.AUTO)
- private Long dictId;
+ /**
+ * 瀛楀吀涓婚敭
+ */
+ @ExcelProperty(value = "瀛楀吀涓婚敭")
+ @TableId(value = "dict_id", type = IdType.AUTO)
+ private Long dictId;
- /** 瀛楀吀鍚嶇О */
- @Excel(name = "瀛楀吀鍚嶇О")
- @NotBlank(message = "瀛楀吀鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷鍚嶇О闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- private String dictName;
+ /**
+ * 瀛楀吀鍚嶇О
+ */
+ @ExcelProperty(value = "瀛楀吀鍚嶇О")
+ @NotBlank(message = "瀛楀吀鍚嶇О涓嶈兘涓虹┖")
+ @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷鍚嶇О闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ private String dictName;
- /** 瀛楀吀绫诲瀷 */
- @Excel(name = "瀛楀吀绫诲瀷")
- @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- private String dictType;
+ /**
+ * 瀛楀吀绫诲瀷
+ */
+ @ExcelProperty(value = "瀛楀吀绫诲瀷")
+ @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
+ @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ private String dictType;
- /** 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
- @Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
- private String status;
+ /**
+ * 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
+ */
+ @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_common_status")
+ private String status;
- /** 鍒涘缓鑰� */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
+ /**
+ * 鍒涘缓鑰�
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private String createBy;
- /** 鍒涘缓鏃堕棿 */
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
- /** 鏇存柊鑰� */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
+ /**
+ * 鏇存柊鑰�
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private String updateBy;
- /** 鏇存柊鏃堕棿 */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
- /** 澶囨敞 */
- private String remark;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
+ /**
+ * 璇锋眰鍙傛暟
+ */
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
}
--
Gitblit v1.9.3