|
|
@@ -548,9 +548,6 @@ func MergeCompanyListListExport(this *StatisticCompanyMergerController, dataType
|
|
|
cellMoney := titleRow.AddCell()
|
|
|
cellMoney.SetStyle(style)
|
|
|
cellMoney.SetValue("合同金额")
|
|
|
- cellPermission := titleRow.AddCell()
|
|
|
- cellPermission.SetStyle(style)
|
|
|
- cellPermission.SetValue("合同品种")
|
|
|
|
|
|
//这么大费周章的目的是为了：权益的品种存在主观、客观的区分，如果一个品种既存在主观，又存在客观，那么就展示品种名称，否则就要列出品种名称+主、客观类型
|
|
|
if len(companyContractIdList) > 0 {
|
|
|
@@ -636,11 +633,6 @@ func MergeCompanyListListExport(this *StatisticCompanyMergerController, dataType
|
|
|
cellDataMoney := dataRow.AddCell()
|
|
|
cellDataMoney.SetStyle(style)
|
|
|
cellDataMoney.SetValue(v.Money)
|
|
|
- cellDataPermission := dataRow.AddCell()
|
|
|
- cellDataPermission.SetStyle(style)
|
|
|
- if permissionStrList, ok := permissionMap[v.CompanyContractId]; ok {
|
|
|
- cellDataPermission.SetValue(strings.Join(permissionStrList, ","))
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
cellDataTime := dataRow.AddCell()
|
xingzai