1
This commit is contained in:
+1
-1
@@ -287,7 +287,7 @@ public class JDOrderListController extends BaseController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
RebateSheetConvertService.Result result = rebateSheetConvertService.convert(file.getInputStream());
|
RebateSheetConvertService.Result result = rebateSheetConvertService.convert(file.getInputStream(), name);
|
||||||
if (result.getErrorMessage() != null) {
|
if (result.getErrorMessage() != null) {
|
||||||
writeJson(response, AjaxResult.error(result.getErrorMessage()));
|
writeJson(response, AjaxResult.error(result.getErrorMessage()));
|
||||||
return;
|
return;
|
||||||
|
|||||||
+24
-2
@@ -53,7 +53,7 @@ public class RebateSheetConvertService {
|
|||||||
@Resource
|
@Resource
|
||||||
private OrderRowsMapper orderRowsMapper;
|
private OrderRowsMapper orderRowsMapper;
|
||||||
|
|
||||||
public Result convert(InputStream in) throws Exception {
|
public Result convert(InputStream in, String originalFilename) throws Exception {
|
||||||
Result result = new Result();
|
Result result = new Result();
|
||||||
try (Workbook workbook = WorkbookFactory.create(in)) {
|
try (Workbook workbook = WorkbookFactory.create(in)) {
|
||||||
if (workbook.getNumberOfSheets() <= 0) {
|
if (workbook.getNumberOfSheets() <= 0) {
|
||||||
@@ -83,7 +83,7 @@ public class RebateSheetConvertService {
|
|||||||
|
|
||||||
result.totalRows = rows.size();
|
result.totalRows = rows.size();
|
||||||
result.content = writeWorkbook(rows, orders, skuNums, result);
|
result.content = writeWorkbook(rows, orders, skuNums, result);
|
||||||
result.filename = "返现表-新表头.xlsx";
|
result.filename = downloadName(originalFilename);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -232,6 +232,28 @@ public class RebateSheetConvertService {
|
|||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static String downloadName(String originalFilename) {
|
||||||
|
String base = originalFilename == null ? "" : originalFilename.trim();
|
||||||
|
base = base.replace('\\', '/');
|
||||||
|
int slash = base.lastIndexOf('/');
|
||||||
|
if (slash >= 0) {
|
||||||
|
base = base.substring(slash + 1);
|
||||||
|
}
|
||||||
|
String lower = base.toLowerCase(java.util.Locale.ROOT);
|
||||||
|
String stem;
|
||||||
|
if (lower.endsWith(".xlsx")) {
|
||||||
|
stem = base.substring(0, base.length() - 5);
|
||||||
|
} else if (lower.endsWith(".xls")) {
|
||||||
|
stem = base.substring(0, base.length() - 4);
|
||||||
|
} else {
|
||||||
|
stem = base;
|
||||||
|
}
|
||||||
|
if (stem.isEmpty()) {
|
||||||
|
stem = "返现表";
|
||||||
|
}
|
||||||
|
return stem + "新.xlsx";
|
||||||
|
}
|
||||||
|
|
||||||
private static List<SourceRow> readRows(Sheet sheet, int headerIndex, HeaderMap header) {
|
private static List<SourceRow> readRows(Sheet sheet, int headerIndex, HeaderMap header) {
|
||||||
List<SourceRow> rows = new ArrayList<>();
|
List<SourceRow> rows = new ArrayList<>();
|
||||||
for (int i = headerIndex + 1; i <= sheet.getLastRowNum(); i++) {
|
for (int i = headerIndex + 1; i <= sheet.getLastRowNum(); i++) {
|
||||||
|
|||||||
Reference in New Issue
Block a user