From a680a84d91fb6501951d0265e9b347695568c546 Mon Sep 17 00:00:00 2001
From: 抓蛙师 <770492966@qq.com>
Date: 星期二, 20 九月 2022 16:41:40 +0800
Subject: [PATCH] !236 前端适配多字段排序功能案例OSS页面（重新排序需点击重置按钮，否则按照点击顺序依次排序，重复点击的字段排序位置不发生改变） * 完善前端适配多字段排序功能案例OSS页面（完善排序图标显示效果和重置效果，支持正序，倒序，取消排序） * 前端适配多字段排序功能案例OSS页面（重新排序需点击重置按钮，否则按照点击顺序依次排序，重复点击的字段排序位置不发生改变）
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
index 8b14c36..84af07b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
@@ -2,15 +2,12 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
@@ -20,25 +17,21 @@
/**
* 鎿嶄綔鏃ュ織璁板綍琛� oper_log
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
@TableName("sys_oper_log")
@ExcelIgnoreUnannotated
-//@ColumnWidth(16)
-//@HeadRowHeight(14)
-//@HeadFontStyle(fontHeightInPoints = 11)
public class SysOperLog implements Serializable {
+
private static final long serialVersionUID = 1L;
/**
* 鏃ュ織涓婚敭
*/
- @ExcelProperty(value = "鎿嶄綔搴忓彿")
- @TableId(value = "oper_id", type = IdType.AUTO)
+ @ExcelProperty(value = "鏃ュ織涓婚敭")
+ @TableId(value = "oper_id")
private Long operId;
/**
@@ -51,7 +44,7 @@
* 涓氬姟绫诲瀷锛�0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛�
*/
@ExcelProperty(value = "涓氬姟绫诲瀷", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "sys_oper_type")
+ @ExcelDictFormat(dictType = "sys_oper_type")
private Integer businessType;
/**
@@ -76,7 +69,7 @@
* 鎿嶄綔绫诲埆锛�0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級
*/
@ExcelProperty(value = "鎿嶄綔绫诲埆", converter = ExcelDictConvert.class)
- @ExcelDictFormat(readConverterExp = "0=鍏跺畠,1=鍚庡彴鐢ㄦ埛,2=鎵嬫満绔敤鎴�")
+ @ExcelDictFormat(readConverterExp = "0=鍏跺畠,1=鍚庡彴鐢ㄦ埛,2=鎵嬫満绔敤鎴�")
private Integer operatorType;
/**
@@ -125,7 +118,7 @@
* 鎿嶄綔鐘舵�侊紙0姝ｅ父 1寮傚父锛�
*/
@ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "sys_common_status")
+ @ExcelDictFormat(dictType = "sys_common_status")
private Integer status;
/**
--
Gitblit v1.9.3