DengBiao
1 year ago
1 changed files with 3 additions and 3 deletions
Unified View
Diff Options
+ 3
- 3
app/admin/svc/svc_data_statisstics.go
View File
| @@ -1678,7 +1678,7 @@ func CentralKitchenForSchoolDataStatisticsContrast(req md.CentralKitchenForSchoo | |||||
| sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ?", startDate.Format("2006-01-02")) | sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ?", startDate.Format("2006-01-02")) | ||||
| } | } | ||||
| if req.Date1[1] != "" { | if req.Date1[1] != "" { | ||||
| endDate, _ := time.ParseInLocation("2006-01-02 15:04:05", req.Date1[0], time.Local) | |||||
| endDate, _ := time.ParseInLocation("2006-01-02 15:04:05", req.Date1[1], time.Local) | |||||
| sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ?", endDate.Format("2006-01-02")) | sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ?", endDate.Format("2006-01-02")) | ||||
| } | } | ||||
| if len(req.MealKindList) > 0 { | if len(req.MealKindList) > 0 { | ||||
| @@ -1709,11 +1709,11 @@ func CentralKitchenForSchoolDataStatisticsContrast(req md.CentralKitchenForSchoo | |||||
| sess1.And("central_kitchen_for_school_package_ord_for_reserve.enterprise_id =?", req.EnterpriseId) | sess1.And("central_kitchen_for_school_package_ord_for_reserve.enterprise_id =?", req.EnterpriseId) | ||||
| } | } | ||||
| if req.Date2[0] != "" { | if req.Date2[0] != "" { | ||||
| startDate, _ := time.ParseInLocation("2006-01-02 15:04:05", req.Date1[0], time.Local) | |||||
| startDate, _ := time.ParseInLocation("2006-01-02 15:04:05", req.Date2[0], time.Local) | |||||
| sess1.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ?", startDate.Format("2006-01-02")) | sess1.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ?", startDate.Format("2006-01-02")) | ||||
| } | } | ||||
| if req.Date2[1] != "" { | if req.Date2[1] != "" { | ||||
| endDate, _ := time.ParseInLocation("2006-01-02 15:04:05", req.Date1[0], time.Local) | |||||
| endDate, _ := time.ParseInLocation("2006-01-02 15:04:05", req.Date2[1], time.Local) | |||||
| sess1.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ?", endDate.Format("2006-01-02")) | sess1.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ?", endDate.Format("2006-01-02")) | ||||
| } | } | ||||
| if len(req.MealKindList) > 0 { | if len(req.MealKindList) > 0 { | ||||