在“编号”和“片区”直接增加一列“送货时间”，该送货时间显示进行了“送货安排”操作的学校的时间，没有安排送货的学校就是空白 完成

username@email.com

12 小时以前 d3205f4627ceb7af1344ce77715def28fee5545b

 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);
@@ -207,17 +207,33 @@
        /// <param name="pa"></param>
        /// <returns></returns>
        public IEnumerable<CoreDeliverOrder> SelectModelPageLishi(Pagination pa, Guid FirmId, int? DriverId, string shipAddress,
            string BuyerName, string createTimeStart, string createTimeEnd,string OrderState)
            string BuyerName, string createTimeStart, string createTimeEnd,string OrderState,string shifou)
        {
            string Condition = " and b.FirmId ='" + FirmId + "'  ";

            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
            {
                Condition += " and a.OrderState  in( 0,1,2 ) ";
                if (!string.IsNullOrEmpty(shifou))
                {
                    Condition += " and a.OrderState  in( 0,1 ) ";
                }
                else
                {
                    Condition += " and a.OrderState  in( 0,1,2 ) ";
                }

                
            }
            if (DriverId.HasValue)
            {
@@ -229,7 +245,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))