From 32b69d8392668f747d78dc72ac96a0312598b3be Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 6 Nov 2023 17:09:16 +0800 Subject: [PATCH] fix: 78166 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企标计划-导出 文件字段名称、位置及数据回显问题 --- .../enterprise/entity/vo/EnterpriseStandardPlanVo.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java index 9df5ad79..0fba92dc 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java @@ -25,7 +25,7 @@ public class EnterpriseStandardPlanVo { @ApiModelProperty(value = "主键ID") private String id; - @Excel(name = "申请类别", width = 15, orderNum = "1", dicCode = "esp_revision_type") + @Excel(name = "制修订类型", width = 15, orderNum = "1", dicCode = "esp_revision_type") @Dict(dicCode = "esp_revision_type") @ApiModelProperty(value = "申请类别（制订/修订，立项/变更）") private String applicationCategory; @@ -61,22 +61,22 @@ public class EnterpriseStandardPlanVo { @ApiModelProperty(value = "配合单位") private String cooperationUnit; - @Excel(name = "主起草人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "realname") + @Excel(name = "主起草人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") @ApiModelProperty(value = "主起草人") private String mainDraftingUser; - @Excel(name = "主起草单位", width = 15, orderNum = "1") + @Excel(name = "主起草单位", width = 15, orderNum = "1", dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "主起草单位") private String mainDraftingUnit; - @Excel(name = "主起草单位责任人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "realname") + @Excel(name = "主起草单位责任人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") @ApiModelProperty(value = "主起草单位责任人") private String mainDraftingUnitResponsiblePerson; - @Excel(name = "标准推进人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "realname") + @Excel(name = "标准推进人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") @ApiModelProperty(value = "标准推进人") private String standardPromoter;