diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java index 37802493..1864673b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java @@ -103,7 +103,7 @@ public class LawsMarketStandard implements Serializable { */ @Dict(dicCode = "drive_position") @ApiModelProperty(value = "驾驶位置") - @Excel(name = "驾驶位置", width = 15,needMerge = true) + @Excel(name = "驾驶位置", width = 15,needMerge = true, dicCode = "drive_position") private String drivePosition; /** @@ -126,7 +126,7 @@ public class LawsMarketStandard implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "发布时间") - @Excel(name = "发布时间", width = 15,needMerge = true) + @Excel(name = "发布时间", width = 15, needMerge = true, format = "yyyy-MM-dd") private Date releaseDate; /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java index af892d1a..ee7cec36 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java @@ -97,7 +97,7 @@ public class LawsMarketStandardDetail implements Serializable { /** * 新生产车实施日期 */ - @Excel(name = "新生产车实施日期", width = 15) + @Excel(name = "新生产车实施日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "新生产车实施日期") @@ -106,7 +106,7 @@ public class LawsMarketStandardDetail implements Serializable { /** * 新认证车实施日期 */ - @Excel(name = "新认证车实施日期", width = 15) + @Excel(name = "新认证车实施日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "新认证车实施日期") @@ -133,7 +133,7 @@ public class LawsMarketStandardDetail implements Serializable { /** * 适用车型 */ - @Excel(name = "适用车型", width = 15) + @Excel(name = "适用车型", width = 15, dicCode = "applicable_vehicle_type") @Dict(dicCode = "applicable_vehicle_type") @ApiModelProperty(value = "适用车型") private String applicableVehicle; @@ -148,7 +148,8 @@ public class LawsMarketStandardDetail implements Serializable { * 认证对象 */ @ApiModelProperty(value = "认证对象") - @Excel(name = "认证对象", width = 15) + @Dict(dicCode = "authentication_object") + @Excel(name = "认证对象", width = 15, dicCode = "authentication_object") private String authenticationObject; /** @@ -186,7 +187,8 @@ public class LawsMarketStandardDetail implements Serializable { * 主控部门专业模块 */ @ApiModelProperty(value = "主控部门专业模块") - @Excel(name = "主控部门专业模块", width = 15) + @Dict(dicCode = "professional_module") + @Excel(name = "主控部门专业模块", width = 15, dicCode = "professional_module") private String mainDeptProfMode; /** @@ -201,14 +203,16 @@ public class LawsMarketStandardDetail implements Serializable { * 关联部门专业模块 */ @ApiModelProperty(value = "关联部门专业模块") - @Excel(name = "关联部门专业模块", width = 15) + @Excel(name = "关联部门专业模块", width = 15, dicCode = "professional_module") + @Dict(dicCode = "professional_module") private String associateDeptProfMode; /** * 批量限制 */ @ApiModelProperty(value = "批量限制") - @Excel(name = "批量限制", width = 15) + @Excel(name = "批量限制", width = 15, dicCode = "batch_restriction") + @Dict(dicCode = "batch_restriction") private String batchLimit; /**