From 79196313d767bfb1101d6a9a354977a804432c56 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 10 十月 2024 14:27:38 +0800
Subject: [PATCH] 自行安排
---
cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
index 732f88e..1c68a36 100644
--- a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
@@ -47,6 +47,13 @@
[HttpPost]
public async Task<PageResult<OrderDto>> PostListPage(OrderPageSearch page)
{
+ var UserID = App.User?.FindFirstValue("UserID");
+ int userid = 0;
+ if (!string.IsNullOrEmpty(UserID))
+ {
+ userid = int.Parse(UserID);
+ }
+
PageResult<OrderDto> result = new PageResult<OrderDto>();
Expression<Func<Order, bool>> expression = t => true;
@@ -89,6 +96,36 @@
{
orderDto.OrderComName = userCompany.Suppliername;
}
+ if (userid > 0)
+ {
+ var orderBidding = await orderBiddingRepository.GetFirstAsync(x => x.OrderId == orderDto.Id && x.WorkerUserId == userid && x.IsEn == true && x.IsDeleted == false);
+ if (orderBidding != null)
+ {
+ if (!orderBidding.IsSelected.HasValue)
+ {
+ orderDto.IsSelectedName = "瀹℃牳涓�";
+ }
+ else if (orderBidding.IsSelected.Value == true)
+ {
+ orderDto.IsSelectedName = "宸茬‘璁�";
+ }
+ else
+ {
+ orderDto.IsSelectedName = "涓嶅綍鐢�";
+ }
+
+ }
+ else
+ {
+ orderDto.IsSelectedName = null;
+ }
+ }
+ else
+ {
+ orderDto.IsSelectedName = null;
+ }
+
+
}
}
@@ -234,7 +271,7 @@
case (int)OrderStatuses.jiesuanwanbi: orderDto.OrderStatusName = "缁撶畻瀹屾瘯"; break;
default: break;
}
- var orderBiddings = await orderBiddingRes.GetListAsync(x => x.OrderId == orderDto.Id && x.IsEn == true && x.IsDeleted == false && (x.IsSelected ==null || x.IsSelected !=false) );
+ var orderBiddings = await orderBiddingRes.GetListAsync(x => x.OrderId == orderDto.Id && x.IsEn == true && x.IsDeleted == false ); //&& (x.IsSelected ==null || x.IsSelected !=false)
var IsSelected = orderBiddings.Count(x => x.IsSelected == true);
orderDto.WorderCounted = IsSelected;
@@ -273,7 +310,7 @@
}
}
-
+ orderBiddings = orderBiddings.Where(x => (x.IsSelected == null || x.IsSelected != false)).ToList();
var orderBiddingDtos = _mapper.Map<List<OrderBiddingDto>>(orderBiddings);
if(orderBiddingDtos != null&& orderBiddingDtos.Count > 0)
{
--
Gitblit v1.9.1