|
|
@@ -1731,7 +1731,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- row3Title = append(row3Title, "套餐备注", "开始时间", "到期时间", "金额单位")
|
|
|
+ row3Title = append(row3Title, "套餐备注", "开始时间", "到期时间", "合同金额", "金额单位")
|
|
|
if req.ListParam == 0 {
|
|
|
row3Title = append(row3Title, "FICC套餐总金额", "权益套餐总金额")
|
|
|
}
|
|
|
@@ -1875,14 +1875,18 @@ func (rg *RegisterController) Export(c *gin.Context) {
|
|
|
dataRow.AddCell().SetString(v.ServiceRemark) // 套餐备注
|
|
|
dataRow.AddCell().SetString(utils.TimeTransferString("2006/01/02", v.StartDate)) // 开始时间
|
|
|
dataRow.AddCell().SetString(utils.TimeTransferString("2006/01/02", v.EndDate)) // 到期时间
|
|
|
- //dataRow.AddCell().SetString(fmt.Sprint("￥", v.ContractAmount)) // 2022年合同金额
|
|
|
+ dataRow.AddCell().SetString(fmt.Sprint("￥", v.ContractAmount)) // 合同金额
|
|
|
dataRow.AddCell().SetString(v.CurrencyUnit) // 货币单位
|
|
|
if ficcAmount != nil {
|
|
|
dataRow.AddCell().SetString(fmt.Sprint("￥", ficcAmount.ServiceAmount)) // FICC套餐总金额
|
|
|
- dataRow.AddCell().SetString("") // 权益套餐总金额
|
|
|
+ if raiAmount == nil{
|
|
|
+ dataRow.AddCell().SetString("") // 权益套餐总金额
|
|
|
+ }
|
|
|
}
|
|
|
if raiAmount != nil {
|
|
|
- dataRow.AddCell().SetString("") // 权益套餐总金额
|
|
|
+ if ficcAmount == nil{
|
|
|
+ dataRow.AddCell().SetString("") // 权益套餐总金额
|
|
|
+ }
|
|
|
dataRow.AddCell().SetString(fmt.Sprint("￥", raiAmount.ServiceAmount)) // FICC套餐总金额
|
|
|
}
|
|
|
if ficcAmount == nil && raiAmount == nil {
|
ziwen