区间工价，历史工价

username@email.com

2024-10-08 d9a1f2e7ffce03e84a9548d7c99c81e1d34ac474

 cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs

@@ -205,6 +205,7 @@
                order.ContactPhone = orderDto.ContactPhone;
                order.WorkerType = orderDto.WorkerType;
                order.WorkPrice = orderDto.WorkPrice;
                order.WorkPriceMax = orderDto.WorkPriceMax;
                order.OrderStatus = 0;
                order.IsEn = true;
                order.UpDataBy = NickName;
@@ -259,6 +260,7 @@

            var orderBiddingRes = new BaseRepository<OrderBidding>();
            var orderRes = new BaseRepository<Order>();
            var orderBiddingWorkPriceRes = new BaseRepository<OrderBiddingWorkPrice>();

            var orderBidding = await orderBiddingRes.GetByIdAsync(queRenDto.OrderBiddingId);
            if (orderBidding == null || orderBidding.IsEn != true || orderBidding.IsDeleted == true )
@@ -300,9 +302,82 @@
                res = await orderRes.UpdateAsync(order);
            }


            //add   存储工人的工价
            var orderBiddingWorkPrice = new OrderBiddingWorkPrice();
            orderBiddingWorkPrice.OrderBiddingId = queRenDto.OrderBiddingId;
            orderBiddingWorkPrice.WorkPrice = order.WorkPrice;
            orderBiddingWorkPrice.EffectTime = DateTime.Now.Date;


            orderBiddingWorkPrice.UpDataBy = NickName;
            orderBiddingWorkPrice.UpDataTime = DateTime.Now;
            orderBiddingWorkPrice.CreateBy = NickName;
            orderBiddingWorkPrice.CreateTime = DateTime.Now;
            res = await orderBiddingWorkPriceRes.InsertAsync(orderBiddingWorkPrice);

            return res;
        }





        /// <summary>
        /// 公司修改工人工价
        /// </summary>
        /// <returns></returns>
        [Authorize]
        [HttpPost]
        public async Task<bool> saveWorkPrice(WorkPriceDto workPriceDto)
        {

            var UserID = App.User?.FindFirstValue("UserID");
            int userid = 0;
            string NickName = App.User?.FindFirstValue("NickName");
            if (!string.IsNullOrEmpty(UserID))
            {
                userid = int.Parse(UserID);
            }

            var orderBiddingRes = new BaseRepository<OrderBidding>();
            var orderRes = new BaseRepository<Order>();
            var orderBiddingWorkPriceRes = new BaseRepository<OrderBiddingWorkPrice>();

            var orderBidding = await orderBiddingRes.GetByIdAsync(workPriceDto.OrderBiddingId);
            if (orderBidding == null || orderBidding.IsEn != true || orderBidding.IsDeleted == true)
            {
                throw Oops.Oh("该投递已经无效！");
            }
            if (orderBidding.IsSelected != true)
            {
                throw Oops.Oh("该投递没有确认，不能修改工价！");
            }

            

            


            bool res;

           

            //add   存储工人的工价
            var orderBiddingWorkPrice = new OrderBiddingWorkPrice();
            orderBiddingWorkPrice.OrderBiddingId = workPriceDto.OrderBiddingId;
            orderBiddingWorkPrice.WorkPrice = workPriceDto.WorkPrice;
            orderBiddingWorkPrice.EffectTime = DateTime.Now.Date.AddDays(1);


            orderBiddingWorkPrice.UpDataBy = NickName;
            orderBiddingWorkPrice.UpDataTime = DateTime.Now;
            orderBiddingWorkPrice.CreateBy = NickName;
            orderBiddingWorkPrice.CreateTime = DateTime.Now;
            res = await orderBiddingWorkPriceRes.InsertAsync(orderBiddingWorkPrice);

            return res;
        }


        /// <summary>
@@ -455,7 +530,7 @@

            RefAsync<int> total = 0;


            var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
            var orderBiddingDetailCheckRepository = new BaseRepository<OrderBiddingDetailCheck>();
            var userWorkerRes = new BaseRepository<UserWorker>();
            var data = await orderRepository.Context.Queryable<Order, OrderBidding, OrderBiddingDetail, UserWorker>((a, b, c, d) =>
@@ -486,6 +561,7 @@
                          WorkCount = c.WorkCount,
                          WorkerUserId = b.WorkerUserId,
                          WorkerUserName = d.name,
                          OrderBiddingId = c.OrderBiddingId,
                      })
                      
                    .ToPageListAsync(page.PageIndex, page.PageSize, total);
@@ -539,6 +615,14 @@
                    //如果当天还没有填写申请，则计算工作时间和工资
                    if (dakaDto.IsShenPi == 0)
                    {
                        //当前有效的工价
                       var orderBiddingWorkPrices = await orderBiddingWorkPriceRepository.GetListAsync(x=>x.OrderBiddingId == dakaDto.OrderBiddingId && x.IsEn == true && x.IsDeleted == false  && x.EffectTime <= dakaDto.WorkDate );
                       var  orderBiddingWorkPrice = orderBiddingWorkPrices.OrderByDescending(x => x.Id).FirstOrDefault();
                        if (orderBiddingWorkPrice != null)
                        {
                            dakaDto.WorkPrice = orderBiddingWorkPrice.WorkPrice;
                        }

                        dakaDto.WorkTime = hours + (minutes / 60);
                        if (dakaDto.WorkerType == 0)
                        {