From 468c39f37827f8ca57dcf41bb07c3ae114373801 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 28 Sep 2022 16:07:10 +0800
Subject: [PATCH] =?UTF-8?q?countryCard=EF=BC=8C=E5=AF=B9=E6=AF=94=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=A4=84=E7=90=86=E6=96=87=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/CountryCardManageReleaseDetailEO.java    |  4 ++++
 ...CountryCardManageReleaseDetailEOServiceImpl.java | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java
index 9aba556d1..cdf33870b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java
@@ -99,4 +99,8 @@ public class CountryCardManageReleaseDetailEO implements Serializable {
     /**Country Card模板维护-字典项实体*/
     @TableField(exist = false)
     private List<CountryCardTempItemEO> countryCardTempItemEOList;
+
+    @ApiModelProperty(value = "内容附件名称")
+    @TableField(exist = false)
+    private String contentFileName;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java
index 84929756b..8356604d4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java
@@ -2,6 +2,8 @@ package com.jero.modules.problemKnowledgeBase.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempItemEO;
@@ -38,6 +40,8 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl<Cou
 	private ICountryCardTempEOService countryCardTempEOService;
 	@Autowired
 	private ICountryCardTempItemEOService countryCardTempItemEOService;
+	@Autowired
+	private IOSSFileService iOSSFileService;
 
 	/**
 	 * 保存
@@ -162,6 +166,15 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl<Cou
 						data.setContentDropDownValue(contentDropDownValue);
 					}
 				}
+
+				//如果该条数据的标签类型是文件
+				if(CollectionUtils.isNotEmpty(countryCardTempItemEOList) && StringUtils.equals(data.getLableType(), LableTypeEnum.FILE.getValue())){
+					//文件的id
+					String fileIds = data.getContent();
+					List<OSSFile> fileInfos = this.iOSSFileService.getFileInfos(fileIds);
+					String contentFileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
+					data.setContentFileName(contentFileName);
+				}
 			});
 
 		}