提交

username@email.com

昨天 30ff46307c84650f94a971cb970631253fade1c1

 CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs

@@ -177,7 +177,7 @@
                Condition += " and  b.shipAddress = '" + shipAddress + "'";
           
            if (!string.IsNullOrEmpty(BuyerName))
                Condition += " and  c.BuyerName like '%" + BuyerName + "%'";
                Condition += " and  c.Keyid  = '" + BuyerName + "'";
            

            if (!string.IsNullOrEmpty(createTimeStart))
@@ -193,7 +193,7 @@
            {
                new Criterion("", Condition),

                new Criterion("orderBy"," MakeTime desc  ")
                new Criterion("orderBy"," MakeTime ")
            };
            query.Criteria = criterias;
            return _ICoreDeliverOrderDAL.SelectModelPage(query, pa);
@@ -213,7 +213,14 @@

            if (!string.IsNullOrEmpty(OrderState))
            {
                Condition += " and  a.OrderState = " + OrderState + " ";
                if (OrderState != "4")
                {
                    Condition += " and  a.OrderState = " + OrderState + " ";
                }
                else
                {
                    Condition += " and a.OrderState  in( 0,1 ) ";
                }
            }
            else
            {
@@ -238,14 +245,14 @@
                Condition += " and  b.shipAddress = '" + shipAddress + "'";

            if (!string.IsNullOrEmpty(BuyerName))
                Condition += " and  c.BuyerName like '%" + BuyerName + "%'";
                Condition += " and  c.Keyid  = '" + BuyerName + "'";


            if (!string.IsNullOrEmpty(createTimeStart))
                Condition += " and DATEDIFF(day,a.[MakeTime],'" + createTimeStart + "')<=0 ";
                Condition += " and DATEDIFF(day,a.[OverTime],'" + createTimeStart + "')<=0 ";

            if (!string.IsNullOrEmpty(createTimeEnd))
                Condition += " and DATEDIFF(day,a.[MakeTime],'" + createTimeEnd + "')>=0 ";
                Condition += " and DATEDIFF(day,a.[OverTime],'" + createTimeEnd + "')>=0 ";



@@ -254,7 +261,7 @@
            {
                new Criterion("", Condition),

                new Criterion("orderBy"," MakeTime desc  ")
                new Criterion("orderBy"," OverTime desc  ")
            };
            query.Criteria = criterias;
            return _ICoreDeliverOrderDAL.SelectModelPage(query, pa);