This commit is contained in:
wangzhijiang
2022-09-28 14:53:58 +08:00
parent b804fbd237
commit b883a9d180
2 changed files with 5 additions and 4 deletions
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.modules.oss.entity.OSSFile;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@@ -191,7 +192,7 @@ public class ProblemKnowledgeBaseEO implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private List<String> problemTypeNameList; private List<String> problemTypeNameList;
/**附件展示名称数组*/ /**附件展示数组*/
@TableField(exist = false) @TableField(exist = false)
private List<String> accessoryFileNameList; private List<OSSFile> accessoryFileNameList;
} }
@@ -720,7 +720,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
String accessoryFile = data.getAccessoryFile(); String accessoryFile = data.getAccessoryFile();
if(StringUtils.isNotEmpty(accessoryFile)){ if(StringUtils.isNotEmpty(accessoryFile)){
String[] accessoryFileArr = accessoryFile.split(","); String[] accessoryFileArr = accessoryFile.split(",");
List<String> accessoryFiles = accessoryFileList.stream().filter(file -> { List<OSSFile> accessoryFiles = accessoryFileList.stream().filter(file -> {
boolean flag = false; boolean flag = false;
for (String accessory : accessoryFileArr) { for (String accessory : accessoryFileArr) {
if (StringUtils.equals(file.getId(), accessory)) { if (StringUtils.equals(file.getId(), accessory)) {
@@ -729,7 +729,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
} }
} }
return flag; return flag;
}).map(OSSFile::getFileName).collect(Collectors.toList()); }).collect(Collectors.toList());
data.setAccessoryFileNameList(accessoryFiles); data.setAccessoryFileNameList(accessoryFiles);
} }
}); });