LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 86971 功能安全中心成员 导入导出时 合并单元格

Browse Source
This commit is contained in:
lijiarao
2024-07-09 10:13:39 +08:00
parent 8564e3a523
commit 91a8d30bb2
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java
+20 -19
View File
@@ -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<SafetyCenterSubitemContacts> 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<SafetyCenterSubitemContacts> contactsList;
/**已提醒*/
@TableField(exist = false)
@Dict(dicCode = "yn")
jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java
+9 -7
View File
@@ -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<SafetyCenterSubitemContactsImport> contactsList;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
@Excel(name = "备注")
private String remarks;
}