username@email.com
2024-12-30 e5d1e6b8b71ad07f0055e39afa0019ba91b281ab
cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
@@ -627,10 +627,6 @@
                        }
                    }
                    //如果当天还没有填写申请,则计算工作时间和工资
                    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();
@@ -638,6 +634,10 @@
                        {
                            dakaDto.WorkPrice = orderBiddingWorkPrice.WorkPrice;
                        }
                    //如果当天还没有填写申请,则计算工作时间和工资
                    if (dakaDto.IsShenPi == 0)
                    {
                        dakaDto.WorkTime = hours + (minutes / 60);
                        if (dakaDto.WorkerType == 0)