From 4451705e6755bcf8ec6e81c881df317c92dd2fb0 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 20 Feb 2025 10:19:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_element/repository/ne_license.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/network_element/repository/ne_license.go b/src/modules/network_element/repository/ne_license.go
index 5aad6b32..1d506fec 100644
--- a/src/modules/network_element/repository/ne_license.go
+++ b/src/modules/network_element/repository/ne_license.go
@@ -74,6 +74,10 @@ func (r *NeLicense) SelectPage(query map[string]any) map[string]any {
 		conditions = append(conditions, "expiry_date = ?")
 		params = append(params, strings.Trim(v.(string), " "))
 	}
+	if v, ok := query["serialNum"]; ok && v != "" {
+		conditions = append(conditions, "serial_num = ?")
+		params = append(params, strings.Trim(v.(string), " "))
+	}
 	if v, ok := query["createBy"]; ok && v != "" {
 		conditions = append(conditions, "create_by like concat(?, '%')")
 		params = append(params, strings.Trim(v.(string), " "))

From f61f546d554ccd4bb7a49d3f4a567c4093eec872 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 20 Feb 2025 10:19:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20SGWC=E5=AF=BC=E5=87=BA=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../network_data/service/cdr_event_sgwc.go    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/modules/network_data/service/cdr_event_sgwc.go b/src/modules/network_data/service/cdr_event_sgwc.go
index 316024ea..a0ecb6c7 100644
--- a/src/modules/network_data/service/cdr_event_sgwc.go
+++ b/src/modules/network_data/service/cdr_event_sgwc.go
@@ -58,8 +58,8 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st
 		"H1": "GPRS Downlink",
 		"I1": "Duration",
 		"J1": "Invocation Time",
-		"K1": "PGW Address Used",
-		"L1": "SGW Address",
+		"K1": "GGSN Address",
+		"L1": "SGSN Address",
 		"M1": "RAT Type",
 		"N1": "PDPPDN Type",
 		"O1": "PDPPDN Address",
@@ -69,6 +69,8 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st
 		"S1": "Record Cause For Rec Closing",
 		"T1": "Record Sequence Number",
 		"U1": "Local Record Sequence Number",
+		"V1": "Record Type",
+		"W1": "Record Opening Time",
 	}
 	// 从第二行开始的数据
 	dataCells := make([]map[string]any, 0)
@@ -101,11 +103,22 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st
 		if v, ok := cdrJSON["pGWAddressUsed"]; ok && v != nil {
 			pGWAddressUsed = fmt.Sprint(v)
 		}
+		if v, ok := cdrJSON["GGSNAddress"]; ok && v != nil {
+			pGWAddressUsed = fmt.Sprint(v)
+		}
 		// sGWAddress
 		sGWAddress := ""
 		if v, ok := cdrJSON["sGWAddress"]; ok && v != nil {
 			sGWAddress = fmt.Sprint(v)
 		}
+		if v, ok := cdrJSON["SGSNAddress"]; ok && v != nil {
+			sGWAddress = fmt.Sprint(v)
+		}
+		// recordType
+		recordType := ""
+		if v, ok := cdrJSON["recordType"]; ok && v != nil {
+			recordType = fmt.Sprint(v)
+		}
 		// rATType
 		rATType := ""
 		if v, ok := cdrJSON["rATType"]; ok && v != nil {
@@ -208,6 +221,8 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st
 			"S" + idx: causeForRecClosing,
 			"T" + idx: recordSequenceNumber,
 			"U" + idx: localRecordSequenceNumber,
+			"V" + idx: recordType,
+			"W" + idx: invocationTimestamp,
 		})
 	}