提交代码

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -1300,7 +1300,7 @@ GROUP BY od.GoodsId,o.OrderId
                 }
                 if (!string.IsNullOrWhiteSpace(dmodel.EndDate))
                 {
-                    where += $" and  DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )< DATE_FORMAT('{dmodel.EndDate}','%Y-%m-%d' ) ";
+                    where += $" and  DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )<= DATE_FORMAT('{dmodel.EndDate}','%Y-%m-%d' ) ";
                 }
 
             }
@@ -1327,7 +1327,7 @@ LEFT JOIN rb_goods_order as A on a.OrderId=b.OrderId
 LEFT JOIN rb_supplier as f on f.ID=b.SupplierId
 LEFT JOIN rb_member_user as muser on muser.id=b.CompanyId 
 left join rb_goods_orderaftersale oa on b.ID= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5) {where}
-GROUP BY b.Id order by b.Id desc";
+GROUP BY b.Id order by b.Id asc";
 
             return GetPage<OrderStatistics_Query>(pageIndex, pageSize, out count, sql).ToList();
         }
@@ -1376,7 +1376,7 @@ GROUP BY b.Id order by b.Id desc";
                 }
                 if (!string.IsNullOrWhiteSpace(dmodel.EndDate))
                 {
-                    where += $" and  DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )< DATE_FORMAT('{dmodel.EndDate}','%Y-%m-%d' ) ";
+                    where += $" and  DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )<= DATE_FORMAT('{dmodel.EndDate}','%Y-%m-%d' ) ";
                 }
 
             }
@@ -1403,7 +1403,7 @@ LEFT JOIN rb_goods_order as A on a.OrderId=b.OrderId
 LEFT JOIN rb_supplier as f on f.ID=b.SupplierId
 LEFT JOIN rb_member_user as muser on muser.id=b.CompanyId 
 left join rb_goods_orderaftersale oa on b.ID= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5) {where}
-GROUP BY b.Id desc ";
+GROUP BY b.Id   by b.Id asc ";
 
             return Get<OrderStatistics_Query>(sql).ToList();
         }