This commit is contained in:
@@ -275,7 +275,7 @@ func (s *DeviceDataSource) fetchBoundCards(ctx context.Context, deviceIDs []uint
|
||||
c.msisdn,
|
||||
c.carrier_name,
|
||||
c.current_month_usage_mb,
|
||||
c.status
|
||||
c.network_status
|
||||
`).
|
||||
Joins("JOIN tb_iot_card AS c ON c.id = b.iot_card_id AND c.deleted_at IS NULL").
|
||||
Where("b.device_id IN ?", deviceIDs).
|
||||
@@ -344,7 +344,7 @@ type deviceExportCardRow struct {
|
||||
MSISDN string `gorm:"column:msisdn"`
|
||||
CarrierName string `gorm:"column:carrier_name"`
|
||||
CurrentMonthUsageMB float64 `gorm:"column:current_month_usage_mb"`
|
||||
Status int `gorm:"column:status"`
|
||||
NetworkStatus int `gorm:"column:network_status"`
|
||||
}
|
||||
|
||||
type deviceExportPackageRow struct {
|
||||
@@ -406,7 +406,7 @@ func buildDeviceExportRow(item deviceExportRow, cards []deviceExportCardRow, pkg
|
||||
card.MSISDN,
|
||||
card.CarrierName,
|
||||
formatMB(card.CurrentMonthUsageMB),
|
||||
constants.GetIotCardStatusName(card.Status),
|
||||
constants.GetNetworkStatusName(card.NetworkStatus),
|
||||
)
|
||||
}
|
||||
// 如果表头列数被历史任务固定得比当前绑定卡少,仍保证合计覆盖当前查到的全部卡。
|
||||
|
||||
Reference in New Issue
Block a user