1 changed files with 18 additions and 18 deletions
Unified View
Diff Options
+ 18
- 18
app/admin/svc/enterprise_manage/svc_central_kitchen_for_school.go
View File
| @@ -1177,17 +1177,17 @@ func CentralKitchenForSchoolReserveList(c *gin.Context, req md.CentralKitchenFor | |||||
| } | } | ||||
| } | } | ||||
| //var centralKitchenForSchoolUserWithDayIds []string | |||||
| //if req.StartDate != "" && req.EndDate != "" { | |||||
| // var m []model.CentralKitchenForSchoolUserWithDay | |||||
| // if err1 := db.Db.Where("state != ?", enum2.CentralKitchenForSchoolUserWithDayStateForCancel). | |||||
| // And("date >= ? And date <= ?", req.StartDate, req.EndDate).Asc("date").Find(&m); err != nil { | |||||
| // return nil, 0, err1 | |||||
| // } | |||||
| // for _, v := range m { | |||||
| // centralKitchenForSchoolUserWithDayIds = append(centralKitchenForSchoolUserWithDayIds, v.OrdNo) | |||||
| // } | |||||
| //} | |||||
| var centralKitchenForSchoolUserWithDayIds []string | |||||
| if req.StartDate != "" && req.EndDate != "" { | |||||
| var m []model.CentralKitchenForSchoolUserWithDay | |||||
| if err1 := db.Db.Where("state != ?", enum2.CentralKitchenForSchoolUserWithDayStateForCancel). | |||||
| And("date >= ? And date <= ?", req.StartDate, req.EndDate).Asc("date").Find(&m); err != nil { | |||||
| return nil, 0, err1 | |||||
| } | |||||
| for _, v := range m { | |||||
| centralKitchenForSchoolUserWithDayIds = append(centralKitchenForSchoolUserWithDayIds, v.OrdNo) | |||||
| } | |||||
| } | |||||
| //var months []time.Month | //var months []time.Month | ||||
| //if req.StartDate != "" { | //if req.StartDate != "" { | ||||
| @@ -1237,10 +1237,10 @@ func CentralKitchenForSchoolReserveList(c *gin.Context, req md.CentralKitchenFor | |||||
| if req.Name != "" { | if req.Name != "" { | ||||
| sess.And("user_identity.name like ?", "%"+req.Name+"%") | sess.And("user_identity.name like ?", "%"+req.Name+"%") | ||||
| } | } | ||||
| if req.StartDate != "" { | |||||
| sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ?", req.StartDate). | |||||
| And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ?", req.StartDate) | |||||
| } | |||||
| //if req.StartDate != "" { | |||||
| // sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ?", req.StartDate). | |||||
| // And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ?", req.StartDate) | |||||
| //} | |||||
| if req.Phone != "" { | if req.Phone != "" { | ||||
| if req.Phone != "" { | if req.Phone != "" { | ||||
| userDb := db.UserDb{} | userDb := db.UserDb{} | ||||
| @@ -1263,9 +1263,9 @@ func CentralKitchenForSchoolReserveList(c *gin.Context, req md.CentralKitchenFor | |||||
| if len(classWithUserIdentityIdsTwo) > 0 { | if len(classWithUserIdentityIdsTwo) > 0 { | ||||
| sess.In("user_identity.id", classWithUserIdentityIdsTwo) | sess.In("user_identity.id", classWithUserIdentityIdsTwo) | ||||
| } | } | ||||
| //if len(centralKitchenForSchoolUserWithDayIds) > 0 { | |||||
| // sess.In("central_kitchen_for_school_package_ord.out_trade_no", centralKitchenForSchoolUserWithDayIds) | |||||
| //} | |||||
| if len(centralKitchenForSchoolUserWithDayIds) > 0 { | |||||
| sess.In("central_kitchen_for_school_package_ord_for_reserve.out_trade_no", centralKitchenForSchoolUserWithDayIds) | |||||
| } | |||||
| //if len(months) > 0 { | //if len(months) > 0 { | ||||
| // sess.In("central_kitchen_for_school_package_ord_for_reserve.reserve_month", months) | // sess.In("central_kitchen_for_school_package_ord_for_reserve.reserve_month", months) | ||||
| //} | //} | ||||