update

app/admin/svc/svc_data_statisstics.go

@@ -644,7 +644,7 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD
 				sess.And("central_kitchen_for_school_package_ord_for_reserve.enterprise_id =?", req.EnterpriseId)
 			}
 			if req.StartDate != "" {
-				sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ? or central_kitchen_for_school_package_ord_for_reserve.meal_time_end <= ?", req.StartDate, req.EndDate)
+				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 >= ?", req.StartDate, req.EndDate)
 			}
 			//if req.EndDate != "" {
 			//	sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ?", req.EndDate)
@@ -812,7 +812,7 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD
 				sess.And("central_kitchen_for_school_package_ord_for_reserve.enterprise_id =?", req.EnterpriseId)
 			}
 			if req.StartDate != "" {
-				sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ? or central_kitchen_for_school_package_ord_for_reserve.meal_time_end <= ?", req.StartDate, req.EndDate)
+				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 >= ?", req.StartDate, req.EndDate)
 			}
 			//if req.EndDate != "" {
 			//	sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ?", req.EndDate)
@@ -828,7 +828,6 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD
 				Join("LEFT", "class_with_user", "class_with_user.user_identity_id = user_identity.id").
 				Join("LEFT", "class", "class_with_user.class_id = class.id").
 				Join("LEFT", "grade", "class.grade_id = grade.id").
-				Asc("class.id").
 				FindAndCount(&m)
 			if err != nil {
 				logx.Error(err)
@@ -1431,7 +1430,7 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD
 				sess.And("central_kitchen_for_school_package_ord_for_reserve.enterprise_id =?", req.EnterpriseId)
 			}
 			if req.StartDate != "" {
-				sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ? or central_kitchen_for_school_package_ord_for_reserve.meal_time_end <= ?", req.StartDate, req.EndDate)
+				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 >= ?", req.StartDate, req.EndDate)
 			}
 			//if req.EndDate != "" {
 			//	sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start <= ?", req.EndDate)