公共时间函数

models/data_manage/edb_terminal.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -36,6 +37,12 @@ type EdbTerminalItem struct {
 	CreateTime   string `description:"创建时间"`
 }
 
+func (e *EdbTerminalItem) AfterFind(db *gorm.DB) (err error) {
+	e.ModifyTime = utils.GormDateStrToDateTimeStr(e.ModifyTime)
+	e.CreateTime = utils.GormDateStrToDateTimeStr(e.CreateTime)
+	return
+}
+
 type EdbTerminalCode struct {
 	TerminalCode string `description:"终端编码，用于配置在机器上"`
 	Source       int    `description:"指标来源类型"`

models/out_link.go

@@ -121,6 +121,7 @@ func (ol *OutLink) GetPageItemsByCondition(startSize, pageSize int, condition st
 		total = int(totalNull.Int64)
 	}
 	sql += ` LIMIT ?,?`
-	err = o.Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	pars = append(pars, startSize, pageSize)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/target.go

@@ -272,7 +272,8 @@ func GetEdbinfoItemList(condition string, pars []interface{}, startSize, pageSiz
 			sql += condition
 		}
 		sql += ` ORDER BY a.create_date DESC LIMIT ?,? `
-		err = o.Raw(sql, mobile, pars, startSize, pageSize).Find(&items).Error
+		pars = append(pars, startSize, pageSize)
+		err = o.Raw(sql, utils.ForwardPars(pars, mobile)...).Find(&items).Error
 	} else {
 		sql = `SELECT DISTINCT a.*,b.classify_name FROM edbinfo AS a
                      LEFT JOIN edbdata_classify AS b on a.classify_id=b.classify_id
@@ -281,7 +282,8 @@ func GetEdbinfoItemList(condition string, pars []interface{}, startSize, pageSiz
 			sql += condition
 		}
 		sql += ` ORDER BY a.create_date DESC LIMIT ?,? `
-		err = o.Raw(sql, pars, startSize, pageSize).Find(&items).Error
+		pars = append(pars, startSize, pageSize)
+		err = o.Raw(sql, pars...).Find(&items).Error
 	}
 	return
 }
@@ -438,7 +440,7 @@ type EdbdataClassifyList struct {
 	ClassifyId   int
 	ClassifyName string
 	ParentId     int
-	Child        []*EdbdataClassify
+	Child        []*EdbdataClassify `gorm:"-"`
 	TradeCode    string
 	UniqueCode   string
 }

utils/common.go

@@ -2902,3 +2902,26 @@ func GormDateStrToDateStr(originalString string) (formatStr string) {
 
 	return
 }
+
+// GormDateStrToDateTimeStr
+// @Description: gorm日期字符串格式转正常显示的日期时间字符串
+// @param originalString
+// @return formatStr
+func GormDateStrToDateTimeStr(originalString string) (formatStr string) {
+	formatStr = originalString
+	if !strings.Contains(originalString, "T") {
+		return
+	}
+
+	// 解析原始字符串
+	t, err := time.Parse(FormatDateWallWithLoc, originalString)
+	if err != nil {
+		fmt.Println("Error parsing time:", err)
+		return
+	}
+
+	// 重新格式化时间
+	formatStr = t.Format(FormatDateTime)
+
+	return
+}