From adec327bc3291b27c3013c122a90ebffb12eebb3 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Mon, 9 Sep 2024 16:32:17 +0800
Subject: [PATCH] fix: custom indicator report issue

---
 features/pm/kpi_c_report/controller.go |  2 +-
 features/pm/kpi_c_report/model.go      | 22 ++++++++++------------
 features/pm/performance.go             |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/features/pm/kpi_c_report/controller.go b/features/pm/kpi_c_report/controller.go
index 8f56fda4..60bd8c72 100644
--- a/features/pm/kpi_c_report/controller.go
+++ b/features/pm/kpi_c_report/controller.go
@@ -149,7 +149,7 @@ func (k *KpiCReport) GetReport2FE(c *gin.Context) {
 			"neName":      *r.NeName,
 			"rmUID":       *r.RmUID,
 			"startIndex":  r.Index,
-			"timeGroup":   r.Date[:10] + " " + *r.StartTime,
+			"timeGroup":   r.Date[:10] + " " + *r.EndTime,
 			"createdAt":   r.CreatedAt,
 			"granularity": r.Granularity,
 		}
diff --git a/features/pm/kpi_c_report/model.go b/features/pm/kpi_c_report/model.go
index 627040ad..b96b7f01 100644
--- a/features/pm/kpi_c_report/model.go
+++ b/features/pm/kpi_c_report/model.go
@@ -30,17 +30,16 @@ type KpiCReport struct {
 }
 
 type KpiCReportQuery 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"`
-	TenantName string `json:"tenantName" form:"tenantName"`
-	UserName   string `json:"userName" form:"userName"`
-	SortField  string `json:"sortField" form:"sortField" binding:"omitempty,oneof=created_at"` // 排序字段，填写结果字段
-	SortOrder  string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`   // 排序升降序，asc desc
-	PageNum    int    `json:"pageNum" form:"pageNum"`
-	PageSize   int    `json:"pageSize" form:"pageSize"`
+	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"`
+	UserName  string `json:"userName" form:"userName"`
+	SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=created_at"` // 排序字段，填写结果字段
+	SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`   // 排序升降序，asc desc
+	PageNum   int    `json:"pageNum" form:"pageNum"`
+	PageSize  int    `json:"pageSize" form:"pageSize"`
 }
 
 type KpiCReport2FE struct {
@@ -51,7 +50,6 @@ type KpiCReport2FE struct {
 	TimeGroup   string `json:"timeGroup"`
 	StartIndex  int16  `json:"startIndex" gorm:"column:index"`
 	Granularity int8   `json:"granularity" gorm:"column:granularity"`
-	TenantID    string `json:"tenantID" gorm:"column:tenant_id"`
 }
 
 func TableName() string {
diff --git a/features/pm/performance.go b/features/pm/performance.go
index 2371ed3b..ad99cc26 100644
--- a/features/pm/performance.go
+++ b/features/pm/performance.go
@@ -297,7 +297,7 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		"neName":      kpiData.NEName,
 		"rmUID":       kpiData.RmUid,
 		"startIndex":  kpiData.Index,
-		"timeGroup":   kpiData.Date[:10] + " " + kpiData.StartTime,
+		"timeGroup":   kpiData.Date[:10] + " " + kpiData.EndTime,
 		"createdAt":   kpiData.CreatedAt,
 		"granularity": kpiData.Granularity,
 	}