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/OrderCompanyAppService.cs | 99 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 95 insertions(+), 4 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs b/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
index 41ba18e..8c9fd2a 100644
--- a/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
@@ -107,8 +107,14 @@
default: break;
}
- var orderBiddings = await orderBiddingRepository.CountAsync(x => x.OrderId == orderDto.Id && x.IsSelected == true && x.IsEn == true && x.IsDeleted == false);
- orderDto.WorderCounted = orderBiddings;
+ var orderBidds = await orderBiddingRepository.GetListAsync(x => x.OrderId == orderDto.Id && x.IsEn == true && x.IsDeleted == false);
+
+ //var orderBiddings = await orderBiddingRepository.CountAsync(x => x.OrderId == orderDto.Id && x.IsSelected == true && x.IsEn == true && x.IsDeleted == false);
+ orderDto.WorderCounted = orderBidds.Count(x=> x.IsSelected == true);
+ //var orderBiddingbaomings = await orderBiddingRepository.CountAsync(x => x.OrderId == orderDto.Id && x.IsEn == true && x.IsDeleted == false);
+ orderDto.BaoMingCount = orderBidds.Count;
+ // var orderBiddingbaomings = await orderBiddingRepository.CountAsync(x => x.OrderId == orderDto.Id && x.IsEn == true && x.IsDeleted == false);
+ orderDto.WorkerDaiCount = orderBidds.Count(x => x.IsSelected == null);
}
@@ -205,6 +211,8 @@
order.ContactPhone = orderDto.ContactPhone;
order.WorkerType = orderDto.WorkerType;
order.WorkPrice = orderDto.WorkPrice;
+ order.WorkPriceMax = orderDto.WorkPriceMax;
+ order.Zixinganpai = orderDto.Zixinganpai;
order.OrderStatus = 0;
order.IsEn = true;
order.UpDataBy = NickName;
@@ -259,6 +267,7 @@
var orderBiddingRes = new BaseRepository<OrderBidding>();
var orderRes = new BaseRepository<Order>();
+ var orderBiddingWorkPriceRes = new BaseRepository<OrderBiddingWorkPrice>();
var orderBidding = await orderBiddingRes.GetByIdAsync(queRenDto.OrderBiddingId);
if (orderBidding == null || orderBidding.IsEn != true || orderBidding.IsDeleted == true )
@@ -300,9 +309,82 @@
res = await orderRes.UpdateAsync(order);
}
+
+ //add 瀛樺偍宸ヤ汉鐨勫伐浠�
+ var orderBiddingWorkPrice = new OrderBiddingWorkPrice();
+ orderBiddingWorkPrice.OrderBiddingId = queRenDto.OrderBiddingId;
+ orderBiddingWorkPrice.WorkPrice = order.WorkPrice;
+ orderBiddingWorkPrice.EffectTime = DateTime.Now.Date;
+
+
+ orderBiddingWorkPrice.UpDataBy = NickName;
+ orderBiddingWorkPrice.UpDataTime = DateTime.Now;
+ orderBiddingWorkPrice.CreateBy = NickName;
+ orderBiddingWorkPrice.CreateTime = DateTime.Now;
+ res = await orderBiddingWorkPriceRes.InsertAsync(orderBiddingWorkPrice);
+
return res;
}
+
+
+
+
+ /// <summary>
+ /// 鍏徃淇敼宸ヤ汉宸ヤ环
+ /// </summary>
+ /// <returns></returns>
+ [Authorize]
+ [HttpPost]
+ public async Task<bool> saveWorkPrice(WorkPriceDto workPriceDto)
+ {
+
+ var UserID = App.User?.FindFirstValue("UserID");
+ int userid = 0;
+ string NickName = App.User?.FindFirstValue("NickName");
+ if (!string.IsNullOrEmpty(UserID))
+ {
+ userid = int.Parse(UserID);
+ }
+
+ var orderBiddingRes = new BaseRepository<OrderBidding>();
+ var orderRes = new BaseRepository<Order>();
+ var orderBiddingWorkPriceRes = new BaseRepository<OrderBiddingWorkPrice>();
+
+ var orderBidding = await orderBiddingRes.GetByIdAsync(workPriceDto.OrderBiddingId);
+ if (orderBidding == null || orderBidding.IsEn != true || orderBidding.IsDeleted == true)
+ {
+ throw Oops.Oh("璇ユ姇閫掑凡缁忔棤鏁堬紒");
+ }
+ if (orderBidding.IsSelected != true)
+ {
+ throw Oops.Oh("璇ユ姇閫掓病鏈夌‘璁わ紝涓嶈兘淇敼宸ヤ环锛�");
+ }
+
+
+
+
+
+
+ bool res;
+
+
+
+ //add 瀛樺偍宸ヤ汉鐨勫伐浠�
+ var orderBiddingWorkPrice = new OrderBiddingWorkPrice();
+ orderBiddingWorkPrice.OrderBiddingId = workPriceDto.OrderBiddingId;
+ orderBiddingWorkPrice.WorkPrice = workPriceDto.WorkPrice;
+ orderBiddingWorkPrice.EffectTime = DateTime.Now.Date.AddDays(1);
+
+
+ orderBiddingWorkPrice.UpDataBy = NickName;
+ orderBiddingWorkPrice.UpDataTime = DateTime.Now;
+ orderBiddingWorkPrice.CreateBy = NickName;
+ orderBiddingWorkPrice.CreateTime = DateTime.Now;
+ res = await orderBiddingWorkPriceRes.InsertAsync(orderBiddingWorkPrice);
+
+ return res;
+ }
/// <summary>
@@ -455,7 +537,7 @@
RefAsync<int> total = 0;
-
+ var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
var orderBiddingDetailCheckRepository = new BaseRepository<OrderBiddingDetailCheck>();
var userWorkerRes = new BaseRepository<UserWorker>();
var data = await orderRepository.Context.Queryable<Order, OrderBidding, OrderBiddingDetail, UserWorker>((a, b, c, d) =>
@@ -486,6 +568,7 @@
WorkCount = c.WorkCount,
WorkerUserId = b.WorkerUserId,
WorkerUserName = d.name,
+ OrderBiddingId = c.OrderBiddingId,
})
.ToPageListAsync(page.PageIndex, page.PageSize, total);
@@ -539,6 +622,14 @@
//濡傛灉褰撳ぉ杩樻病鏈夊～鍐欑敵璇凤紝鍒欒绠楀伐浣滄椂闂村拰宸ヨ祫
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)
{
@@ -563,7 +654,7 @@
switch (dakaDto.WorkerType)
{
case (int)WorkerTypes.time: dakaDto.WorkerTypeName = "璁℃椂"; break;
- case (int)WorkerTypes.count: dakaDto.WorkerTypeName = "璁′环"; break;
+ case (int)WorkerTypes.count: dakaDto.WorkerTypeName = "璁′欢"; break;
default: break;
}
--
Gitblit v1.9.1