Merge remote-tracking branch 'origin/main' into multi-tenant

src/modules/network_data/service/cdr_event_ims.go

@@ -58,9 +58,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",
@@ -110,7 +110,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"
@@ -146,9 +146,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,