From ae04428307a92790e5ab6cdf0e9282a90845428f Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 7 Feb 2025 10:12:28 +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

---
 .../network_data/service/cdr_event_ims.go     | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/modules/network_data/service/cdr_event_ims.go b/src/modules/network_data/service/cdr_event_ims.go
index 1291c814..aa9128f3 100644
--- a/src/modules/network_data/service/cdr_event_ims.go
+++ b/src/modules/network_data/service/cdr_event_ims.go
@@ -53,11 +53,12 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
 		"A1": "ID",
 		"B1": "Record Behavior",
 		"C1": "Type",
-		"D1": "Caller",
-		"E1": "Called",
-		"F1": "Duration",
-		"G1": "Result",
-		"H1": "Time",
+		"D1": "Called",
+		"E1": "Result",
+		"F1": "Caller",
+		"G1": "Duration",
+		"H1": "Call Start Time",
+		"I1": "Hangup Time",
 	}
 	// 读取字典数据 CDR SIP响应代码类别类型
 	dictCDRSipCode := sysService.NewSysDictData.SelectDictDataByType("cdr_sip_code")
@@ -117,13 +118,22 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
 				}
 			}
 		}
-		// 取时间
-		timeStr := ""
+		// 呼叫时间
+		seizureTimeStr := ""
+		if v, ok := cdrJSON["seizureTime"]; ok && v != nil {
+			if seizureTime := parse.Number(v); seizureTime > 0 {
+				seizureTimeStr = date.ParseDateToStr(seizureTime, date.YYYY_MM_DDTHH_MM_SSZ)
+			} else {
+				seizureTimeStr = v.(string)
+			}
+		}
+		// 挂断时间
+		releaseTimeStr := ""
 		if v, ok := cdrJSON["releaseTime"]; ok && v != nil {
 			if releaseTime := parse.Number(v); releaseTime > 0 {
-				timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ)
+				releaseTimeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ)
 			} else {
-				timeStr = v.(string)
+				releaseTimeStr = v.(string)
 			}
 		}
 
@@ -131,11 +141,12 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
 			"A" + idx: row.ID,
 			"B" + idx: recordType,
 			"C" + idx: callTypeLable,
-			"D" + idx: caller,
-			"E" + idx: called,
-			"F" + idx: duration,
-			"G" + idx: callResult,
-			"H" + idx: timeStr,
+			"D" + idx: called,
+			"E" + idx: callResult,
+			"F" + idx: caller,
+			"G" + idx: duration,
+			"H" + idx: seizureTimeStr,
+			"I" + idx: releaseTimeStr,
 		})
 	}