From 7d4984e1d8b5b76a09acb2f571cb203397d23fa3 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 7 Feb 2025 16:42:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20IMS-CDR=E5=AF=BC=E5=87=BA=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_data/service/cdr_event_ims.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/network_data/service/cdr_event_ims.go b/src/modules/network_data/service/cdr_event_ims.go
index aa9128f3..c63c19df 100644
--- a/src/modules/network_data/service/cdr_event_ims.go
+++ b/src/modules/network_data/service/cdr_event_ims.go
@@ -53,9 +53,9 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
 		"A1": "ID",
 		"B1": "Record Behavior",
 		"C1": "Type",
-		"D1": "Called",
-		"E1": "Result",
-		"F1": "Caller",
+		"D1": "Caller",
+		"E1": "Called",
+		"F1": "Result",
 		"G1": "Duration",
 		"H1": "Call Start Time",
 		"I1": "Hangup Time",
@@ -105,7 +105,7 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
 		// 时长
 		duration := "-"
 		if v, ok := cdrJSON["callDuration"]; ok && v != nil && callType != "sms" {
-			duration = fmt.Sprint(parse.Number(v))
+			duration = fmt.Sprintf("%ds", parse.Number(v))
 		}
 		// 呼叫结果 非短信都有code作为结果 sms短信都ok
 		callResult := "Success"
@@ -141,9 +141,9 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
 			"A" + idx: row.ID,
 			"B" + idx: recordType,
 			"C" + idx: callTypeLable,
-			"D" + idx: called,
-			"E" + idx: callResult,
-			"F" + idx: caller,
+			"D" + idx: caller,
+			"E" + idx: called,
+			"F" + idx: callResult,
 			"G" + idx: duration,
 			"H" + idx: seizureTimeStr,
 			"I" + idx: releaseTimeStr,