修改有效工价显示错误

username@email.com

2024-12-30 e5d1e6b8b71ad07f0055e39afa0019ba91b281ab

 cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs

@@ -226,6 +226,14 @@
            }
            else
            {
                if (orderDto.OldId > 0)
                {
                    //删除旧的下架订单
                    var order1 = await orderRes.GetByIdAsync(orderDto.OldId);
                    order1.IsDeleted = true;
                    res = await orderRes.UpdateAsync(order1);
                }

                var order = _mapper.Map<Order>(orderDto);
                order.UpDataBy = NickName;
                order.UpDataTime = DateTime.Now;
@@ -619,17 +627,17 @@

                        }
                    }

                    //当前有效的工价
                    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;
                    }
                    //如果当天还没有填写申请，则计算工作时间和工资
                    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)