From abdcf8510f6967a01fe1e1ff688da82aa35bf8f2 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 4 Jul 2024 17:52:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=BA=93=E6=96=87=E4=BB=B6=E6=97=A0=E6=B3=95=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsEvaluationNotMetLibrary.java | 18 ++++++------- .../assessmentLibrary/entity/NotMetFile.java | 15 +++++++++++ ...awsEvaluationNotMetLibraryServiceImpl.java | 25 +++++++------------ 3 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/NotMetFile.java diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java index a6499cdf..42ab788c 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java @@ -4,20 +4,19 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Collections; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.assessmentLibrary.entity.vo.MaterialFile; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelCollection; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Collections; +import java.util.Date; +import java.util.List; + /** * 不符合项库 * @TableName laws_evaluation_not_met_library @@ -109,8 +108,8 @@ public class LawsEvaluationNotMetLibrary implements Serializable { * 评估人 */ @ApiModelProperty(value = "评估人") - @Excel(name = "评估人", width = 15, orderNum = "8", dictTable = "sys_user", dicCode = "id", dicText = "realname") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") + @Excel(name = "评估人", width = 15, orderNum = "8", dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") private String assessor; /** @@ -217,8 +216,9 @@ public class LawsEvaluationNotMetLibrary implements Serializable { * 附件 */ @ApiModelProperty(value = "附件") - @ExcelCollection(name = "") - private List materialFileList = Collections.emptyList(); + @ExcelCollection(name = "", orderNum = "13") + @TableField(exist = false) + private List fileList = Collections.emptyList(); /** * 标准ID diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/NotMetFile.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/NotMetFile.java new file mode 100644 index 00000000..28ec7ad5 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/NotMetFile.java @@ -0,0 +1,15 @@ +package com.jero.modules.assessmentLibrary.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +@Data +public class NotMetFile { + @ApiModelProperty(value = "id") + private String id; + + @Excel(name = "附件", width = 15) + @ApiModelProperty(value = "附件") + private String fileName; +} diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java index 9f155dc0..74d9a75a 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; @@ -12,14 +11,10 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.FileUtils; import com.jero.common.util.MinioUtil; import com.jero.common.util.ZipUtil; -import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary; -import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail; import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary; -import com.jero.modules.assessmentLibrary.entity.vo.LawsConformityAssessmentLibraryExportVO; -import com.jero.modules.assessmentLibrary.entity.vo.MaterialFile; +import com.jero.modules.assessmentLibrary.entity.NotMetFile; import com.jero.modules.assessmentLibrary.mapper.LawsEvaluationNotMetLibraryMapper; import com.jero.modules.assessmentLibrary.service.ILawsEvaluationNotMetLibraryService; -import com.jero.modules.laws.enterprise.util.BeanCopyUtils; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.projectLibrary.common.AssessCommon; @@ -40,8 +35,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.util.*; /** @@ -158,11 +151,11 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl fileIdList = Arrays.asList(vo.getMaterial().split(",")); + if (StringUtils.isNotBlank(vo.getFile())) { + List fileIdList = Arrays.asList(vo.getFile().split(",")); List ossFileList = ossFileService.listByIds(fileIdList); if (!ossFileList.isEmpty()) { // 赋值 - List materialFileList = com.jero.common.util.BeanCopyUtils.copyBeanList(ossFileList, MaterialFile.class); - vo.setMaterialFileList(materialFileList); + List notMetFileList = com.jero.common.util.BeanCopyUtils.copyBeanList(ossFileList, NotMetFile.class); + vo.setFileList(notMetFileList); // 写出文件 for (OSSFile ossFile : ossFileList) { InputStream inputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), ossFile.getUrl());