From a00c41fc8ba80241965409e0d754e4ee55a2564f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 18:25:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93=E6=9F=A5=E8=AF=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsConformityAssessmentLibraryExportVO.java | 13 +++++++++++++ .../entity/vo/UnsatisfiedRequireAttachFile.java | 15 +++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/vo/UnsatisfiedRequireAttachFile.java diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/vo/LawsConformityAssessmentLibraryExportVO.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/vo/LawsConformityAssessmentLibraryExportVO.java index 03623d04..ca4081f9 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/vo/LawsConformityAssessmentLibraryExportVO.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/vo/LawsConformityAssessmentLibraryExportVO.java @@ -162,5 +162,18 @@ public class LawsConformityAssessmentLibraryExportVO implements Serializable { @ExcelCollection(name = "") private List materialFileList = Collections.emptyList(); + /** + * 佐证材料 + */ + @ApiModelProperty(value = "辅助说明材料") + private String unsatisfiedRequireAttach; + + /** + * 佐证材料 + */ + @ApiModelProperty(value = "辅助说明材料") + @ExcelCollection(name = "") + private List unsatisfiedRequireAttachList = Collections.emptyList(); + } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/vo/UnsatisfiedRequireAttachFile.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/vo/UnsatisfiedRequireAttachFile.java new file mode 100644 index 00000000..69b728c2 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/vo/UnsatisfiedRequireAttachFile.java @@ -0,0 +1,15 @@ +package com.jero.modules.assessmentLibrary.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +@Data +public class UnsatisfiedRequireAttachFile { + @ApiModelProperty(value = "id") + private String id; + + @Excel(name = "辅助说明材料", width = 15) + @ApiModelProperty(value = "辅助说明材料") + private String fileName; +}