Showing
3 changed files
with
20 additions
and
12 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/OrderChangeRecordController.java
| @@ -178,13 +178,17 @@ public class OrderChangeRecordController extends DefaultBaseController { | @@ -178,13 +178,17 @@ public class OrderChangeRecordController extends DefaultBaseController { | ||
| 178 | */ | 178 | */ |
| 179 | @ApiOperation("规格变更打印") | 179 | @ApiOperation("规格变更打印") |
| 180 | @GetMapping("/printOrderSpecChangeRecord") | 180 | @GetMapping("/printOrderSpecChangeRecord") |
| 181 | - public void printOrderSpecChangeRecord(@NotBlank(message = "id不能为空") String id, HttpServletResponse response) { | 181 | + public void printOrderSpecChangeRecord(@NotBlank(message = "id不能为空") String id, |
| 182 | + @NotBlank(message = "type不能为空") String type, HttpServletResponse response) { | ||
| 182 | OrderInfoChangeRecord data = orderChangeRecordService.findById(id); | 183 | OrderInfoChangeRecord data = orderChangeRecordService.findById(id); |
| 183 | if (data == null) { | 184 | if (data == null) { |
| 184 | throw new DefaultClientException("规格变更记录不存在!"); | 185 | throw new DefaultClientException("规格变更记录不存在!"); |
| 185 | } | 186 | } |
| 186 | - | ||
| 187 | - ClassPathResource templateResource = new ClassPathResource("templates/orderSpecChangeTemplate.xlsx"); | 187 | + String templatePath = "templates/orderSpecChangeTemplate.xlsx"; |
| 188 | + if ("NO_ASSESSMENT".equals(type)) { | ||
| 189 | + templatePath = "templates/orderSpecChangeTemplate2.xlsx"; | ||
| 190 | + } | ||
| 191 | + ClassPathResource templateResource = new ClassPathResource(templatePath); | ||
| 188 | try (InputStream inputStream = templateResource.getStream(); | 192 | try (InputStream inputStream = templateResource.getStream(); |
| 189 | Workbook workbook = new XSSFWorkbook(inputStream)) { | 193 | Workbook workbook = new XSSFWorkbook(inputStream)) { |
| 190 | 194 | ||
| @@ -220,7 +224,7 @@ public class OrderChangeRecordController extends DefaultBaseController { | @@ -220,7 +224,7 @@ public class OrderChangeRecordController extends DefaultBaseController { | ||
| 220 | PurchaseOrderLine line = i < beforeLines.size() ? beforeLines.get(i) : null; | 224 | PurchaseOrderLine line = i < beforeLines.size() ? beforeLines.get(i) : null; |
| 221 | int rowIdx = beforeStartRow + i; | 225 | int rowIdx = beforeStartRow + i; |
| 222 | if (line != null) { | 226 | if (line != null) { |
| 223 | - fillChangePrintRow(workbook, sheet, rowIdx, line, dateFormatter); | 227 | + fillChangePrintRow(workbook, sheet, rowIdx, line, dateFormatter, type); |
| 224 | } else { | 228 | } else { |
| 225 | for (int col = 0; col <= 8; col++) { | 229 | for (int col = 0; col <= 8; col++) { |
| 226 | ExcelUtil.setCellValue(sheet, rowIdx, col, ""); | 230 | ExcelUtil.setCellValue(sheet, rowIdx, col, ""); |
| @@ -238,7 +242,7 @@ public class OrderChangeRecordController extends DefaultBaseController { | @@ -238,7 +242,7 @@ public class OrderChangeRecordController extends DefaultBaseController { | ||
| 238 | PurchaseOrderLine line = i < afterLines.size() ? afterLines.get(i) : null; | 242 | PurchaseOrderLine line = i < afterLines.size() ? afterLines.get(i) : null; |
| 239 | int rowIdx = afterStartRow + i; | 243 | int rowIdx = afterStartRow + i; |
| 240 | if (line != null) { | 244 | if (line != null) { |
| 241 | - fillChangePrintRow(workbook, sheet, rowIdx, line, dateFormatter); | 245 | + fillChangePrintRow(workbook, sheet, rowIdx, line, dateFormatter, type); |
| 242 | } else { | 246 | } else { |
| 243 | for (int col = 0; col <= 8; col++) { | 247 | for (int col = 0; col <= 8; col++) { |
| 244 | ExcelUtil.setCellValue(sheet, rowIdx, col, ""); | 248 | ExcelUtil.setCellValue(sheet, rowIdx, col, ""); |
| @@ -472,7 +476,7 @@ public class OrderChangeRecordController extends DefaultBaseController { | @@ -472,7 +476,7 @@ public class OrderChangeRecordController extends DefaultBaseController { | ||
| 472 | * @throws IOException 规格渲染异常 | 476 | * @throws IOException 规格渲染异常 |
| 473 | */ | 477 | */ |
| 474 | private void fillChangePrintRow(Workbook workbook, Sheet sheet, int rowIdx, PurchaseOrderLine line, | 478 | private void fillChangePrintRow(Workbook workbook, Sheet sheet, int rowIdx, PurchaseOrderLine line, |
| 475 | - DateTimeFormatter dateFormatter) throws IOException { | 479 | + DateTimeFormatter dateFormatter, String type) throws IOException { |
| 476 | ExcelUtil.setCellValue(sheet, rowIdx, 0, line.getIndustry()); | 480 | ExcelUtil.setCellValue(sheet, rowIdx, 0, line.getIndustry()); |
| 477 | ExcelUtil.setCellValue(sheet, rowIdx, 1, line.getQuality()); | 481 | ExcelUtil.setCellValue(sheet, rowIdx, 1, line.getQuality()); |
| 478 | ExcelUtil.setCellValue(sheet, rowIdx, 2, line.getBrand()); | 482 | ExcelUtil.setCellValue(sheet, rowIdx, 2, line.getBrand()); |
| @@ -482,7 +486,9 @@ public class OrderChangeRecordController extends DefaultBaseController { | @@ -482,7 +486,9 @@ public class OrderChangeRecordController extends DefaultBaseController { | ||
| 482 | ExcelUtil.setCellValue(sheet, rowIdx, 6, line.getSalesPrice()); | 486 | ExcelUtil.setCellValue(sheet, rowIdx, 6, line.getSalesPrice()); |
| 483 | ExcelUtil.setCellValue(sheet, rowIdx, 7, | 487 | ExcelUtil.setCellValue(sheet, rowIdx, 7, |
| 484 | line.getDeliveryDate() == null ? "" : line.getDeliveryDate().format(dateFormatter)); | 488 | line.getDeliveryDate() == null ? "" : line.getDeliveryDate().format(dateFormatter)); |
| 485 | - ExcelUtil.setCellValue(sheet, rowIdx, 8, line.getAssessmentExceedsAgreement()); | 489 | + if (!"NO_ASSESSMENT".equals(type)) { |
| 490 | + ExcelUtil.setCellValue(sheet, rowIdx, 8, line.getAssessmentExceedsAgreement()); | ||
| 491 | + } | ||
| 486 | } | 492 | } |
| 487 | 493 | ||
| 488 | /** | 494 | /** |
| @@ -237,6 +237,9 @@ public class ExcelUtil { | @@ -237,6 +237,9 @@ public class ExcelUtil { | ||
| 237 | 237 | ||
| 238 | /** | 238 | /** |
| 239 | * 设置合并单元格的边框样式 | 239 | * 设置合并单元格的边框样式 |
| 240 | + * 仅为新建出来的空白单元格补齐左上角的样式; | ||
| 241 | + * 已有样式的单元格保留其自身样式(copyCell 已按源行逐格复制了正确的内/外边框), | ||
| 242 | + * 否则会把合并区域内部边的“无边框”样式覆盖到区域右/下边界单元格上,导致打印时边框丢失 | ||
| 240 | */ | 243 | */ |
| 241 | public static void setMergedRegionBorderStyle(Sheet sheet, CellRangeAddress region) { | 244 | public static void setMergedRegionBorderStyle(Sheet sheet, CellRangeAddress region) { |
| 242 | Row firstRow = sheet.getRow(region.getFirstRow()); | 245 | Row firstRow = sheet.getRow(region.getFirstRow()); |
| @@ -245,18 +248,17 @@ public class ExcelUtil { | @@ -245,18 +248,17 @@ public class ExcelUtil { | ||
| 245 | if (firstCell != null && firstCell.getCellStyle() != null) { | 248 | if (firstCell != null && firstCell.getCellStyle() != null) { |
| 246 | CellStyle style = firstCell.getCellStyle(); | 249 | CellStyle style = firstCell.getCellStyle(); |
| 247 | 250 | ||
| 248 | - // 为合并区域的所有单元格设置样式 | 251 | + // 只为合并区域内缺失的单元格补齐样式 |
| 249 | for (int i = region.getFirstRow(); i <= region.getLastRow(); i++) { | 252 | for (int i = region.getFirstRow(); i <= region.getLastRow(); i++) { |
| 250 | Row row = sheet.getRow(i); | 253 | Row row = sheet.getRow(i); |
| 251 | if (row == null) { | 254 | if (row == null) { |
| 252 | row = sheet.createRow(i); | 255 | row = sheet.createRow(i); |
| 253 | } | 256 | } |
| 254 | for (int j = region.getFirstColumn(); j <= region.getLastColumn(); j++) { | 257 | for (int j = region.getFirstColumn(); j <= region.getLastColumn(); j++) { |
| 255 | - Cell cell = row.getCell(j); | ||
| 256 | - if (cell == null) { | ||
| 257 | - cell = row.createCell(j); | 258 | + if (row.getCell(j) == null) { |
| 259 | + Cell cell = row.createCell(j); | ||
| 260 | + cell.setCellStyle(style); | ||
| 258 | } | 261 | } |
| 259 | - cell.setCellStyle(style); | ||
| 260 | } | 262 | } |
| 261 | } | 263 | } |
| 262 | } | 264 | } |
No preview for this file type