赛季调整

 package models
 package models
 
 
 import (
 import (
-	"fmt"
+	"oppmg/common/log"
 	"time"
 	"time"
 
 
 	"github.com/astaxie/beego/orm"
 	"github.com/astaxie/beego/orm"
@@ -28,9 +28,8 @@ func init() {
 
 
 // AddRankItem insert a new NewRankItem into database and returns
 // AddRankItem insert a new NewRankItem into database and returns
 // last inserted Id on success.
 // last inserted Id on success.
-func AddRankItem(m *RankItem) (id int64, err error) {
-	o := orm.NewOrm()
-	id, err = o.Insert(m)
+func AddRankItem(m []RankItem, om orm.Ormer) (successSum int64, err error) {
+	successSum, err = om.InsertMulti(10, &m)
 	return
 	return
 }
 }
 
 
@@ -45,21 +44,6 @@ func GetRankItemById(id int64) (v *RankItem, err error) {
 	return nil, err
 	return nil, err
 }
 }
 
 
-// UpdateRankItem updates RankItem by Id and returns error if
-// the record to be updated doesn't exist
-func UpdateRankItemById(m *RankItem) (err error) {
-	o := orm.NewOrm()
-	v := RankItem{Id: m.Id}
-	// ascertain id exists in the database
-	if err = o.Read(&v); err == nil {
-		var num int64
-		if num, err = o.Update(m); err == nil {
-			fmt.Println("Number of records updated in database:", num)
-		}
-	}
-	return
-}
-
 func GetRankItemByCompanyid(companyid int64, rankTypeId int64) ([]RankItem, error) {
 func GetRankItemByCompanyid(companyid int64, rankTypeId int64) ([]RankItem, error) {
 	var (
 	var (
 		data []RankItem
 		data []RankItem
@@ -75,3 +59,22 @@ func GetRankItemByCompanyid(companyid int64, rankTypeId int64) ([]RankItem, erro
 	}
 	}
 	return data, err
 	return data, err
 }
 }
+
+func DeleteRanKItemByIds(ids []int64, om orm.Ormer) error {
+	_, err := om.QueryTable(&RankItem{}).Filter("id__in", ids).Delete()
+	return err
+}
+
+// UpdateRankItem updates RankItem by Id and returns error if
+// the record to be updated doesn't exist
+func UpdateRankItemById(m *RankItem, cols []string, om orm.Ormer) (err error) {
+	if len(cols) > 0 {
+		cols = append(cols, "UpdateAt")
+	}
+	m.UpdateAt = time.Now()
+	var num int64
+	if num, err = om.Update(m, cols...); err == nil {
+		log.Info("Number of records updated in database:", num)
+	}
+	return
+}

@@ -502,7 +502,7 @@ func GetRankItemEdit(companyid int64, rankTypeid int64, itemKey []string) error
 		}
 		}
 	}
 	}
 	var (
 	var (
-		delIds      []int64
+		delItemIds  []int64
 		addItems    []models.RankItem
 		addItems    []models.RankItem
 		updateItems []models.RankItem
 		updateItems []models.RankItem
 	)
 	)
@@ -518,7 +518,7 @@ func GetRankItemEdit(companyid int64, rankTypeid int64, itemKey []string) error
 			}
 			}
 		}
 		}
 		if !has {
 		if !has {
-			delIds = append(delIds, rankitemData[i].Id)
+			delItemIds = append(delItemIds, rankitemData[i].Id)
 		}
 		}
 	}
 	}
 	for i := range newItems {
 	for i := range newItems {
@@ -535,6 +535,29 @@ func GetRankItemEdit(companyid int64, rankTypeid int64, itemKey []string) error
 	}
 	}
 	o := orm.NewOrm()
 	o := orm.NewOrm()
 	o.Begin()
 	o.Begin()
+	//添加
+	_, err = models.AddRankItem(addItems, o)
+	if err != nil {
+		o.Rollback()
+		log.Error("添加rank_item记录失败:%s", err)
+		return protocol.NewErrWithMessage("1")
+	}
+	//更新
+	for i := range updateItems {
+		err = models.UpdateRankItemById(&updateItems[i], []string{"SortNum"}, o)
+		if err != nil {
+			o.Rollback()
+			log.Error("更新rank_item记录失败:%s", err)
+			return protocol.NewErrWithMessage("1")
+		}
+	}
+	//删除
+	err = models.DeleteRanKItemByIds(delItemIds, o)
+	if err != nil {
+		o.Rollback()
+		log.Error("删除rank_item记录失败:%s", err)
+		return protocol.NewErrWithMessage("1")
+	}
 	o.Commit()
 	o.Commit()
 	return nil
 	return nil
 }
 }