diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java index c65e5444..bd8fcd92 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java @@ -44,7 +44,7 @@ public class SafetyCenterSubitem { */ @TableField(value = "company_id") @ApiModelProperty(value = "成员单位id") - @Excel(name = "成员单位", width = 15, dictTable = "pay_company_management", dicText = "company_name", dicCode = "id") + @Excel(name = "成员单位", width = 15, dictTable = "pay_company_management", dicText = "company_name", dicCode = "id", needMerge = true) @Dict(dictTable = "pay_company_management", dicText = "company_name", dicCode = "id") private String companyId; /** @@ -54,29 +54,12 @@ public class SafetyCenterSubitem { @ApiModelProperty(value = "成员单位名称") private String companyName; - /**企业联系人id*/ - @TableField(exist = false) - @ApiModelProperty(value = "企业联系人id") - @Dict(dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") - private String contactsId; - - /**企业联系人姓名*/ - @TableField(exist = false) - @ApiModelProperty(value = "企业联系人姓名") - private String contactsName; - - /**企业联系人列表*/ - @TableField(exist = false) - @ApiModelProperty(value = "企业联系人列表") - @ExcelCollection(name = "企业联系人列表") - private List contactsList; - /** * 备注 */ @TableField(value = "remarks") @ApiModelProperty(value = "备注") - @Excel(name = "备注") + @Excel(name = "备注", needMerge = true) private String remarks; /** @@ -107,6 +90,24 @@ public class SafetyCenterSubitem { @ApiModelProperty(value = "更新时间") private Date updateTime; + /**企业联系人id*/ + @TableField(exist = false) + @ApiModelProperty(value = "企业联系人id") + @Dict(dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") + private String contactsId; + + /**企业联系人姓名*/ + @TableField(exist = false) + @ApiModelProperty(value = "企业联系人姓名") + private String contactsName; + + /**企业联系人列表*/ + @TableField(exist = false) + @ApiModelProperty(value = "企业联系人列表") + @ExcelCollection(name = "企业联系人列表") + private List contactsList; + + /**已提醒*/ @TableField(exist = false) @Dict(dicCode = "yn") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java index 883d80df..db9326c8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java @@ -20,9 +20,17 @@ public class SafetyCenterSubitemImport { * 成员单位 */ @ApiModelProperty(value = "成员单位") - @Excel(name = "成员单位") + @Excel(name = "成员单位", needMerge = true) private String companyName; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @Excel(name = "备注", needMerge = true) + private String remarks; + /** * 企业联系人列表 */ @@ -30,11 +38,5 @@ public class SafetyCenterSubitemImport { @ExcelCollection(name = "企业联系人列表") private List contactsList; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @Excel(name = "备注") - private String remarks; } \ No newline at end of file