dengbiao пре 3 месеци
родитељ
комит
cb4f0a3831
2 измењених фајлова са 23 додато и 1 уклоњено
  1. +22
    -0
      app/admin/hdl/enterprise_manage/hdl_central_kitchen_for_school.go
  2. +1
    -1
      app/db/db_meal_label.go

+ 22
- 0
app/admin/hdl/enterprise_manage/hdl_central_kitchen_for_school.go Прегледај датотеку

@@ -504,6 +504,8 @@ func SetCentralKitchenForSchoolWithSpecByMealLabel(c *gin.Context) {
now := time.Now()
mealLabelDb := db.MealLabelDb{}
mealLabelDb.Set(req.EnterpriseId)

var nowIds map[int]bool
for _, v := range req.MealLabelList {
if v.Id != 0 {
mealLabel, err := mealLabelDb.GetMealLabel(v.Id)
@@ -518,6 +520,7 @@ func SetCentralKitchenForSchoolWithSpecByMealLabel(c *gin.Context) {
e.OutErr(c, e.ERR_DB_ORM, err.Error())
return
}
nowIds[v.Id] = true
} else {
mealLabel := &model.MealLabel{
Name: v.Name,
@@ -536,6 +539,25 @@ func SetCentralKitchenForSchoolWithSpecByMealLabel(c *gin.Context) {
}
}

labels, err := mealLabelDb.FindMealLabel(req.GradeId, req.Kind)
if err != nil {
e.OutErr(c, e.ERR_DB_ORM, err.Error())
return
}
var needDelIds []int
for _, v := range *labels {
if !nowIds[v.Id] {
needDelIds = append(needDelIds, v.Id)
}
}
if len(needDelIds) > 0 {
_, err = mealLabelDb.MealLabelDelete(needDelIds)
if err != nil {
e.OutErr(c, e.ERR_DB_ORM, err.Error())
return
}
}

e.OutSuc(c, "success", nil)
return
}


+ 1
- 1
app/db/db_meal_label.go Прегледај датотеку

@@ -26,7 +26,7 @@ func (MealLabelDb *MealLabelDb) FindMealLabel(gradeId int, kind int32) (*[]model
return &m, nil
}

func (MealLabelDb *MealLabelDb) MealLabelDeleteBySession(id interface{}) (int64, error) {
func (MealLabelDb *MealLabelDb) MealLabelDelete(id interface{}) (int64, error) {
if reflect.TypeOf(id).Kind() == reflect.Slice {
return MealLabelDb.Db.In("id", id).Delete(model.MealLabel{})
} else {


Loading…
Откажи
Сачувај