Browse Source

fix;日期格式转换

Roc 2 weeks ago
parent
commit
1ad8227e6f
2 changed files with 12 additions and 5 deletions
  1. 1 5
      models/chart.go
  2. 11 0
      utils/common.go

+ 1 - 5
models/chart.go

@@ -278,11 +278,7 @@ type EdbDataList struct {
 }
 
 func (e *EdbDataList) AfterFind(db *gorm.DB) (err error) {
-	tmp, err := time.Parse(utils.FormatDateWallWithLoc, e.DataTime)
-	if err != nil {
-		return
-	}
-	e.DataTime = tmp.Format(utils.FormatDate)
+	e.DataTime = utils.GormDateStrToDateTimeStr(e.DataTime)
 	return
 }
 

+ 11 - 0
utils/common.go

@@ -1340,6 +1340,13 @@ func CompareFloatByOpStrings(op string, a, b float64) bool {
 // @param originalString
 // @return formatStr
 func GormDateStrToDateTimeStr(originalString string) (formatStr string) {
+	if originalString == `` {
+		return
+	}
+	if strings.Contains(originalString, "0001-01-01") {
+		return
+	}
+
 	formatStr = originalString
 	if !strings.Contains(originalString, "T") {
 		return
@@ -1351,6 +1358,10 @@ func GormDateStrToDateTimeStr(originalString string) (formatStr string) {
 		fmt.Println("Error parsing time:", err)
 		return
 	}
+	if t.IsZero() {
+		formatStr = ""
+		return
+	}
 
 	// 重新格式化时间
 	formatStr = t.Format(FormatDateTime)