buzhanyi 2 years ago
parent
commit
09001d6ee6

+ 4 - 0
base-common/src/main/java/com/ozs/common/core/domain/entity/SysDept.java

@@ -7,6 +7,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import javax.validation.constraints.Size;
 
 
+import com.ozs.common.annotation.Excel;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -41,6 +42,7 @@ public class SysDept extends BaseEntity {
 
 
     @NotBlank(message = "部门名称不能为空")
     @NotBlank(message = "部门名称不能为空")
     @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
     @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
+    @Excel(name = "部门名称")
     private String deptName;
     private String deptName;
 
 
     @NotNull(message = "显示顺序不能为空")
     @NotNull(message = "显示顺序不能为空")
@@ -61,6 +63,7 @@ public class SysDept extends BaseEntity {
     /**
     /**
      * 部门状态:0正常,1停用
      * 部门状态:0正常,1停用
      */
      */
+    @Excel(name = "状态", readConverterExp = "0正常 1停用")
     private String status;
     private String status;
 
 
     /**
     /**
@@ -71,6 +74,7 @@ public class SysDept extends BaseEntity {
     /**
     /**
      * 父部门名称
      * 父部门名称
      */
      */
+    @Excel(name = "父部门名称")
     private String parentName;
     private String parentName;
 
 
     /**
     /**

+ 8 - 0
base-common/src/main/java/com/ozs/common/core/domain/entity/SysMenu.java

@@ -5,6 +5,8 @@ import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import javax.validation.constraints.Size;
+
+import com.ozs.common.annotation.Excel;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ozs.common.core.domain.BaseEntity;
 import com.ozs.common.core.domain.BaseEntity;
@@ -22,9 +24,11 @@ public class SysMenu extends BaseEntity
     private Long menuId;
     private Long menuId;
 
 
     /** 菜单名称 */
     /** 菜单名称 */
+    @Excel(name = "菜单名称")
     private String menuName;
     private String menuName;
 
 
     /** 父菜单名称 */
     /** 父菜单名称 */
+    @Excel(name = "父菜单名称")
     private String parentName;
     private String parentName;
 
 
     /** 父菜单ID */
     /** 父菜单ID */
@@ -34,12 +38,14 @@ public class SysMenu extends BaseEntity
     private Integer orderNum;
     private Integer orderNum;
 
 
     /** 路由地址 */
     /** 路由地址 */
+    @Excel(name = "路由地址")
     private String path;
     private String path;
 
 
     /** 组件路径 */
     /** 组件路径 */
     private String component;
     private String component;
 
 
     /** 路由参数 */
     /** 路由参数 */
+    @Excel(name = "路由参数")
     private String query;
     private String query;
 
 
     /** 是否为外链(0是 1否) */
     /** 是否为外链(0是 1否) */
@@ -49,12 +55,14 @@ public class SysMenu extends BaseEntity
     private String isCache;
     private String isCache;
 
 
     /** 类型(M目录 C菜单 F按钮) */
     /** 类型(M目录 C菜单 F按钮) */
+    @Excel(name = "类型",readConverterExp = "M目录 C菜单 F按钮")
     private String menuType;
     private String menuType;
 
 
     /** 显示状态(0显示 1隐藏) */
     /** 显示状态(0显示 1隐藏) */
     private String visible;
     private String visible;
 
 
     /** 菜单状态(0正常 1停用) */
     /** 菜单状态(0正常 1停用) */
+    @Excel(name = "菜单状态",readConverterExp = "0正常 1停用")
     private String status;
     private String status;
 
 
     /** 权限字符串 */
     /** 权限字符串 */