diff --git a/.idea/libraries/Maven__com_alibaba_easyexcel_3_1_7.xml b/.idea/libraries/Maven__com_alibaba_easyexcel_3_3_2.xml
similarity index 64%
rename from .idea/libraries/Maven__com_alibaba_easyexcel_3_1_7.xml
rename to .idea/libraries/Maven__com_alibaba_easyexcel_3_3_2.xml
index 3bcfa2aea..ddfeb75b1 100644
--- a/.idea/libraries/Maven__com_alibaba_easyexcel_3_1_7.xml
+++ b/.idea/libraries/Maven__com_alibaba_easyexcel_3_3_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_easyexcel_core_3_3_2.xml b/.idea/libraries/Maven__com_alibaba_easyexcel_core_3_3_2.xml
new file mode 100644
index 000000000..1e3ee9a96
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_easyexcel_core_3_3_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_easyexcel_support_3_3_2.xml b/.idea/libraries/Maven__com_alibaba_easyexcel_support_3_3_2.xml
new file mode 100644
index 000000000..ebeab54c4
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_easyexcel_support_3_3_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_csv_1_8.xml b/.idea/libraries/Maven__org_apache_commons_commons_csv_1_8.xml
new file mode 100644
index 000000000..c88f83f85
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_csv_1_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ehcache_ehcache_3_9_9.xml b/.idea/libraries/Maven__org_ehcache_ehcache_3_9_9.xml
new file mode 100644
index 000000000..9ccdf70d9
--- /dev/null
+++ b/.idea/libraries/Maven__org_ehcache_ehcache_3_9_9.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emis-biz-web/emis-biz-web.iml b/emis-biz-web/emis-biz-web.iml
index 6c0a1b6ad..177ff31a8 100644
--- a/emis-biz-web/emis-biz-web.iml
+++ b/emis-biz-web/emis-biz-web.iml
@@ -266,6 +266,10 @@
-
+
+
+
+
+
\ No newline at end of file
diff --git a/emis-biz/emis-biz.iml b/emis-biz/emis-biz.iml
index a85c1c023..6cf93f9e5 100644
--- a/emis-biz/emis-biz.iml
+++ b/emis-biz/emis-biz.iml
@@ -85,7 +85,6 @@
-
@@ -225,6 +224,11 @@
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emis-biz/pom.xml b/emis-biz/pom.xml
index 1eb1ab993..34178f63e 100644
--- a/emis-biz/pom.xml
+++ b/emis-biz/pom.xml
@@ -117,7 +117,7 @@
com.alibaba
easyexcel
- 3.1.7
+ 3.3.2
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelFillCellMergePrevColUtils.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelFillCellMergePrevColUtils.java
index ec86291eb..63d69f4db 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelFillCellMergePrevColUtils.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelFillCellMergePrevColUtils.java
@@ -1,6 +1,5 @@
package com.xdadan.erp.emis.service.billexport;
-import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.Head;
import com.alibaba.excel.write.handler.CellWriteHandler;
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
@@ -37,24 +36,24 @@ public class ExcelFillCellMergePrevColUtils implements CellWriteHandler {
}
- @Override
- public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, Cell cell, Head head, Integer integer, Boolean aBoolean) {
-
- }
-
- @Override
- public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List list, Cell cell, Head head, Integer integer, Boolean aBoolean) {
- //当前行
- int curRowIndex = cell.getRowIndex();
- //当前列
- int curColIndex = cell.getColumnIndex();
-
- Integer num = mergeInfo.get(String.format(KEY, curRowIndex, curColIndex));
- if (null != num) {
- // 合并最后一行 ,列
- this.mergeWithPrevCol(writeSheetHolder, cell, curRowIndex, curColIndex, num);
- }
- }
+// @Override
+// public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, Cell cell, Head head, Integer integer, Boolean aBoolean) {
+//
+// }
+//
+// @Override
+// public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List list, Cell cell, Head head, Integer integer, Boolean aBoolean) {
+// //当前行
+// int curRowIndex = cell.getRowIndex();
+// //当前列
+// int curColIndex = cell.getColumnIndex();
+//
+// Integer num = mergeInfo.get(String.format(KEY, curRowIndex, curColIndex));
+// if (null != num) {
+// // 合并最后一行 ,列
+// this.mergeWithPrevCol(writeSheetHolder, cell, curRowIndex, curColIndex, num);
+// }
+// }
public void mergeWithPrevCol(WriteSheetHolder writeSheetHolder, Cell cell, int curRowIndex, int curColIndex, int num) {
Sheet sheet = writeSheetHolder.getSheet();
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelFillCellMergeStrategyUtils.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelFillCellMergeStrategyUtils.java
index 7480ed0b6..e6daa2bac 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelFillCellMergeStrategyUtils.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelFillCellMergeStrategyUtils.java
@@ -1,8 +1,8 @@
package com.xdadan.erp.emis.service.billexport;
-import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.metadata.data.CellData;
import com.alibaba.excel.write.handler.CellWriteHandler;
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
@@ -48,30 +48,30 @@ public class ExcelFillCellMergeStrategyUtils implements CellWriteHandler {
}
-
- @Override
- public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
- CellData cellData, Cell cell, Head head, Integer integer, Boolean aBoolean) {
-
- }
-
- @Override
- public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
- List list, Cell cell, Head head, Integer integer, Boolean aBoolean) {
- //当前行
- int curRowIndex = cell.getRowIndex();
- //当前列
- int curColIndex = cell.getColumnIndex();
-
- if (curRowIndex > mergeRowIndex) {
- for (int i = 0; i < mergeColumnIndex.length; i++) {
- if (curColIndex == mergeColumnIndex[i]) {
- this.mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex);
- break;
- }
- }
- }
- }
+//
+// @Override
+// public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
+// CellData cellData, Cell cell, Head head, Integer integer, Boolean aBoolean) {
+//
+// }
+//
+// @Override
+// public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
+// List list, Cell cell, Head head, Integer integer, Boolean aBoolean) {
+// //当前行
+// int curRowIndex = cell.getRowIndex();
+// //当前列
+// int curColIndex = cell.getColumnIndex();
+//
+// if (curRowIndex > mergeRowIndex) {
+// for (int i = 0; i < mergeColumnIndex.length; i++) {
+// if (curColIndex == mergeColumnIndex[i]) {
+// this.mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex);
+// break;
+// }
+// }
+// }
+// }
private void mergeWithPrevRow(WriteSheetHolder writeSheetHolder, Cell cell, int curRowIndex, int curColIndex) {
//获取当前行的当前列的数据和上一行的当前列列数据，通过上一行数据是否相同进行合并