kobe6258 3 сар өмнө
parent
commit
88ddb968a3

+ 41 - 2
models/base_from_gpr_risk.go

@@ -24,14 +24,48 @@ type BaseFromGprRiskData struct {
 	ModifyTime             time.Time
 	DataTimestamp          int64
 }
+type BaseFromGprRiskDataOrm struct {
+	BaseFromGprRiskDataId  int `orm:"column(base_from_gpr_risk_data_id);pk"`
+	BaseFromGprRiskIndexId int
+	IndexCode              string
+	DataTime               time.Time
+	Value                  string
+	CreateTime             time.Time
+	ModifyTime             time.Time
+	DataTimestamp          int64
+}
 
+// [2025-zsh-时间类型修复-chenhan]
+func (ormItem *BaseFromGprRiskDataOrm) convertToBaseFromGprRiskData() *BaseFromGprRiskData {
+	return &BaseFromGprRiskData{
+		BaseFromGprRiskDataId:  ormItem.BaseFromGprRiskDataId,
+		BaseFromGprRiskIndexId: ormItem.BaseFromGprRiskIndexId,
+		IndexCode:              ormItem.IndexCode,
+		DataTime:               ormItem.DataTime.Format(utils.FormatDate),
+		DataTimestamp:          ormItem.DataTimestamp,
+		Value:                  ormItem.Value,
+		CreateTime:             ormItem.CreateTime,
+		ModifyTime:             ormItem.ModifyTime,
+	}
+}
+func convertToViewList(items []*BaseFromGprRiskDataOrm) (viewList []*BaseFromGprRiskData) {
+	for _, item := range items {
+		viewList = append(viewList, item.convertToBaseFromGprRiskData())
+	}
+	return
+}
 func GetBaseFromGprRiskDataByCondition(condition string, pars []interface{}) (list []*BaseFromGprRiskData, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_gpr_risk_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	var ormList []*BaseFromGprRiskDataOrm
+	_, err = o.Raw(sql, pars).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	list = convertToViewList(ormList)
 	return
 }
 
@@ -241,7 +275,12 @@ type BaseFromGprRiskIndexList struct {
 func (y *BaseFromGprRiskData) GetByIndexCode(indexCode string) (list []*BaseFromGprRiskData, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_gpr_risk_data WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	var ormList []*BaseFromGprRiskDataOrm
+	_, err = o.Raw(sql, indexCode).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	list = convertToViewList(ormList)
 	return
 }