From 2ff9e22aa01202003c8ba2b3d7c91226e61de1f8 Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期四, 09 四月 2026 09:03:07 +0800
Subject: [PATCH] no message
---
cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 215 insertions(+), 12 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs b/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
index 8c9fd2a..09ec7e8 100644
--- a/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
@@ -101,7 +101,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;
@@ -226,6 +226,14 @@
}
else
{
+ if (orderDto.OldId > 0)
+ {
+ //鍒犻櫎鏃х殑涓嬫灦璁㈠崟
+ var order1 = await orderRes.GetByIdAsync(orderDto.OldId);
+ order1.IsDeleted = true;
+ res = await orderRes.UpdateAsync(order1);
+ }
+
var order = _mapper.Map<Order>(orderDto);
order.UpDataBy = NickName;
order.UpDataTime = DateTime.Now;
@@ -299,7 +307,8 @@
orderBidding.Selectedtime = DateTime.Now;
orderBidding.UpDataBy = NickName;
orderBidding.UpDataTime = DateTime.Now;
-
+ //鏄惁鏄崐鍥哄畾涓存椂宸�
+ orderBidding.IsGuding = queRenDto.IsGuding;
res = await orderBiddingRes.UpdateAsync(orderBidding);
@@ -322,6 +331,98 @@
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;
+ }
+
+
+
+
+ /// <summary>
+ /// 鍏徃鏀惰棌宸ヤ汉
+ /// </summary>
+ /// <returns></returns>
+ [Authorize]
+ [HttpPost]
+ public async Task<bool> ShoucangGongren(ShoucangDto shoucangDto)
+ {
+
+ 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(shoucangDto.OrderBiddingId);
+ if (orderBidding == null || orderBidding.IsEn != true || orderBidding.IsDeleted == true)
+ {
+ throw Oops.Oh("璇ユ姇閫掑凡缁忔棤鏁堬紒");
+ }
+
+
+
+
+
+ bool res;
+
+ orderBidding.IsCollect = shoucangDto.IsCollect;
+
+ orderBidding.UpDataBy = NickName;
+ orderBidding.UpDataTime = DateTime.Now;
+
+
+ res = await orderBiddingRes.UpdateAsync(orderBidding);
+
+
return res;
}
@@ -445,6 +546,62 @@
/// <summary>
+ /// 鍏徃鍒犻櫎涓�涓姇閫掔殑宸ヤ汉
+ /// </summary>
+ /// <returns></returns>
+ [Authorize]
+ [HttpPost]
+ public async Task<bool> saveDeltoudi(QueRenDto queRenDto)
+ {
+
+ 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 orderBidding = await orderBiddingRes.GetByIdAsync(queRenDto.OrderBiddingId);
+ if (orderBidding == null || orderBidding.IsEn != true || orderBidding.IsDeleted == true)
+ {
+ throw Oops.Oh("璇ユ姇閫掑凡缁忔棤鏁堬紒");
+ }
+ //if (orderBidding.IsSelected == true)
+ //{
+ // throw Oops.Oh("璇ユ姇閫掑凡缁忓鏍革紝涓嶈兘涓嶅綍鐢紒");
+ //}
+
+ //var order = await orderRes.GetByIdAsync(orderBidding.OrderId);
+ //if (order == null || order.OrderStatus > 0)
+ //{
+ // throw Oops.Oh("璇ユ嫑宸ョ姸鎬佸凡缁忔棤娉曟姇閫掞紒");
+ //}
+
+
+
+
+
+ bool res;
+
+ orderBidding.IsDeleted = true;
+ //orderBidding.Selectedtime = DateTime.Now;
+ orderBidding.UpDataBy = NickName;
+ orderBidding.UpDataTime = DateTime.Now;
+
+
+ res = await orderBiddingRes.UpdateAsync(orderBidding);
+
+
+
+ return res;
+ }
+
+
+ /// <summary>
/// 鍏徃鍙栨秷閫夋嫨宸ヤ汉
/// </summary>
/// <returns></returns>
@@ -540,13 +697,15 @@
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,
JoinType.Inner, b.WorkerUserId == 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 && userids.Contains(a.OrderUserId)) //a.OrderUserId == userid
+ .Where((a, b, c, d) => a.IsDeleted == false && b.IsEn == true && b.IsDeleted == false && c.IsEn == true && c.IsDeleted == false
+ && b.IsSelected == true && userids.Contains(a.OrderUserId)) //a.OrderUserId == userid 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))
@@ -565,10 +724,12 @@
WorkPrice = a.WorkPrice,
TodaySalary = c.TodaySalary,
IsShenPi = c.IsShenPi,
+ ShenPitime = c.ShenPitime,
WorkCount = c.WorkCount,
WorkerUserId = b.WorkerUserId,
WorkerUserName = d.name,
OrderBiddingId = c.OrderBiddingId,
+ IsGuding = b.IsGuding,
})
.ToPageListAsync(page.PageIndex, page.PageSize, total);
@@ -597,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++)
@@ -616,24 +781,54 @@
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)
+ {
+ //濡傛灉涓哄崐鍥哄畾鐨勪复鏃跺伐锛屽伐浠峰浐瀹�11鍧�
+ if (orderBidding != null && orderBidding.IsGuding.HasValue && orderBidding.IsGuding.Value == true)
+ {
+ dakaDto.WorkPrice = 11;
+ }
+ else
+ {
+ dakaDto.WorkPrice = orderBiddingWorkPrice.WorkPrice;
+ }
+ }
//濡傛灉褰撳ぉ杩樻病鏈夊～鍐欑敵璇凤紝鍒欒绠楀伐浣滄椂闂村拰宸ヨ祫
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)
{
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
{
@@ -723,6 +918,14 @@
//{
// throw Oops.Oh("璇ユ嫑宸ョ姸鎬佸凡鏃犳硶鎵撳崱纭锛�");
//}
+ if (orderBiddingDetail.IsShenPi.HasValue && orderBiddingDetail.IsShenPi == (int)IsShenPis.yishenpi && orderBiddingDetail.ShenPitime.HasValue && orderBiddingDetail.ShenPitime <= DateTime.Now.AddMinutes(-5))
+ {
+ throw Oops.Oh("瀹℃壒鏃堕棿宸茬粡瓒呰繃5鍒嗛挓锛屾棤娉曢噸鏂板鎵癸紒");
+ }
+
+
+
+
var res = false;
try
{
--
Gitblit v1.9.1