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}