From 43baedbcf347ab10c73d6e4fcda841a6719d31e1 Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期五, 12 九月 2025 11:17:27 +0800
Subject: [PATCH] no message
---
cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
index cc02fbe..3c79614 100644
--- a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
@@ -59,7 +59,7 @@
Expression<Func<Order, bool>> expression = t => true;
expression = expression.And(t => t.IsDeleted == false && t.IsEn == true && t.OrderStatus == 0);
- expression = expression.And(t => t.WordStartTime >= DateTime.Now.Date.AddDays(-30));
+ // expression = expression.And(t => t.WordEndTime >= DateTime.Now.Date.AddDays(-30));
if (!string.IsNullOrEmpty(page.OrderName))
{
expression = expression.And(t => t.OrderName.Contains(page.OrderName));
@@ -193,7 +193,7 @@
{
switch (orderDto.OrderStatus)
{
- case (int)OrderStatuses.fabu: orderDto.OrderStatusName = "鍙戝竷"; break;
+ case (int)OrderStatuses.fabu: orderDto.OrderStatusName = "鍙戝竷涓�"; break;
case (int)OrderStatuses.zhaogongwanbi: orderDto.OrderStatusName = "鎷涘伐瀹屾瘯"; break;
case (int)OrderStatuses.jiesuanwanbi: orderDto.OrderStatusName = "缁撶畻瀹屾瘯"; break;
default: break;
@@ -263,10 +263,14 @@
var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
var userRes = new BaseRepository<User>();
var order = await orderRes.GetByIdAsync(orderid);
+ if (order.IsDeleted == true)
+ {
+ throw Oops.Oh("璁㈠崟宸茬粡鍒犻櫎鏃犳硶鏌ョ湅锛�");
+ }
orderDto = _mapper.Map<OrderDto>(order);
switch (orderDto.OrderStatus)
{
- case (int)OrderStatuses.fabu: orderDto.OrderStatusName = "鍙戝竷"; break;
+ case (int)OrderStatuses.fabu: orderDto.OrderStatusName = "鍙戝竷涓�"; break;
case (int)OrderStatuses.zhaogongwanbi: orderDto.OrderStatusName = "鎷涘伐瀹屾瘯"; break;
case (int)OrderStatuses.jiesuanwanbi: orderDto.OrderStatusName = "缁撶畻瀹屾瘯"; break;
default: break;
@@ -310,7 +314,7 @@
}
}
- orderBiddings = orderBiddings.Where(x => (x.IsSelected == null || x.IsSelected != false)).ToList();
+ orderBiddings = orderBiddings.Where(x => (x.IsSelected == null || x.IsSelected != false)).OrderBy(x=>x.IsSelected).ThenByDescending(x=>x.IsCollect).ToList();
var orderBiddingDtos = _mapper.Map<List<OrderBiddingDto>>(orderBiddings);
if(orderBiddingDtos != null&& orderBiddingDtos.Count > 0)
{
@@ -640,8 +644,8 @@
JoinType.Inner, b.Id == c.OrderBiddingId ,
JoinType.Inner, a.OrderUserId == d.UserId
))
- .Where((a, b, c, d) => a.IsEn == true && a.IsDeleted == false && b.IsEn == true && b.IsDeleted == false && c.IsEn == true && c.IsDeleted == false
- && b.IsSelected == true && b.WorkerUserId == userid && d.IsEn == true && d.IsDeleted == false )
+ .Where((a, b, c, d) => a.IsDeleted == false && b.IsEn == true && b.IsDeleted == false && c.IsEn == true && c.IsDeleted == false
+ && b.IsSelected == true && b.WorkerUserId == userid && d.IsEn == true && d.IsDeleted == false) //a.IsEn == true &&
.WhereIF(page.WordDate.HasValue, (a, b, c, d) => (c.WorkDate == page.WordDate))
.WhereIF(page.WordDateStart.HasValue, (a, b, c, d) => (c.WorkDate >= page.WordDateStart))
.WhereIF(page.WordDateEnd.HasValue, (a, b, c, d) => (c.WorkDate <= page.WordDateEnd))
@@ -919,7 +923,7 @@
var order = await orderRes.GetByIdAsync(orderBidding.OrderId);
- if (order == null || order.OrderStatus > 1 || order.IsDeleted == true || order.IsEn == false )
+ if (order == null || order.OrderStatus > 1 || order.IsDeleted == true)// || order.IsEn == false
{
throw Oops.Oh("璇ユ嫑宸ョ姸鎬佸凡鏃犳硶鎵撳崱纭锛�");
}
--
Gitblit v1.9.1