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

src/modules/network_data/service/cdr_event_ims.go

@@ -58,11 +58,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")
@@ -122,13 +123,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)
 			}
 		}
 
@@ -136,11 +146,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,
 		})
 	}