diff --git a/src/main/java/com/xujie/modules/supplier/controller/PriceSheetReportController.java b/src/main/java/com/xujie/modules/supplier/controller/PriceSheetReportController.java index 1a873be..33b08b3 100644 --- a/src/main/java/com/xujie/modules/supplier/controller/PriceSheetReportController.java +++ b/src/main/java/com/xujie/modules/supplier/controller/PriceSheetReportController.java @@ -64,7 +64,8 @@ public class PriceSheetReportController extends AbstractController { return ResponseEntity.ok() .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=UTF-8''" + fileName) .header(HttpHeaders.CONTENT_LENGTH, String.valueOf(bytes.length)) - .contentType(MediaType.APPLICATION_OCTET_STREAM) + .contentType(MediaType.parseMediaType( + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")) .body(new ByteArrayResource(bytes)); } diff --git a/src/main/java/com/xujie/modules/supplier/service/impl/PriceSheetReportServiceImpl.java b/src/main/java/com/xujie/modules/supplier/service/impl/PriceSheetReportServiceImpl.java index 66f5853..f1e175e 100644 --- a/src/main/java/com/xujie/modules/supplier/service/impl/PriceSheetReportServiceImpl.java +++ b/src/main/java/com/xujie/modules/supplier/service/impl/PriceSheetReportServiceImpl.java @@ -90,11 +90,12 @@ public class PriceSheetReportServiceImpl implements IPriceSheetReportService { try (Workbook workbook = new XSSFWorkbook(); ByteArrayOutputStream output = new ByteArrayOutputStream()) { CellStyle headerStyle = createHeaderStyle(workbook); + CellStyle dataStyle = createDataStyle(workbook); CellStyle quantityStyle = createNumberStyle(workbook, "#,##0.####"); CellStyle currencyStyle = createNumberStyle(workbook, "$0.######"); - writePriceSheet(workbook, headerStyle, quantityStyle, currencyStyle, priceRows); - writeHandlingSheet(workbook, headerStyle, handlingRows); - writePaymentSheet(workbook, headerStyle, paymentRows); + writePriceSheet(workbook, headerStyle, dataStyle, quantityStyle, currencyStyle, priceRows); + writeHandlingSheet(workbook, headerStyle, dataStyle, handlingRows); + writePaymentSheet(workbook, headerStyle, dataStyle, paymentRows); workbook.write(output); return output.toByteArray(); } catch (Exception ex) { @@ -162,6 +163,13 @@ public class PriceSheetReportServiceImpl implements IPriceSheetReportService { return style; } + private CellStyle createDataStyle(Workbook workbook) { + CellStyle style = workbook.createCellStyle(); + style.setVerticalAlignment(VerticalAlignment.CENTER); + setBorders(style); + return style; + } + private void setBorders(CellStyle style) { style.setBorderTop(BorderStyle.THIN); style.setBorderRight(BorderStyle.THIN); @@ -169,12 +177,13 @@ public class PriceSheetReportServiceImpl implements IPriceSheetReportService { style.setBorderLeft(BorderStyle.THIN); } - private void writePriceSheet(Workbook workbook, CellStyle headerStyle, CellStyle quantityStyle, - CellStyle currencyStyle, List rows) { + private void writePriceSheet(Workbook workbook, CellStyle headerStyle, CellStyle dataStyle, + CellStyle quantityStyle, CellStyle currencyStyle, + List rows) { Sheet sheet = createSheet(workbook, "price list", PRICE_HEADERS, headerStyle); int rowIndex = 1; for (PriceSheetReportPriceVo value : rows) { - Row row = sheet.createRow(rowIndex++); + Row row = createDataRow(sheet, rowIndex++, PRICE_HEADERS.length, dataStyle); int column = 0; setText(row, column++, value.getRawCode()); setText(row, column++, value.getSku()); @@ -207,12 +216,12 @@ public class PriceSheetReportServiceImpl implements IPriceSheetReportService { setPriceSheetWidths(sheet); } - private void writeHandlingSheet(Workbook workbook, CellStyle headerStyle, + private void writeHandlingSheet(Workbook workbook, CellStyle headerStyle, CellStyle dataStyle, List rows) { Sheet sheet = createSheet(workbook, "handling charge", HANDLING_HEADERS, headerStyle); int rowIndex = 1; for (PriceSheetReportHandlingChargeVo value : rows) { - Row row = sheet.createRow(rowIndex++); + Row row = createDataRow(sheet, rowIndex++, HANDLING_HEADERS.length, dataStyle); setText(row, 0, value.getSupplier()); setText(row, 1, value.getComments()); setText(row, 2, value.getHandlingCharge()); @@ -222,14 +231,14 @@ public class PriceSheetReportServiceImpl implements IPriceSheetReportService { sheet.setColumnWidth(2, 22 * 256); } - private void writePaymentSheet(Workbook workbook, CellStyle headerStyle, + private void writePaymentSheet(Workbook workbook, CellStyle headerStyle, CellStyle dataStyle, List rows) { Sheet sheet = createSheet(workbook, "active payment terms", PAYMENT_HEADERS, headerStyle); int rowIndex = 1; for (PriceSheetReportPaymentTermVo value : rows) { - Row row = sheet.createRow(rowIndex++); + Row row = createDataRow(sheet, rowIndex++, PAYMENT_HEADERS.length, dataStyle); if (value.getRowNo() != null) { - row.createCell(0).setCellValue(value.getRowNo()); + row.getCell(0).setCellValue(value.getRowNo()); } setText(row, 1, value.getSupplier()); setText(row, 2, value.getPaymentTerms()); @@ -254,6 +263,15 @@ public class PriceSheetReportServiceImpl implements IPriceSheetReportService { return sheet; } + private Row createDataRow(Sheet sheet, int rowIndex, int columnCount, CellStyle dataStyle) { + Row row = sheet.createRow(rowIndex); + for (int column = 0; column < columnCount; column++) { + Cell cell = row.createCell(column); + cell.setCellStyle(dataStyle); + } + return row; + } + private void setPriceSheetWidths(Sheet sheet) { for (int index = 0; index < PRICE_HEADERS.length; index++) { int width = index < 3 ? 18 : 15; @@ -266,15 +284,20 @@ public class PriceSheetReportServiceImpl implements IPriceSheetReportService { private void setText(Row row, int column, String value) { if (value != null) { - row.createCell(column).setCellValue(value); + getOrCreateCell(row, column).setCellValue(value); } } private void setNumber(Row row, int column, BigDecimal value, CellStyle style) { if (value != null) { - Cell cell = row.createCell(column); + Cell cell = getOrCreateCell(row, column); cell.setCellValue(value.doubleValue()); cell.setCellStyle(style); } } + + private Cell getOrCreateCell(Row row, int column) { + Cell cell = row.getCell(column); + return cell == null ? row.createCell(column) : cell; + } } diff --git a/src/main/resources/mapper/supplier/PriceSheetReportMapper.xml b/src/main/resources/mapper/supplier/PriceSheetReportMapper.xml index d3243ab..0f8f70b 100644 --- a/src/main/resources/mapper/supplier/PriceSheetReportMapper.xml +++ b/src/main/resources/mapper/supplier/PriceSheetReportMapper.xml @@ -114,41 +114,41 @@ LEFT JOIN ( SELECT Site, PartNo, - MAX(ISNULL(TextValue, CONVERT(VARCHAR(100), NumValue))) AS propertyValue + MAX(TextValue) AS propertyValue FROM PartSubPropertiesValue - WHERE CodeNo = 'T0011' AND RecordType = 'P' + WHERE PropertiesItemNo = 'T0011' AND RecordType = 'P' GROUP BY Site, PartNo ) fsc ON fsc.Site = sp.site AND fsc.PartNo = sp.part_no LEFT JOIN ( SELECT Site, PartNo, - MAX(ISNULL(TextValue, CONVERT(VARCHAR(100), NumValue))) AS propertyValue + MAX(TextValue) AS propertyValue FROM PartSubPropertiesValue - WHERE CodeNo = 'T0012' AND RecordType = 'P' + WHERE PropertiesItemNo = 'T0012' AND RecordType = 'P' GROUP BY Site, PartNo ) fsc_claim ON fsc_claim.Site = sp.site AND fsc_claim.PartNo = sp.part_no LEFT JOIN ( SELECT Site, PartNo, - MAX(ISNULL(TextValue, CONVERT(VARCHAR(100), NumValue))) AS propertyValue + MAX( CONVERT(VARCHAR(100), NumValue)) AS propertyValue FROM PartSubPropertiesValue - WHERE CodeNo = 'T0016' AND RecordType = 'P' + WHERE PropertiesItemNo = 'T0016' AND RecordType = 'P' GROUP BY Site, PartNo ) lead_free ON lead_free.Site = sp.site AND lead_free.PartNo = sp.part_no LEFT JOIN ( SELECT Site, PartNo, - MAX(ISNULL(TextValue, CONVERT(VARCHAR(100), NumValue))) AS propertyValue + MAX(TextValue) AS propertyValue FROM PartSubPropertiesValue - WHERE CodeNo = 'T0052' AND RecordType = 'P' + WHERE PropertiesItemNo = 'T0052' AND RecordType = 'P' GROUP BY Site, PartNo ) aware_dpp ON aware_dpp.Site = sp.site AND aware_dpp.PartNo = sp.part_no LEFT JOIN ( SELECT Site, PartNo, - MAX(ISNULL(TextValue, CONVERT(VARCHAR(100), NumValue))) AS propertyValue + MAX(TextValue) AS propertyValue FROM PartSubPropertiesValue - WHERE CodeNo = 'T0042' AND RecordType = 'P' + WHERE PropertiesItemNo = 'T0042' AND RecordType = 'P' GROUP BY Site, PartNo ) coo ON coo.Site = sp.site AND coo.PartNo = sp.part_no WHERE sp.site = #{query.site}