Commit 337819d0 authored by wdy's avatar wdy

Merge branch 'wangdingyi' into 'dev'

车型试验原始记录文件名

See merge request !386
parents 1ca75935 e4f9a5a0
...@@ -894,7 +894,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -894,7 +894,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
// 将 BufferedImage 转换为 ByteArrayOutputStream // 将 BufferedImage 转换为 ByteArrayOutputStream
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
ImageIO.write(image, "jpg", outputStream); ImageIO.write(image, "jpg", outputStream);
pictureUrl += uploadMinio(outputStream,"车型审查原始记录_" + i + getReportName() + ".jpg") + ","; pictureUrl += uploadMinio(outputStream,"车辆试验原始记录_" + i + getReportName() + ".jpg") + ",";
} }
// 关闭文档 // 关闭文档
......
...@@ -64,7 +64,7 @@ public class TestPdfBox { ...@@ -64,7 +64,7 @@ public class TestPdfBox {
// 将 BufferedImage 转换为 ByteArrayOutputStream // 将 BufferedImage 转换为 ByteArrayOutputStream
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
ImageIO.write(image, "jpg", outputStream); ImageIO.write(image, "jpg", outputStream);
pictureUrl += uploadMinio(outputStream,"车型审查原始记录_" + i + getReportName() + ".jpg") + ","; pictureUrl += uploadMinio(outputStream,"车辆试验原始记录_" + i + getReportName() + ".jpg") + ",";
} }
// 关闭文档 // 关闭文档
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment