|
|
@@ -646,7 +646,7 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD |
|
|
|
if req.StartDate != "" { |
|
|
|
sDate, _ := time.ParseInLocation("2006-01-02 15:04:05", req.StartDate, time.Local) |
|
|
|
eDate, _ := time.ParseInLocation("2006-01-02 15:04:05", req.EndDate, time.Local) |
|
|
|
sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ? and central_kitchen_for_school_package_ord_for_reserve.meal_time_end <= ?", sDate.Format("2006-01-02"), eDate.Format("2006-01-02")) |
|
|
|
sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ? and central_kitchen_for_school_package_ord_for_reserve.meal_time_end >= ?", sDate.Format("2006-01-02"), eDate.Format("2006-01-02")) |
|
|
|
} |
|
|
|
//if req.EndDate != "" { |
|
|
|
// sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ?", req.EndDate) |
|
|
@@ -838,7 +838,7 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD |
|
|
|
if req.StartDate != "" { |
|
|
|
sDate, _ := time.ParseInLocation("2006-01-02 15:04:05", req.StartDate, time.Local) |
|
|
|
eDate, _ := time.ParseInLocation("2006-01-02 15:04:05", req.EndDate, time.Local) |
|
|
|
sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ? and central_kitchen_for_school_package_ord_for_reserve.meal_time_end <= ?", sDate.Format("2006-01-02"), eDate.Format("2006-01-02")) |
|
|
|
sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ? and central_kitchen_for_school_package_ord_for_reserve.meal_time_end >= ?", sDate.Format("2006-01-02"), eDate.Format("2006-01-02")) |
|
|
|
} |
|
|
|
//if req.EndDate != "" { |
|
|
|
// sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ?", req.EndDate) |
|
|
@@ -1465,7 +1465,7 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD |
|
|
|
if req.StartDate != "" { |
|
|
|
sDate, _ := time.ParseInLocation("2006-01-02 15:04:05", req.StartDate, time.Local) |
|
|
|
eDate, _ := time.ParseInLocation("2006-01-02 15:04:05", req.EndDate, time.Local) |
|
|
|
sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ? and central_kitchen_for_school_package_ord_for_reserve.meal_time_end <= ?", sDate.Format("2006-01-02"), eDate.Format("2006-01-02")) |
|
|
|
sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ? and central_kitchen_for_school_package_ord_for_reserve.meal_time_end >= ?", sDate.Format("2006-01-02"), eDate.Format("2006-01-02")) |
|
|
|
} |
|
|
|
//if req.EndDate != "" { |
|
|
|
// sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ?", req.EndDate) |
|
|
|