fix：Ppt排序

services/ppt/ppt_english_group.go

@@ -77,6 +77,8 @@ func AddGroupPptEnglishMapping(pptId int64, groupId int64, adminId int, adminRea
 		AdminId:       adminId,
 		AdminRealName: adminRealName,
 		PptSort:       newSort,
+		CreateTime:    time.Now(),
+		ModifyTime:    time.Now(),
 	}
 
 	newId, err = ppt_english.AddPptGroupMapping(bindInfo)
@@ -575,19 +577,19 @@ func MoveGroupPptEnglish(groupId, groupPptId, prevGroupPptId, nextGroupPptId int
 	if prevGroupPpt != nil && prevGroupPpt.PptId > 0 && nextGroupPpt != nil && nextGroupPpt.PptId > 0 { // 两个之间
 		pptSort, _ = decimal.NewFromFloat(prevGroupPpt.PptSort).Add(decimal.NewFromFloat(nextGroupPpt.PptSort)).Div(decimal.NewFromInt(2)).Float64()
 	} else if prevGroupPpt != nil && prevGroupPpt.PptId > 0 {
-		minSort, tmpErr := ppt_english.GetMinSortByEnglishGroupId(prevGroupPpt.GroupId)
+		maxSort, tmpErr := ppt_english.GetMaxSortByEnglishGroupId(prevGroupPpt.GroupId)
 		if tmpErr != nil {
 			err = errors.New("获取最小排序失败:" + tmpErr.Error())
 			return
 		}
-		pptSort, _ = decimal.NewFromFloat(minSort).Add(decimal.NewFromInt(1)).Float64()
+		pptSort, _ = decimal.NewFromFloat(maxSort).Add(decimal.NewFromInt(1)).Float64()
 	} else if nextGroupPpt != nil && nextGroupPpt.PptId > 0 {
-		maxSort, tmpErr := ppt_english.GetMaxSortByEnglishGroupId(prevGroupPpt.GroupId)
+		minSort, tmpErr := ppt_english.GetMinSortByEnglishGroupId(prevGroupPpt.GroupId)
 		if tmpErr != nil {
 			err = errors.New("获取最小排序失败:" + tmpErr.Error())
 			return
 		}
-		pptSort, _ = decimal.NewFromFloat(maxSort).Sub(decimal.NewFromInt(1)).Float64()
+		pptSort, _ = decimal.NewFromFloat(minSort).Sub(decimal.NewFromInt(1)).Float64()
 	}
 
 	groupPpt.PptSort = pptSort

services/ppt/ppt_group.go

@@ -828,19 +828,19 @@ func MoveGroupPpt(groupId, groupPptId, prevGroupPptId, nextGroupPptId int64, adm
 	if prevGroupPpt != nil && prevGroupPpt.PptId > 0 && nextGroupPpt != nil && nextGroupPpt.PptId > 0 { // 两个之间
 		pptSort, _ = decimal.NewFromFloat(prevGroupPpt.PptSort).Add(decimal.NewFromFloat(nextGroupPpt.PptSort)).Div(decimal.NewFromInt(2)).Float64()
 	} else if prevGroupPpt != nil && prevGroupPpt.PptId > 0 {
-		minSort, tmpErr := models.GetMinSortByGroupId(prevGroupPpt.GroupId)
+		maxSort, tmpErr := models.GetMaxSortByGroupId(prevGroupPpt.GroupId)
 		if tmpErr != nil {
 			err = errors.New("获取最小排序失败:" + tmpErr.Error())
 			return
 		}
-		pptSort, _ = decimal.NewFromFloat(minSort).Add(decimal.NewFromInt(1)).Float64()
+		pptSort, _ = decimal.NewFromFloat(maxSort).Add(decimal.NewFromInt(1)).Float64()
 	} else if nextGroupPpt != nil && nextGroupPpt.PptId > 0 {
-		maxSort, tmpErr := models.GetMaxSortByGroupId(prevGroupPpt.GroupId)
+		minSort, tmpErr := models.GetMinSortByGroupId(prevGroupPpt.GroupId)
 		if tmpErr != nil {
 			err = errors.New("获取最小排序失败:" + tmpErr.Error())
 			return
 		}
-		pptSort, _ = decimal.NewFromFloat(maxSort).Sub(decimal.NewFromInt(1)).Float64()
+		pptSort, _ = decimal.NewFromFloat(minSort).Sub(decimal.NewFromInt(1)).Float64()
 	}
 
 	groupPpt.PptSort = pptSort