aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-23 07:36:55 +08:00
parent 75d3d78cae
commit c53e3179cb
10 changed files with 111 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/libraries/Maven__com_alibaba_easyexcel_3_1_7.xml → .idea/libraries/Maven__com_alibaba_easyexcel_3_3_2.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.alibaba:easyexcel:3.1.7">
<library name="Maven: com.alibaba:easyexcel:3.3.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel/3.1.7/easyexcel-3.1.7.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel/3.3.2/easyexcel-3.3.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel/3.1.7/easyexcel-3.1.7-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel/3.3.2/easyexcel-3.3.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel/3.1.7/easyexcel-3.1.7-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel/3.3.2/easyexcel-3.3.2-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_alibaba_easyexcel_core_3_3_2.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.alibaba:easyexcel-core:3.3.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel-core/3.3.2/easyexcel-core-3.3.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel-core/3.3.2/easyexcel-core-3.3.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel-core/3.3.2/easyexcel-core-3.3.2-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_alibaba_easyexcel_support_3_3_2.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.alibaba:easyexcel-support:3.3.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel-support/3.3.2/easyexcel-support-3.3.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel-support/3.3.2/easyexcel-support-3.3.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel-support/3.3.2/easyexcel-support-3.3.2-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_apache_commons_commons_csv_1_8.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-csv:1.8">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-csv/1.8/commons-csv-1.8.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-csv/1.8/commons-csv-1.8-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-csv/1.8/commons-csv-1.8-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_ehcache_ehcache_3_9_9.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.ehcache:ehcache:3.9.9">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/ehcache/ehcache/3.9.9/ehcache-3.9.9.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/ehcache/ehcache/3.9.9/ehcache-3.9.9-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/ehcache/ehcache/3.9.9/ehcache-3.9.9-sources.jar!/" />
</SOURCES>
</library>
</component>

6
emis-biz-web/emis-biz-web.iml
View File

@ -266,6 +266,10 @@
<orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.14" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea:1.1.14" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.1.7" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:easyexcel-core:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:easyexcel-support:3.3.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
<orderEntry type="library" name="Maven: org.ehcache:ehcache:3.9.9" level="project" />
</component>
</module>

8
emis-biz/emis-biz.iml
View File

@ -85,7 +85,6 @@
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.16" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.16" level="project" />
<orderEntry type="library" name="Maven: redis.clients:jedis:3.6.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
<orderEntry type="library" name="Maven: org.redisson:redisson:3.10.0" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.74.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.74.Final" level="project" />
@ -225,6 +224,11 @@
<orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.14" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea:1.1.14" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.1.7" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:easyexcel-core:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:easyexcel-support:3.3.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
<orderEntry type="library" name="Maven: org.ehcache:ehcache:3.9.9" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
</component>
</module>

2
emis-biz/pom.xml
View File

@ -117,7 +117,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>3.1.7</version>
<version>3.3.2</version>
</dependency>

37
emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelFillCellMergePrevColUtils.java
View File

@ -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<CellData> 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<CellData> 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();

50
emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelFillCellMergeStrategyUtils.java
View File

@ -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<CellData> 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<CellData> 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) {
//获取当前行的当前列的数据和上一行的当前列列数据，通过上一行数据是否相同进行合并