From d8f7c9dd9b0f1c1159e843bfd84f9396e4fdf983 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 6 Feb 2024 16:13:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20CDR=E4=BA=8B=E4=BB=B6=E6=9F=A5=E8=AF=A2R?=
 =?UTF-8?q?ecordType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_data/model/cdr_event.go   | 19 ++++++++++---------
 .../network_data/repository/cdr_event.impl.go |  4 ++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/modules/network_data/model/cdr_event.go b/src/modules/network_data/model/cdr_event.go
index 70f731be..96896c26 100644
--- a/src/modules/network_data/model/cdr_event.go
+++ b/src/modules/network_data/model/cdr_event.go
@@ -15,13 +15,14 @@ type CDREvent struct {
 
 // CDREventQuery CDR会话对象查询参数结构体
 type CDREventQuery struct {
-	NeType    string `json:"neType" form:"neType" binding:"required"`
-	NeID      string `json:"neId" form:"neId" binding:"required"`
-	RmUID     string `json:"rmUID" form:"rmUID"`
-	StartTime string `json:"startTime" form:"startTime"`
-	EndTime   string `json:"endTime" form:"endTime"`
-	SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"`
-	SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`
-	PageNum   int64  `json:"pageNum" form:"pageNum" binding:"required"`
-	PageSize  int64  `json:"pageSize" form:"pageSize" binding:"required"`
+	NeType     string `json:"neType" form:"neType" binding:"required"`
+	NeID       string `json:"neId" form:"neId" binding:"required"`
+	RmUID      string `json:"rmUID" form:"rmUID"`
+	RecordType string `json:"recordType" form:"recordType"`
+	StartTime  string `json:"startTime" form:"startTime"`
+	EndTime    string `json:"endTime" form:"endTime"`
+	SortField  string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"`
+	SortOrder  string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`
+	PageNum    int64  `json:"pageNum" form:"pageNum" binding:"required"`
+	PageSize   int64  `json:"pageSize" form:"pageSize" binding:"required"`
 }
diff --git a/src/modules/network_data/repository/cdr_event.impl.go b/src/modules/network_data/repository/cdr_event.impl.go
index 95ddbd8b..b8cf5df9 100644
--- a/src/modules/network_data/repository/cdr_event.impl.go
+++ b/src/modules/network_data/repository/cdr_event.impl.go
@@ -73,6 +73,10 @@ func (r *CDREventImpl) SelectPage(querys model.CDREventQuery) map[string]any {
 		endDate := date.ParseStrToDate(querys.EndTime, date.YYYY_MM_DD_HH_MM_SS)
 		params = append(params, endDate.Unix())
 	}
+	if querys.RecordType != "" {
+		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.recordType') = ?")
+		params = append(params, querys.RecordType)
+	}
 
 	// 构建查询条件语句
 	whereSql := ""