From d9a1f2e7ffce03e84a9548d7c99c81e1d34ac474 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 08 十月 2024 15:56:41 +0800
Subject: [PATCH] 区间工价，历史工价
---
cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
index a9a3a13..732f88e 100644
--- a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
@@ -223,6 +223,7 @@
var orderRes = new BaseRepository<Order>();
var orderBiddingRes = new BaseRepository<OrderBidding>();
var userWorkerRes = new BaseRepository<UserWorker>();
+ var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
var userRes = new BaseRepository<User>();
var order = await orderRes.GetByIdAsync(orderid);
orderDto = _mapper.Map<OrderDto>(order);
@@ -240,6 +241,23 @@
var orderBidding = orderBiddings.Where(x => x.WorkerUserId == userid).FirstOrDefault();
if (orderBidding != null)
{
+ var dangqianshijian = DateTime.Now.Date;
+ //褰撳墠鏈夋晥鐨勫伐浠�
+ var orderBiddingWorkPrices = await orderBiddingWorkPriceRepository.GetListAsync(x => x.OrderBiddingId == orderBidding.Id && x.IsEn == true && x.IsDeleted == false );
+
+ orderBiddingWorkPrices = orderBiddingWorkPrices.OrderByDescending(x => x.Id).ToList();
+ orderDto.orderBiddingWorkPrices = orderBiddingWorkPrices;
+ var orderBiddingWorkPrice = orderBiddingWorkPrices.Where(x => x.EffectTime <= DateTime.Now.Date).FirstOrDefault();
+ if (orderBiddingWorkPrice != null)
+ {
+ orderDto.WorkPriceDangqian = orderBiddingWorkPrice.WorkPrice;
+ }
+ else
+ {
+ orderDto.WorkPriceDangqian = orderDto.WorkPrice;
+ }
+
+
orderDto.IsSelected = orderBidding.IsSelected;
if (!orderDto.IsSelected.HasValue)
{
@@ -286,6 +304,23 @@
{
orderBiddingDto.WorkerName = userWorker.name;
}
+
+ //褰撳墠鏈夋晥鐨勫伐浠�
+ var orderBiddingWorkPrices = await orderBiddingWorkPriceRepository.GetListAsync(x => x.OrderBiddingId == orderBiddingDto.Id && x.IsEn == true && x.IsDeleted == false);
+ orderBiddingWorkPrices = orderBiddingWorkPrices.OrderByDescending(x => x.Id).ToList();
+ orderBiddingDto.orderBiddingWorkPrices = orderBiddingWorkPrices;
+ var orderBiddingWorkPrice = orderBiddingWorkPrices.Where(x => x.EffectTime <= DateTime.Now.Date).FirstOrDefault();
+ if (orderBiddingWorkPrice != null)
+ {
+
+ orderBiddingDto.WorkPrice = orderBiddingWorkPrice.WorkPrice;
+ }
+ else
+ {
+ orderBiddingDto.WorkPrice = orderDto.WorkPrice;
+ }
+
+
}
}
@@ -551,7 +586,7 @@
var orderBiddingDetailCheckRepository = new BaseRepository<OrderBiddingDetailCheck>();
-
+ var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
var data = await orderRepository.Context.Queryable<Order, OrderBidding, OrderBiddingDetail ,UserCompany>((a, b ,c ,d) =>
new JoinQueryInfos(JoinType.Inner, a.Id == b.OrderId ,
JoinType.Inner, b.Id == c.OrderBiddingId ,
@@ -578,6 +613,7 @@
IsShenPi = c.IsShenPi,
WorkCount = c.WorkCount,
Suppliername = d.Suppliername,
+ OrderBiddingId = c.OrderBiddingId,
})
.ToPageListAsync(page.PageIndex, page.PageSize, total);
@@ -631,6 +667,12 @@
//濡傛灉褰撳ぉ杩樻病鏈夊～鍐欑敵璇凤紝鍒欒绠楀伐浣滄椂闂村拰宸ヨ祫
if(dakaDto.IsShenPi == 0)
{
+ //褰撳墠鏈夋晥鐨勫伐浠�
+ var orderBiddingWorkPrice = (await orderBiddingWorkPriceRepository.GetListAsync(x => x.OrderBiddingId == dakaDto.OrderBiddingId && x.IsEn == true && x.IsDeleted == false && x.EffectTime <= dakaDto.WorkDate)).OrderByDescending(x => x.Id).FirstOrDefault();
+ if (orderBiddingWorkPrice != null)
+ {
+ dakaDto.WorkPrice = orderBiddingWorkPrice.WorkPrice;
+ }
dakaDto.WorkTime = hours+(minutes/60);
if(dakaDto.WorkerType == 0)
{
@@ -703,6 +745,7 @@
var orderRes = new BaseRepository<Order>();
var orderBiddingDetailRes = new BaseRepository<OrderBiddingDetail>();
var OrderBiddingDetailCheckRes = new BaseRepository<OrderBiddingDetailCheck>();
+ var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
var userRes = new BaseRepository<User>();
var userWorkerRes = new BaseRepository<UserWorker>();
@@ -766,7 +809,12 @@
}
}
-
+ //褰撳墠鏈夋晥鐨勫伐浠�
+ var orderBiddingWorkPrice = (await orderBiddingWorkPriceRepository.GetListAsync(x => x.OrderBiddingId == orderBidding.Id && x.IsEn == true && x.IsDeleted == false && x.EffectTime <= orderDakaMingxiDto.WorkDate)).OrderByDescending(x => x.Id).FirstOrDefault();
+ if (orderBiddingWorkPrice != null)
+ {
+ orderDakaMingxiDto.WorkPrice = orderBiddingWorkPrice.WorkPrice;
+ }
orderDakaMingxiDto.WorkTime = hours + (minutes / 60);
if (orderDakaMingxiDto.WorkerType == 0)
{
--
Gitblit v1.9.1