🐛 统一应收账单汇总模板日期为明细收货日期范围
This commit is contained in:
+39
@@ -7,7 +7,12 @@ import java.io.OutputStream;
|
||||
import java.math.BigDecimal;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -351,6 +356,40 @@ public abstract class ArBillWorkbookSupport implements ArBillWorkbookWriter {
|
||||
return detail == null ? null : detail.getRegistrationFee();
|
||||
}
|
||||
|
||||
protected String exportReceiveTimeRange(Map<String, Object> receiveTimeRange) {
|
||||
return exportReceiveTimeRange(receiveTimeRange, "yyyy-MM-dd", " 至 ");
|
||||
}
|
||||
|
||||
/** 所有账单模板使用当前账单明细的收货日期范围,缺失时留空。 */
|
||||
protected String exportReceiveTimeRange(Map<String, Object> receiveTimeRange, String pattern, String separator) {
|
||||
if (receiveTimeRange == null) {
|
||||
return "";
|
||||
}
|
||||
String start = formatReceiveDate(receiveTimeRange.get("minReceiveTime"), pattern);
|
||||
String end = formatReceiveDate(receiveTimeRange.get("maxReceiveTime"), pattern);
|
||||
return StringUtils.isEmpty(start) || StringUtils.isEmpty(end) ? "" : start + separator + end;
|
||||
}
|
||||
|
||||
private String formatReceiveDate(Object value, String pattern) {
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
|
||||
if (value instanceof LocalDateTime) {
|
||||
return ((LocalDateTime) value).toLocalDate().format(formatter);
|
||||
}
|
||||
if (value instanceof LocalDate) {
|
||||
return ((LocalDate) value).format(formatter);
|
||||
}
|
||||
if (value instanceof java.sql.Date) {
|
||||
return ((java.sql.Date) value).toLocalDate().format(formatter);
|
||||
}
|
||||
if (value instanceof Date) {
|
||||
return new SimpleDateFormat(pattern).format((Date) value);
|
||||
}
|
||||
if (value == null) {
|
||||
return "";
|
||||
}
|
||||
throw new IllegalArgumentException("不支持的收货时间类型: " + value.getClass().getName());
|
||||
}
|
||||
|
||||
protected String exportBankAccountNo(String value) {
|
||||
if (StringUtils.isEmpty(value)) {
|
||||
return "";
|
||||
|
||||
-31
@@ -8,9 +8,6 @@ import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
@@ -534,34 +531,6 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
|
||||
return result.toString();
|
||||
}
|
||||
|
||||
private String exportReceiveTimeRange(Map<String, Object> receiveTimeRange) {
|
||||
if (receiveTimeRange == null) {
|
||||
return "";
|
||||
}
|
||||
String start = formatReceiveDate(receiveTimeRange.get("minReceiveTime"));
|
||||
String end = formatReceiveDate(receiveTimeRange.get("maxReceiveTime"));
|
||||
return StringUtils.isEmpty(start) || StringUtils.isEmpty(end) ? "" : start + " 至 " + end;
|
||||
}
|
||||
|
||||
private String formatReceiveDate(Object value) {
|
||||
if (value instanceof LocalDateTime) {
|
||||
return ((LocalDateTime) value).toLocalDate().toString();
|
||||
}
|
||||
if (value instanceof LocalDate) {
|
||||
return value.toString();
|
||||
}
|
||||
if (value instanceof java.sql.Date) {
|
||||
return ((java.sql.Date) value).toLocalDate().toString();
|
||||
}
|
||||
if (value instanceof Date) {
|
||||
return new SimpleDateFormat("yyyy-MM-dd").format((Date) value);
|
||||
}
|
||||
if (value == null) {
|
||||
return "";
|
||||
}
|
||||
throw new IllegalArgumentException("不支持的收货时间类型: " + value.getClass().getName());
|
||||
}
|
||||
|
||||
private String exportFormula(ArBillDetail detail) {
|
||||
String formula = joinFeeText(detail.getFees(), true);
|
||||
if (!StringUtils.isEmpty(formula)) {
|
||||
|
||||
+8
-12
@@ -55,7 +55,9 @@ public class SummaryArBillWorkbookWriter extends ArBillWorkbookSupport {
|
||||
Path detailXml = Files.createTempFile("ar-bill-summary-details-", ".xml");
|
||||
try (InputStream input = openTemplateStream(template); XSSFWorkbook workbook = new XSSFWorkbook(input)) {
|
||||
validateTemplate(workbook);
|
||||
prepareTemplate(workbook, bill);
|
||||
String receiveTimePeriod = exportReceiveTimeRange(
|
||||
detailMapper.selectReceiveTimeRangeByBillId(bill.getArBillId()), "yyyyMMdd", "-");
|
||||
prepareTemplate(workbook, bill, receiveTimePeriod);
|
||||
DetailStyles detailStyles = createDetailStyles(workbook);
|
||||
byte[] skeleton = serialize(workbook);
|
||||
String summaryPath = partPath(workbook.getSheetAt(0));
|
||||
@@ -92,7 +94,7 @@ public class SummaryArBillWorkbookWriter extends ArBillWorkbookSupport {
|
||||
for (ZipEntry entry; (entry = zip.getNextEntry()) != null; ) {
|
||||
output.putNextEntry(new ZipEntry(entry.getName()));
|
||||
if (summaryPath.equals(entry.getName())) {
|
||||
writeSummary(summary, bill, groups, result.amount(), output);
|
||||
writeSummary(summary, bill, groups, result.amount(), receiveTimePeriod, output);
|
||||
} else if (detailPath.equals(entry.getName())) {
|
||||
Files.copy(detailXml, output);
|
||||
} else {
|
||||
@@ -133,7 +135,7 @@ public class SummaryArBillWorkbookWriter extends ArBillWorkbookSupport {
|
||||
return row;
|
||||
}
|
||||
|
||||
private void prepareTemplate(XSSFWorkbook workbook, ArBill bill) throws IOException {
|
||||
private void prepareTemplate(XSSFWorkbook workbook, ArBill bill, String receiveTimePeriod) throws IOException {
|
||||
String currency = StringUtils.isEmpty(bill.getCurrency()) ? "CNY" : bill.getCurrency();
|
||||
String company = StringUtils.isEmpty(bill.getBankAccountName())
|
||||
? "威狮国际供应链(深圳)有限公司" : bill.getBankAccountName();
|
||||
@@ -146,7 +148,7 @@ public class SummaryArBillWorkbookWriter extends ArBillWorkbookSupport {
|
||||
textCell(summary, 11, 1, exportBankAccountNo(bill.getBankAccountNo()));
|
||||
textCell(summary, 12, 1, bill.getBankName());
|
||||
textCell(detail, 2, 1, bill.getCustomerName());
|
||||
textCell(detail, 2, 18, billPeriod(bill));
|
||||
textCell(detail, 2, 18, receiveTimePeriod);
|
||||
for (int column : new int[]{11, 12, 13, 15, 16}) {
|
||||
XSSFCell header = detail.getRow(3).getCell(column);
|
||||
header.setCellValue(header.getStringCellValue().replace("CNY", currency));
|
||||
@@ -305,13 +307,13 @@ public class SummaryArBillWorkbookWriter extends ArBillWorkbookSupport {
|
||||
}
|
||||
|
||||
private void writeSummary(SheetXml sheet, ArBill bill, Map<String, ProductSummary> groups,
|
||||
BigDecimal total, OutputStream output) throws IOException {
|
||||
BigDecimal total, String receiveTimePeriod, OutputStream output) throws IOException {
|
||||
writeUtf8(output, sheet.prefix());
|
||||
for (int row = 1; row <= 3; row++) writeUtf8(output, sheet.rows().get(row));
|
||||
int rowNumber = SUMMARY_START_ROW;
|
||||
for (ProductSummary product : groups.values()) {
|
||||
String row = shiftRowXml(sheet.rows().get(4), rowNumber);
|
||||
Object[] values = {rowNumber - 3, bill.getCustomerName(), product.name, billPeriod(bill),
|
||||
Object[] values = {rowNumber - 3, bill.getCustomerName(), product.name, receiveTimePeriod,
|
||||
product.amount, bill.getCurrency(), SUMMARY_REMARK};
|
||||
for (int index = 0; index < values.length; index++) {
|
||||
row = replaceCellXml(row, (char) ('A' + index) + String.valueOf(rowNumber),
|
||||
@@ -356,12 +358,6 @@ public class SummaryArBillWorkbookWriter extends ArBillWorkbookSupport {
|
||||
return FILTER.matcher(suffix).replaceAll("$1" + range + "$2");
|
||||
}
|
||||
|
||||
private String billPeriod(ArBill bill) {
|
||||
if (bill.getBillPeriodStart() == null || bill.getBillPeriodEnd() == null) return "";
|
||||
SimpleDateFormat date = new SimpleDateFormat("yyyyMMdd");
|
||||
return date.format(bill.getBillPeriodStart()) + "-" + date.format(bill.getBillPeriodEnd());
|
||||
}
|
||||
|
||||
private String partPath(XSSFSheet sheet) {
|
||||
return sheet.getPackagePart().getPartName().getName().substring(1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user