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/Dtos/OrderDto.cs | 37 +++++++++++
cylsg/cylsg.Model/OrderModel/OrderBidding.cs | 2
cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs | 87 ++++++++++++++++++++++++++++
cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs | 38 ++++++++++++
4 files changed, 157 insertions(+), 7 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
index 493176e..14ffbfb 100644
--- a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
+++ b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
@@ -359,6 +359,12 @@
/// <summary>
+ /// 鏄惁鍗婂浐瀹�
+ /// </summary>
+ public bool? IsGuding { get; set; }
+
+
+ /// <summary>
/// 鍘嗗彶宸ヤ环
/// </summary>
public List<OrderBiddingWorkPrice> orderBiddingWorkPrices { get; set; }
@@ -390,7 +396,11 @@
/// </summary>
public int OrderBiddingId { get; set; }
-
+ /// <summary>
+ /// 鏄惁鍥哄畾
+ /// </summary>
+ public bool? IsGuding { get; set; }
+
@@ -410,6 +420,23 @@
/// 鏄惁鏀惰棌
/// </summary>
public bool IsCollect { get; set; }
+
+ }
+
+
+ public class BangudingDto
+ {
+
+ /// <summary>
+ /// 鎷涘伐鏄庣粏OrderBiddingId
+ /// </summary>
+ public int OrderBiddingId { get; set; }
+
+
+ /// <summary>
+ /// 鏄惁鍥哄畾
+ /// </summary>
+ public bool IsGuding { get; set; }
}
@@ -668,7 +695,13 @@
/// 鎷涘伐鍏徃鍚嶇О
/// </summary>
public string Suppliername { get; set; }
-
+
+
+ /// <summary>
+ /// 鏄惁鐏垫椿鐢ㄥ伐
+ /// </summary>
+ public bool? IsGuding { get; set; }
+
}
diff --git a/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs b/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
index 72105d6..09ec7e8 100644
--- a/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
@@ -307,7 +307,8 @@
orderBidding.Selectedtime = DateTime.Now;
orderBidding.UpDataBy = NickName;
orderBidding.UpDataTime = DateTime.Now;
-
+ //鏄惁鏄崐鍥哄畾涓存椂宸�
+ orderBidding.IsGuding = queRenDto.IsGuding;
res = await orderBiddingRes.UpdateAsync(orderBidding);
@@ -330,6 +331,51 @@
orderBiddingWorkPrice.CreateBy = NickName;
orderBiddingWorkPrice.CreateTime = DateTime.Now;
res = await orderBiddingWorkPriceRes.InsertAsync(orderBiddingWorkPrice);
+
+ return res;
+ }
+
+
+ /// <summary>
+ /// 璁剧疆鍛樺伐鏄崐鍥哄畾涓存椂宸ユ槸鍚︽槸
+ /// </summary>
+ /// <returns></returns>
+ [Authorize]
+ [HttpPost]
+ public async Task<bool> GudingGongren(BangudingDto bangudingDto)
+ {
+
+ 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 orderBidding = await orderBiddingRes.GetByIdAsync(bangudingDto.OrderBiddingId);
+ if (orderBidding == null || orderBidding.IsEn != true || orderBidding.IsDeleted == true)
+ {
+ throw Oops.Oh("璇ユ姇閫掑凡缁忔棤鏁堬紒");
+ }
+
+
+
+
+
+ bool res;
+
+ orderBidding.IsGuding = bangudingDto.IsGuding;
+
+ orderBidding.UpDataBy = NickName;
+ orderBidding.UpDataTime = DateTime.Now;
+
+
+ res = await orderBiddingRes.UpdateAsync(orderBidding);
+
+
return res;
}
@@ -651,6 +697,8 @@
var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
var orderBiddingDetailCheckRepository = new BaseRepository<OrderBiddingDetailCheck>();
var userWorkerRes = new BaseRepository<UserWorker>();
+ var orderBiddingRes = new BaseRepository<OrderBidding>();
+
var data = await orderRepository.Context.Queryable<Order, OrderBidding, OrderBiddingDetail, UserWorker>((a, b, c, d) =>
new JoinQueryInfos(JoinType.Inner, a.Id == b.OrderId,
JoinType.Inner, b.Id == c.OrderBiddingId,
@@ -681,6 +729,7 @@
WorkerUserId = b.WorkerUserId,
WorkerUserName = d.name,
OrderBiddingId = c.OrderBiddingId,
+ IsGuding = b.IsGuding,
})
.ToPageListAsync(page.PageIndex, page.PageSize, total);
@@ -709,6 +758,10 @@
{
int hours = 0;
int minutes = 0;
+
+ int jiabanhours = 0;
+ int jiabanminutes = 0;
+
var orderBiddingDetailChecks = await orderBiddingDetailCheckRepository.GetListAsync(x => x.OrderBiddingDetailId == dakaDto.OrderBiddingDetailId && x.IsEn == true && x.IsDeleted == false);
string DakaMingxi = "";
for (int i = 0; i < orderBiddingDetailChecks.Count; i++)
@@ -728,14 +781,37 @@
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;
+ }
+
}
}
+ var orderBidding = await orderBiddingRes.GetByIdAsync(dakaDto.OrderBiddingId);
//褰撳墠鏈夋晥鐨勫伐浠�
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;
+ //濡傛灉涓哄崐鍥哄畾鐨勪复鏃跺伐锛屽伐浠峰浐瀹�11鍧�
+ if (orderBidding != null && orderBidding.IsGuding.HasValue && orderBidding.IsGuding.Value == true)
+ {
+ dakaDto.WorkPrice = 11;
+ }
+ else
+ {
+ dakaDto.WorkPrice = orderBiddingWorkPrice.WorkPrice;
+ }
}
//濡傛灉褰撳ぉ杩樻病鏈夊～鍐欑敵璇凤紝鍒欒绠楀伐浣滄椂闂村拰宸ヨ祫
if (dakaDto.IsShenPi == 0)
@@ -746,6 +822,13 @@
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
{
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
{
diff --git a/cylsg/cylsg.Model/OrderModel/OrderBidding.cs b/cylsg/cylsg.Model/OrderModel/OrderBidding.cs
index 12666e1..a0a6eee 100644
--- a/cylsg/cylsg.Model/OrderModel/OrderBidding.cs
+++ b/cylsg/cylsg.Model/OrderModel/OrderBidding.cs
@@ -69,7 +69,7 @@
/// <summary>
- /// 鏄惁鍥哄畾
+ /// 鏄惁鍥哄畾 鏅氫笂8鐐逛箣鍚�15鍧� 鏃╁叓鐐瑰埌鏅氬叓鐐�11鍧�
/// </summary>
[SugarColumn(ColumnDescription = "鏄惁鍥哄畾", IsNullable = true)]
public bool? IsGuding { get; set; }
--
Gitblit v1.9.1