From 3e3fb31e26843e9c1dc78b4bf9acdca202a1d1f4 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sun, 29 Sep 2024 09:18:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?= =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E6=8A=A5=E5=91=8A=E9=99=84=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprise/entity/EnterpriseStandardInspectReport.java | 2 ++ .../mapper/xml/EnterpriseStandardInspectReportMapper.xml | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java index e0a45b54..ab8388f5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -79,6 +80,7 @@ public class EnterpriseStandardInspectReport implements Serializable { private String executionStatus; /**附件*/ + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") @ApiModelProperty(value = "附件") private String attachment; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectReportMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectReportMapper.xml index 14261c72..6b18072d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectReportMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectReportMapper.xml @@ -32,10 +32,9 @@ ic.requirement AS standardRequire, ir.execution_status, ir.evaluate_score, - o.file_name AS attachment + ir.attachment FROM laws_enterprise_standard_inspect_report AS ir - LEFT JOIN oss_file AS o ON o.id = ir.attachment LEFT JOIN laws_enterprise_standard_inspect_content AS ic ON ir.inspect_content_id = ic.id WHERE ir.inspect_id = #{inspectId}