|
@@ -5,6 +5,8 @@ import (
|
|
|
"eta_gn/eta_api/utils"
|
|
|
"fmt"
|
|
|
"time"
|
|
|
+
|
|
|
+ "gorm.io/gorm"
|
|
|
)
|
|
|
|
|
|
// Variety variety 品种表
|
|
@@ -135,6 +137,20 @@ type VarietyButton struct {
|
|
|
Analyse bool `description:"分析权限"`
|
|
|
}
|
|
|
|
|
|
+func (v *VarietyItem) AfterFind(db *gorm.DB) error {
|
|
|
+ tmpCreateTime, err := time.Parse(utils.FormatDateWallWithLoc, v.CreateTime)
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ tmpModifyTime, err := time.Parse(utils.FormatDateWallWithLoc, v.ModifyTime)
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ v.CreateTime = utils.TimeTransferString(utils.FormatDateTime, tmpCreateTime)
|
|
|
+ v.ModifyTime = utils.TimeTransferString(utils.FormatDateTime, tmpModifyTime)
|
|
|
+ return nil
|
|
|
+}
|
|
|
+
|
|
|
// GetListBySuperAdminPage 不区分是否有分析权限的获取分页数据
|
|
|
func (item Variety) GetListBySuperAdminPage(condition string, pars []interface{}, startSize, pageSize int) (total int, items []*VarietyItem, err error) {
|
|
|
baseSql := ` FROM ( SELECT a.variety_id,a.variety_name,a.last_update_sys_user_id,
|
|
@@ -159,7 +175,7 @@ a.last_update_sys_user_real_name,a.production_day,a.sys_user_id,a.sys_user_real_
|
|
|
listSql := `SELECT * ` + baseSql + ` ORDER BY modify_time DESC,variety_id DESC LIMIT ?,?`
|
|
|
pars = append(pars, startSize)
|
|
|
pars = append(pars, pageSize)
|
|
|
- err = global.DmSQL["data"].Raw(listSql, pars...).Scan(&items).Error
|
|
|
+ err = global.DmSQL["data"].Raw(listSql, pars...).Find(&items).Error
|
|
|
|
|
|
return
|
|
|
}
|