fix；日期格式转换

models/chart.go

@@ -111,10 +111,10 @@ func (c *ChartInfo) TableName() string {
 }
 
 func (e *ChartInfo) AfterFind(db *gorm.DB) (err error) {
-	e.StartDate = utils.GormDateStrToDateTimeStr(e.StartDate)
-	e.EndDate = utils.GormDateStrToDateTimeStr(e.EndDate)
-	e.SeasonStartDate = utils.GormDateStrToDateTimeStr(e.SeasonStartDate)
-	e.SeasonEndDate = utils.GormDateStrToDateTimeStr(e.SeasonEndDate)
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateStr(e.EndDate)
+	e.SeasonStartDate = utils.GormDateStrToDateStr(e.SeasonStartDate)
+	e.SeasonEndDate = utils.GormDateStrToDateStr(e.SeasonEndDate)
 
 	return
 }
@@ -245,10 +245,10 @@ type ChartEdbInfoMapping struct {
 }
 
 func (e *ChartEdbInfoMapping) AfterFind(db *gorm.DB) (err error) {
-	e.StartDate = utils.GormDateStrToDateTimeStr(e.StartDate)
-	e.EndDate = utils.GormDateStrToDateTimeStr(e.EndDate)
-	e.LatestDate = utils.GormDateStrToDateTimeStr(e.LatestDate)
-	e.MoveLatestDate = utils.GormDateStrToDateTimeStr(e.MoveLatestDate)
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateStr(e.EndDate)
+	e.LatestDate = utils.GormDateStrToDateStr(e.LatestDate)
+	e.MoveLatestDate = utils.GormDateStrToDateStr(e.MoveLatestDate)
 
 	return
 }
@@ -296,7 +296,7 @@ type EdbDataList struct {
 }
 
 func (e *EdbDataList) AfterFind(db *gorm.DB) (err error) {
-	e.DataTime = utils.GormDateStrToDateTimeStr(e.DataTime)
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
 	return
 }
 

models/data_manage/chart_info.go

@@ -90,9 +90,9 @@ type ChartEdbInfoMapping struct {
 }
 
 func (e *ChartEdbInfoMapping) AfterFind(db *gorm.DB) (err error) {
-	e.StartDate = utils.GormDateStrToDateTimeStr(e.StartDate)
-	e.EndDate = utils.GormDateStrToDateTimeStr(e.EndDate)
-	e.LatestDate = utils.GormDateStrToDateTimeStr(e.LatestDate)
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateStr(e.EndDate)
+	e.LatestDate = utils.GormDateStrToDateStr(e.LatestDate)
 
 	return
 }

utils/common.go

@@ -1374,6 +1374,13 @@ func GormDateStrToDateTimeStr(originalString string) (formatStr string) {
 // @param originalString
 // @return formatStr
 func GormDateStrToDateStr(originalString string) (formatStr string) {
+	if originalString == `` {
+		return
+	}
+	if strings.Contains(originalString, "0001-01-01") {
+		return
+	}
+
 	formatStr = originalString
 	if !strings.Contains(originalString, "T") {
 		return
@@ -1385,7 +1392,10 @@ func GormDateStrToDateStr(originalString string) (formatStr string) {
 		fmt.Println("Error parsing time:", err)
 		return
 	}
-
+	if t.IsZero() {
+		formatStr = ""
+		return
+	}
 	// 重新格式化时间
 	formatStr = t.Format(FormatDate)