From deb0abf6fe70164e8d3d871636d903ba1a2b093d Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Thu, 10 Dec 2020 13:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=AE=9E=E4=BD=93=E5=8C=96=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E4=BF=AE=E6=94=B9=E5=9B=9E=E6=98=BE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E3=80=91=E9=AD=8F=E5=87=AF=202020-12-10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/elink/esua/epdc/dto/SubFileImgDTO.java | 5 +++++
 .../epdc/dto/result/SubDetailDictChildImageResultDTO.java    | 2 +-
 .../epdc/service/impl/SubPositionCheckDetailServiceImpl.java | 4 ++--
 .../src/main/resources/mapper/SubPositionCheckDetailDao.xml  | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubFileImgDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubFileImgDTO.java
index bc9d27e44..c4bc9b841 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubFileImgDTO.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubFileImgDTO.java
@@ -98,4 +98,9 @@ public class SubFileImgDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 文件名(新增)
+     */
+    private String name;
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictChildImageResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictChildImageResultDTO.java
index 3a40c20c3..f619ab2f5 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictChildImageResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictChildImageResultDTO.java
@@ -18,5 +18,5 @@ public class SubDetailDictChildImageResultDTO implements Serializable {
     //图片缩略图url
     private String thumbnail;
     //文件名称
-    private String fileName;
+    private String name;
 }
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java
index f0c3d272b..811d36423 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java
@@ -316,7 +316,7 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
             for (SubFileImgDTO a:fiels) {
                 SubFileImgEntity  imgEntity = new SubFileImgEntity();
                 imgEntity.setDetailId(detailId);
-                imgEntity.setFileName(a.getFileName());
+                imgEntity.setFileName(a.getName());
                 imgEntity.setThumbnail(a.getThumbnail());
                 imgEntity.setFileType("2");
                 imgEntity.setUrl(a.getUrl());
@@ -327,7 +327,7 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
             for (SubFileImgDTO b:images){
                 SubFileImgEntity  imgEntity = new SubFileImgEntity();
                 imgEntity.setDetailId(detailId);
-                imgEntity.setFileName(b.getFileName());
+                imgEntity.setFileName(b.getName());
                 imgEntity.setThumbnail(b.getThumbnail());
                 imgEntity.setFileType("1");
                 imgEntity.setUrl(b.getUrl());
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckDetailDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckDetailDao.xml
index 5e9b0a461..7932f4778 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckDetailDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckDetailDao.xml
@@ -39,12 +39,12 @@ WHERE
         <collection property="images" ofType="com.elink.esua.epdc.dto.result.SubDetailDictChildImageResultDTO">
             <result property="url" column="URL"/>
             <result property="thumbnail" column="THUMBNAIL"/>
-            <result property="fileName" column="FILE_NAME"/>
+            <result property="name" column="FILE_NAME"/>
         </collection>
         <collection property="files" ofType="com.elink.esua.epdc.dto.result.SubDetailDictChildImageResultDTO">
             <result property="url" column="fileUrl"/>
             <result property="thumbnail" column="fileth"/>
-            <result property="fileName" column="fileName"/>
+            <result property="name" column="fileName"/>
         </collection>
     </resultMap>