From a4c35cecaab01c211e7ba077e63a0941ef4335b2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 10 四月 2023 17:51:40 +0800
Subject: [PATCH] 优化用户导入更新时需获取用户编号问题
---
src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
index 4924007..4ee9565 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
@@ -5,6 +5,9 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.math.BigDecimal;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import com.ruoyi.common.utils.poi.ExcelHandlerAdapter;
/**
* 鑷畾涔夊鍑篍xcel鏁版嵁娉ㄨВ
@@ -56,11 +59,6 @@
public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
/**
- * 瀵煎嚭绫诲瀷锛�0鏁板瓧 1瀛楃涓诧級
- */
- public ColumnType cellType() default ColumnType.STRING;
-
- /**
* 瀵煎嚭鏃跺湪excel涓瘡涓垪鐨勯珮搴� 鍗曚綅涓哄瓧绗�
*/
public double height() default 14;
@@ -91,6 +89,11 @@
public String[] combo() default {};
/**
+ * 鏄惁闇�瑕佺旱鍚戝悎骞跺崟鍏冩牸,搴斿闇�姹�:鍚湁list闆嗗悎鍗曞厓鏍�)
+ */
+ public boolean needMerge() default false;
+
+ /**
* 鏄惁瀵煎嚭鏁版嵁,搴斿闇�姹�:鏈夋椂鎴戜滑闇�瑕佸鍑轰竴浠芥ā鏉�,杩欐槸鏍囬闇�瑕佷絾鍐呭闇�瑕佺敤鎴锋墜宸ュ～鍐�.
*/
public boolean isExport() default true;
@@ -106,25 +109,44 @@
public boolean isStatistics() default false;
/**
- * 瀵煎嚭瀛楁瀵归綈鏂瑰紡锛�0锛氶粯璁わ紱1锛氶潬宸︼紱2锛氬眳涓紱3锛氶潬鍙筹級
+ * 瀵煎嚭绫诲瀷锛�0鏁板瓧 1瀛楃涓� 2鍥剧墖锛�
*/
- Align align() default Align.AUTO;
+ public ColumnType cellType() default ColumnType.STRING;
- public enum Align
- {
- AUTO(0), LEFT(1), CENTER(2), RIGHT(3);
- private final int value;
+ /**
+ * 瀵煎嚭鍒楀ご鑳屾櫙鑹�
+ */
+ public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
- Align(int value)
- {
- this.value = value;
- }
+ /**
+ * 瀵煎嚭鍒楀ご瀛椾綋棰滆壊
+ */
+ public IndexedColors headerColor() default IndexedColors.WHITE;
- public int value()
- {
- return this.value;
- }
- }
+ /**
+ * 瀵煎嚭鍗曞厓鏍艰儗鏅壊
+ */
+ public IndexedColors backgroundColor() default IndexedColors.WHITE;
+
+ /**
+ * 瀵煎嚭鍗曞厓鏍煎瓧浣撻鑹�
+ */
+ public IndexedColors color() default IndexedColors.BLACK;
+
+ /**
+ * 瀵煎嚭瀛楁瀵归綈鏂瑰紡
+ */
+ public HorizontalAlignment align() default HorizontalAlignment.CENTER;
+
+ /**
+ * 鑷畾涔夋暟鎹鐞嗗櫒
+ */
+ public Class<?> handler() default ExcelHandlerAdapter.class;
+
+ /**
+ * 鑷畾涔夋暟鎹鐞嗗櫒鍙傛暟
+ */
+ public String[] args() default {};
/**
* 瀛楁绫诲瀷锛�0锛氬鍑哄鍏ワ紱1锛氫粎瀵煎嚭锛�2锛氫粎瀵煎叆锛�
--
Gitblit v1.9.3