From 327a841a996e9e727d854baa449b5253035c4cf4 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 07 四月 2026 15:34:45 +0800
Subject: [PATCH] 增加灵活用工
---
cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
index 3c79614..68eae2b 100644
--- a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
@@ -636,9 +636,10 @@
RefAsync<int> total = 0;
-
var orderBiddingDetailCheckRepository = new BaseRepository<OrderBiddingDetailCheck>();
var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
+ var orderBiddingRes = new BaseRepository<OrderBidding>();
+
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 ,
@@ -666,6 +667,7 @@
WorkCount = c.WorkCount,
Suppliername = d.Suppliername,
OrderBiddingId = c.OrderBiddingId,
+ IsGuding = b.IsGuding,
})
.ToPageListAsync(page.PageIndex, page.PageSize, total);
@@ -696,6 +698,10 @@
string DakaMingxi = "";
int hours = 0;
int minutes = 0;
+
+ int jiabanhours = 0;
+ int jiabanminutes = 0;
+
for (int i = 0; i < orderBiddingDetailChecks.Count; i++)
{
@@ -714,21 +720,49 @@
hours += timeDifference.Hours;
minutes += timeDifference.Minutes;
+ // 鑾峰彇褰撳墠鏃堕棿
+ DateTime now = DateTime.Now;
+
+ // 鍒涘缓涓�涓〃绀烘櫄涓�8鐐圭殑鏃堕棿锛堝亣瀹氫粖澶╋級
+ DateTime eveningTime = new DateTime(now.Year, now.Month, now.Day, 20, 0, 0); // 20:00:0
+ //璁＄畻鏄惁涓烘櫄涓�8鐐瑰悗鐨勫姞鐝椂闂�
+ if (orderBiddingDetailChecks[i].Checktime.Value > eveningTime)
+ {
+ var timeDifferencejiaban = orderBiddingDetailChecks[i].Checktime.Value - eveningTime;
+ jiabanhours += timeDifferencejiaban.Hours;
+ jiabanminutes += timeDifferencejiaban.Minutes;
+ }
}
}
//濡傛灉褰撳ぉ杩樻病鏈夊～鍐欑敵璇凤紝鍒欒绠楀伐浣滄椂闂村拰宸ヨ祫
if(dakaDto.IsShenPi == 0)
{
+ var orderBidding = await orderBiddingRes.GetByIdAsync(dakaDto.OrderBiddingId);
//褰撳墠鏈夋晥鐨勫伐浠�
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;
+ //濡傛灉涓哄崐鍥哄畾鐨勪复鏃跺伐锛屽伐浠峰浐瀹�11鍧�
+ if (orderBidding != null && orderBidding.IsGuding.HasValue && orderBidding.IsGuding.Value == true)
+ {
+ dakaDto.WorkPrice = 11;
+ }
+ else
+ {
+ dakaDto.WorkPrice = orderBiddingWorkPrice.WorkPrice;
+ }
}
dakaDto.WorkTime = hours+(minutes/60);
if(dakaDto.WorkerType == 0)
{
dakaDto.TodaySalary = dakaDto.WorkTime * dakaDto.WorkPrice;
+
+ //濡傛灉涓哄崐鍥哄畾鐨勪复鏃跺伐锛屽姞鐝瘡涓皬鏃跺鍔�4鍧楅挶
+ if (orderBidding != null && orderBidding.IsGuding.HasValue && orderBidding.IsGuding.Value == true)
+ {
+ var jiabanshijian = jiabanhours + (jiabanminutes / 60);
+ dakaDto.TodaySalary += (jiabanshijian * 4);
+ }
}
else
{
--
Gitblit v1.9.1