|
|
@ -4,7 +4,7 @@ import ( |
|
|
|
"LAPP_GAAS_GFrame_BACKEND/db" |
|
|
|
"LAPP_GAAS_GFrame_BACKEND/utils" |
|
|
|
"errors" |
|
|
|
|
|
|
|
"strconv" |
|
|
|
"xorm.io/core" |
|
|
|
) |
|
|
|
|
|
|
@ -19,6 +19,11 @@ type Stdeftab struct { |
|
|
|
Credatuz string `xorm:"comment('创建时间') VARCHAR(14)" json:"stdeftab-credatuz"` |
|
|
|
} |
|
|
|
|
|
|
|
type StdeftabTemp struct { |
|
|
|
*Stdeftab |
|
|
|
Stdeftyp int `json:"stdeftab-stdeftyp"` |
|
|
|
} |
|
|
|
|
|
|
|
func (t *Stdeftab) TableName() string { |
|
|
|
return "stdeftab" |
|
|
|
} |
|
|
@ -98,17 +103,29 @@ func (t *Stdeftab) GetPage(pageSize int, pageIndex int) ([]Stdeftab, int, error) |
|
|
|
} |
|
|
|
|
|
|
|
//查询当前Stdeftabs集合
|
|
|
|
func (t *Stdeftab) SelectArr() ([]Stdeftab, error) { |
|
|
|
//TODO 添加一张表 做类型判断
|
|
|
|
func (t *Stdeftab) SelectArr() ([]interface{}, error) { |
|
|
|
e := db.Eloquent.Master() |
|
|
|
var data []Stdeftab |
|
|
|
err := e.Where("finr = ? and statid =?", t.Finr, t.Statid).Find(&data) |
|
|
|
if err != nil { |
|
|
|
return data, err |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
result := make([]interface{}, 0) |
|
|
|
//TODO 该处为临时处理
|
|
|
|
for k, _ := range data { |
|
|
|
data[k].Clipped() |
|
|
|
if t.Statid == "log-vendor-status" { |
|
|
|
var stdeftabTemp StdeftabTemp |
|
|
|
stdeftabTemp.Stdeftab = &data[k] |
|
|
|
v, _ := strconv.Atoi(data[k].Stdeftyp) |
|
|
|
stdeftabTemp.Stdeftyp = v |
|
|
|
result = append(result, stdeftabTemp) |
|
|
|
} else { |
|
|
|
result = append(result, data[k]) |
|
|
|
} |
|
|
|
} |
|
|
|
return data, nil |
|
|
|
return result, nil |
|
|
|
} |
|
|
|
|
|
|
|
//查询当前Stdeftabs集合
|
|
|
|