gitee/mall4j
1
1
Fork 0
mirror of https://gitee.com/gz-yami/mall4j.git synced 2026-03-22 09:17:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

升级poi版本

Browse Source
This commit is contained in:
chendt
2022-05-09 10:29:05 +08:00
parent 66ff235b4a
commit df11e588b3
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -28,7 +28,7 @@
<guava.version>28.2-jre</guava.version>
<hutool.version>5.7.15</hutool.version>
<jsoup.version>1.11.3</jsoup.version>
<poi.version>3.17</poi.version>
<poi.version>5.0.0</poi.version>
<qiniu.version>7.2.18</qiniu.version>
<weixin.version>3.5.0</weixin.version>
<orika.version>1.5.4</orika.version>

5
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java
View File

@@ -10,6 +10,8 @@
package com.yami.shop.admin.controller;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import cn.hutool.poi.excel.ExcelUtil;
@@ -255,6 +257,9 @@ public class OrderController {
* 如果需要合并的话，就合并
*/
private void mergeIfNeed(ExcelWriter writer, int firstRow, int lastRow, int firstColumn, int lastColumn, Object content) {
if (content instanceof Date) {
content = DateUtil.format((Date) content, DatePattern.NORM_DATETIME_PATTERN);
}
if (lastRow - firstRow > 0 || lastColumn - firstColumn > 0) {
writer.merge(firstRow, lastRow, firstColumn, lastColumn, content, false);
} else {