楚江erp：订货单批量导出bug修复-文件名重复处理

@@ -524,8 +524,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
     }
     }
 
 
     @ApiOperation("订货单批量打印")
     @ApiOperation("订货单批量打印")
-    @GetMapping("/batchPrintPurchaseOrder")
-    public InvokeResult<Void> batchPrintPurchaseOrder( QueryPurchaseOrderInfoVo vo) {
+    @PostMapping("/batchPrintPurchaseOrder")
+    public InvokeResult<Void> batchPrintPurchaseOrder(@RequestBody QueryPurchaseOrderInfoVo vo) {
         vo.setExportType(ExportType.ORDER_EXPORT_ZIP.getCode());
         vo.setExportType(ExportType.ORDER_EXPORT_ZIP.getCode());
         ExportTaskUtil.exportTask("订货单信息", OrderInfoExportTaskWorker.class, vo);
         ExportTaskUtil.exportTask("订货单信息", OrderInfoExportTaskWorker.class, vo);
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();

@@ -177,6 +177,8 @@ public class BusinessDataExportHandler implements ExportHandler {
         if ("PRODUCTION_PROCESS".equals(queryVo.getTemplateType())) {
         if ("PRODUCTION_PROCESS".equals(queryVo.getTemplateType())) {
             templateResource = new ClassPathResource("templates/purchaseOrderTemplateForProduction.xlsx");
             templateResource = new ClassPathResource("templates/purchaseOrderTemplateForProduction.xlsx");
         }
         }
+        // 时间格式
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
         try (FileOutputStream fosZip = new FileOutputStream(file);
         try (FileOutputStream fosZip = new FileOutputStream(file);
              ZipOutputStream zos = new ZipOutputStream(fosZip)) {
              ZipOutputStream zos = new ZipOutputStream(fosZip)) {
             for (PurchaseOrderInfo orderInfo : orderInfoList) {
             for (PurchaseOrderInfo orderInfo : orderInfoList) {
@@ -265,6 +267,8 @@ public class BusinessDataExportHandler implements ExportHandler {
                     dataMap.put("priceListNo", orderInfo.getPriceListNo());
                     dataMap.put("priceListNo", orderInfo.getPriceListNo());
                     dataMap.put("productionProcess", orderInfo.getProductionProcess());
                     dataMap.put("productionProcess", orderInfo.getProductionProcess());
                     ExcelUtil.processTemplate(workbook, dataMap);
                     ExcelUtil.processTemplate(workbook, dataMap);
+
+                    String createTime = orderInfo.getCreateTime().format(dateTimeFormatter);
                     if ("PDF".equals(queryVo.getExportFileType())) {
                     if ("PDF".equals(queryVo.getExportFileType())) {
                         // 输出PDF
                         // 输出PDF
                         File tempExcel = File.createTempFile("purchase_order_" + orderInfo.getOrderNo(), ".xlsx");
                         File tempExcel = File.createTempFile("purchase_order_" + orderInfo.getOrderNo(), ".xlsx");
@@ -273,7 +277,7 @@ public class BusinessDataExportHandler implements ExportHandler {
                         }
                         }
                         File pdfFile = ExcelUtil.convertExcelToPdf(tempExcel, "/usr/bin/libreoffice --headless --convert-to pdf --outdir %s %s");
                         File pdfFile = ExcelUtil.convertExcelToPdf(tempExcel, "/usr/bin/libreoffice --headless --convert-to pdf --outdir %s %s");
                         try (InputStream pdfIn = new FileInputStream(pdfFile)) {
                         try (InputStream pdfIn = new FileInputStream(pdfFile)) {
-                            ZipEntry entry = new ZipEntry(orderInfo.getOrderNo() + "-订货单打印.pdf");
+                            ZipEntry entry = new ZipEntry(orderInfo.getOrderNo() + "-订货单打印-" + createTime + ".pdf");
                             zos.putNextEntry(entry);
                             zos.putNextEntry(entry);
                             byte[] buffer = new byte[8192];
                             byte[] buffer = new byte[8192];
                             int len;
                             int len;
@@ -292,7 +296,7 @@ public class BusinessDataExportHandler implements ExportHandler {
                     } else {
                     } else {
                         ByteArrayOutputStream baos = new ByteArrayOutputStream();
                         ByteArrayOutputStream baos = new ByteArrayOutputStream();
                         workbook.write(baos);
                         workbook.write(baos);
-                        ZipEntry entry = new ZipEntry(orderInfo.getOrderNo() + "-订货单打印.xlsx");
+                        ZipEntry entry = new ZipEntry(orderInfo.getOrderNo() + "-订货单打印-" + createTime + ".xlsx");
                         zos.putNextEntry(entry);
                         zos.putNextEntry(entry);
                         zos.write(baos.toByteArray());
                         zos.write(baos.toByteArray());
                         zos.closeEntry();
                         zos.closeEntry();