From 63feaba9057826cea0d00ed9876caf8cf97f8bb4 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 17 Jul 2024 17:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java   | 2 ++
 .../anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java
index a89e6dac3e..a46b63c9db 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java
@@ -12,5 +12,7 @@ import lombok.Data;
 public class FileUrlQuery {
     @ApiModelProperty("附件路径")
     private String url; // 附件路径
+    @ApiModelProperty("附件名称")
+    private String name; // 附件路径
 }
 
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
index aac30e1be3..1bc0eee336 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
@@ -533,6 +533,9 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     FileUrlQuery fileUrlQuery = new FileUrlQuery();
                     String url = fileUploadComponent.getUrlPrefix() + asAppendix.getFilePath();
                     fileUrlQuery.setUrl(url);
+                    String fileName = asAppendix.getFileName();
+                    String fileType = asAppendix.getFileType();
+                    fileUrlQuery.setName(fileName + "." + fileType);
                     file.add(fileUrlQuery);
                 }
             }
@@ -767,7 +770,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         IPage<AsBusrepairPageVo> pagging = baseMapper.pageBillList(page, qw);
         for (AsBusrepairPageVo record : pagging.getRecords()) {
             String photoss = record.getPhotoss();
-            if (StringUtils.isNotBlank(photoss)){
+            if (StringUtils.isNotBlank(photoss)) {
                 String[] files = photoss.split(",");
                 List<String> photos = new ArrayList<>();
                 for (String file : files) {