From a2dac4ed0574e08eab1debe0d9c26711778533a5 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 09 九月 2024 09:27:25 +0800
Subject: [PATCH] no message
---
cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs | 144 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 117 insertions(+), 27 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
index d8731ba..76f27a1 100644
--- a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
@@ -278,7 +278,7 @@
var UserID = App.User?.FindFirstValue("UserID");
int userid = 0;
- string ITCode = App.User?.FindFirstValue("ITCode");
+ string NickName = App.User?.FindFirstValue("NickName");
if (!string.IsNullOrEmpty(UserID))
{
userid = int.Parse(UserID);
@@ -297,6 +297,10 @@
if (order == null || order.OrderStatus>0)
{
throw Oops.Oh("璇ユ嫑宸ョ姸鎬佸凡缁忔棤娉曟姇閫掞紒");
+ }
+ if (order.OrderUserId == userid)
+ {
+ throw Oops.Oh("鑷繁鏃犳硶鎶曢�掕嚜宸卞彂甯冪殑鎷涘伐锛�");
}
bool res;
@@ -321,9 +325,9 @@
orderBidding1.WorkerUserId = userid;
orderBidding1.OrderId = baoMingDto.OrderId;
orderBidding1.IsSelected = false;
- orderBidding1.UpDataBy = ITCode;
+ orderBidding1.UpDataBy = NickName;
orderBidding1.UpDataTime = DateTime.Now;
- orderBidding1.CreateBy = ITCode;
+ orderBidding1.CreateBy = NickName;
orderBidding1.CreateTime = DateTime.Now;
res = await orderBiddingRes.InsertAsync(orderBidding1);
@@ -343,7 +347,7 @@
{
var UserID = App.User?.FindFirstValue("UserID");
int userid = 0;
- string ITCode = App.User?.FindFirstValue("ITCode");
+ string NickName = App.User?.FindFirstValue("NickName");
if (!string.IsNullOrEmpty(UserID))
{
userid = int.Parse(UserID);
@@ -355,6 +359,7 @@
var orderRes = new BaseRepository<Order>();
var orderBiddingDetailRes = new BaseRepository<OrderBiddingDetail>();
var OrderBiddingDetailCheckRes = new BaseRepository<OrderBiddingDetailCheck>();
+ var userWorkerRes = new BaseRepository<UserWorker>();
var order = await orderRes.GetByIdAsync(baoMingDto.OrderId);
if (order == null || order.OrderStatus > 1)
{
@@ -374,6 +379,11 @@
throw Oops.Oh("褰撳ぉ鐨勬墦鍗″凡缁忔彁浜わ紝涓嶈兘鎵撳崱锛�");
}
orderBiddingDetailDto = _mapper.Map<OrderBiddingDetailDto>(orderBiddingDetail);
+ orderBiddingDetailDto.WorkerUserId = orderBidding.WorkerUserId;
+ var worker = await userWorkerRes.GetFirstAsync(x => x.UserId == orderBidding.WorkerUserId);
+ if(worker != null)
+ orderBiddingDetailDto.WorkerName = worker.name;
+
var orderBiddingDetailChecks = await OrderBiddingDetailCheckRes.GetListAsync(x => x.OrderBiddingDetailId == orderBiddingDetail.Id && x.IsDeleted == false && x.IsEn == true);
orderBiddingDetailDto.orderBiddingDetailCheck = _mapper.Map<List<OrderBiddingDetailCheckDto>>(orderBiddingDetailChecks);
}
@@ -392,7 +402,7 @@
var UserID = App.User?.FindFirstValue("UserID");
int userid = 0;
- string ITCode = App.User?.FindFirstValue("ITCode");
+ string NickName = App.User?.FindFirstValue("NickName");
if (!string.IsNullOrEmpty(UserID))
{
userid = int.Parse(UserID);
@@ -403,19 +413,25 @@
var orderBiddingDetailRes = new BaseRepository<OrderBiddingDetail>();
var OrderBiddingDetailCheckRes = new BaseRepository<OrderBiddingDetailCheck>();
- var orderBidding = await orderBiddingRes.GetByIdAsync(dakaDto.OrderBiddingId);
+ var order = await orderRes.GetByIdAsync(dakaDto.OrderId);
+ if (order == null || order.OrderStatus > 1)
+ {
+ throw Oops.Oh("璇ユ嫑宸ョ姸鎬佸凡鏃犳硶鎵撳崱锛�");
+ }
+
+ var orderBidding = await orderBiddingRes.GetFirstAsync(x => x.OrderId == dakaDto.OrderId && x.WorkerUserId == userid && x.IsSelected == true && x.IsEn == true && x.IsDeleted == false );//GetByIdAsync(dakaDto.OrderBiddingId);
if (orderBidding == null || orderBidding.IsDeleted ==true || orderBidding.IsEn == false || orderBidding.IsSelected !=true )
{
throw Oops.Oh("璇ユ姇閫掔姸鎬佹棤娉曟墦鍗★紒");
}
- var order = await orderRes.GetByIdAsync(orderBidding.OrderId);
- if (order == null || order.OrderStatus > 1)
- {
- throw Oops.Oh("璇ユ嫑宸ョ姸鎬佸凡鏃犳硶鎵撳崱锛�");
- }
+
bool res;
var dateTime = DateTime.Now.Date;
+ if ( dateTime < order.WordStartTime.Value && dateTime > order.WordEndTime.Value )
+ {
+ throw Oops.Oh("涓嶅湪鍏佽鎵撳崱鐨勬椂闂磋寖鍥达紒");
+ }
var orderBiddingDetail = await orderBiddingDetailRes.GetFirstAsync(x => x.OrderBiddingId == orderBidding.Id && x.WorkDate == dateTime && x.IsDeleted == false && x.IsEn == true);
if (orderBiddingDetail!=null && orderBiddingDetail.IsShenPi>0)
{
@@ -434,7 +450,7 @@
{
throw Oops.Oh("鍛樺伐鏈敞鍐屾垚宸ヤ汉");
}
- var faseres = _tencentCloudService.VerifyFace(dakaDto.FaceImg, UserWorkRes.IAIPersonId);
+ var faseres = _tencentCloudService.VerifyFace(dakaDto.FaceImg, UserWorkRes.IdCode);
if (faseres.IsMatch != true)
{
@@ -452,9 +468,9 @@
orderBiddingDetail.WorkDate = dateTime;
orderBiddingDetail.IsShenPi = 0;
orderBiddingDetail.IsTiXian = false;
- orderBiddingDetail.UpDataBy = ITCode;
+ orderBiddingDetail.UpDataBy = NickName;
orderBiddingDetail.UpDataTime = DateTime.Now;
- orderBiddingDetail.CreateBy = ITCode;
+ orderBiddingDetail.CreateBy = NickName;
orderBiddingDetail.CreateTime = DateTime.Now;
orderBiddingDetail.Id = await orderBiddingDetailRes.InsertReturnIdentityAsync(orderBiddingDetail);
}
@@ -463,9 +479,9 @@
orderBiddingDetailCheck.OrderBiddingDetailId = orderBiddingDetail.Id;
orderBiddingDetailCheck.CheckPhoto = dakaDto.CheckPhoto;
orderBiddingDetailCheck.Checktime = DateTime.Now;
- orderBiddingDetailCheck.UpDataBy = ITCode;
+ orderBiddingDetailCheck.UpDataBy = NickName;
orderBiddingDetailCheck.UpDataTime = DateTime.Now;
- orderBiddingDetailCheck.CreateBy = ITCode;
+ orderBiddingDetailCheck.CreateBy = NickName;
orderBiddingDetailCheck.CreateTime = DateTime.Now;
res = await OrderBiddingDetailCheckRes.InsertAsync(orderBiddingDetailCheck);
@@ -620,7 +636,7 @@
{
var UserID = App.User?.FindFirstValue("UserID");
int userid = 0;
- string ITCode = App.User?.FindFirstValue("ITCode");
+ string NickName = App.User?.FindFirstValue("NickName");
if (!string.IsNullOrEmpty(UserID))
{
userid = int.Parse(UserID);
@@ -724,7 +740,7 @@
var UserID = App.User?.FindFirstValue("UserID");
int userid = 0;
- string ITCode = App.User?.FindFirstValue("ITCode");
+ string NickName = App.User?.FindFirstValue("NickName");
if (!string.IsNullOrEmpty(UserID))
{
userid = int.Parse(UserID);
@@ -736,30 +752,32 @@
//var OrderBiddingDetailCheckRes = new BaseRepository<OrderBiddingDetailCheck>();
var orderBiddingDetail = await orderBiddingDetailRes.GetByIdAsync(dakaDto.OrderBiddingDetailId);
+ if (orderBiddingDetail == null || orderBiddingDetail.IsShenPi > 1 || orderBiddingDetail.IsDeleted == true || orderBiddingDetail.IsEn == false)
+ {
+ throw Oops.Oh("璇ユ墦鍗＄姸鎬佸凡鏃犳硶鎵撳崱纭锛�");
+ }
var orderBidding = await orderBiddingRes.GetByIdAsync(orderBiddingDetail.OrderBiddingId);
- var order = await orderRes.GetByIdAsync(orderBidding.OrderId);
-
if (orderBidding == null || orderBidding.IsDeleted == true || orderBidding.IsEn == false || orderBidding.IsSelected != true)
{
throw Oops.Oh("璇ユ姇閫掔姸鎬佹棤娉曟墦鍗＄‘璁わ紒");
}
- if (order == null || order.OrderStatus > 1)
+ var order = await orderRes.GetByIdAsync(orderBidding.OrderId);
+
+
+ if (order == null || order.OrderStatus > 1 || order.IsDeleted == true || order.IsEn == false )
{
throw Oops.Oh("璇ユ嫑宸ョ姸鎬佸凡鏃犳硶鎵撳崱纭锛�");
}
- if (orderBiddingDetail == null || orderBiddingDetail.IsShenPi > 1)
- {
- throw Oops.Oh("璇ユ墦鍗＄姸鎬佸凡鏃犳硶鎵撳崱纭锛�");
- }
+
orderBiddingDetail.WorkTime = dakaDto.WorkTime;
orderBiddingDetail.WorkCount = dakaDto.WorkCount;
orderBiddingDetail.TodaySalary = dakaDto.TodaySalary;
orderBiddingDetail.IsShenPi = 1;
- orderBiddingDetail.UpDataBy = ITCode;
+ orderBiddingDetail.UpDataBy = NickName;
orderBiddingDetail.UpDataTime = DateTime.Now;
- //orderBiddingDetail.CreateBy = ITCode;
+ //orderBiddingDetail.CreateBy = NickName;
//orderBiddingDetail.CreateTime = DateTime.Now;
var res = await orderBiddingDetailRes.UpdateAsync(orderBiddingDetail);
@@ -771,5 +789,77 @@
+
+ /// <summary>
+ /// 鏌ヨ宸ヤ汉鐨勬敹鍏ヨ褰�
+ /// </summary>
+ /// <param name="page"></param>
+ /// <returns></returns>
+ [Authorize]
+ [HttpPost]
+ public async Task<PageResult<UserTiXianDetailDto>> PostMyTiXianDetailListPage(PageBaseSearch page)
+ {
+ var UserID = App.User?.FindFirstValue("UserID");
+ int userid = 0;
+ if (!string.IsNullOrEmpty(UserID))
+ {
+ userid = int.Parse(UserID);
+ }
+
+ PageResult<UserTiXianDetailDto> result = new PageResult<UserTiXianDetailDto>();
+
+ RefAsync<int> total = 0;
+
+
+ var userTiXianDetailRepository = new BaseRepository<UserTiXianDetail>();
+
+ var data = await userTiXianDetailRepository.Context.Queryable<UserTiXianDetail>()
+ .Where(a => a.IsEn == true && a.IsDeleted == false && a.UserId == userid)
+ .OrderByDescending(a => a.CreateTime)
+ .Select(a => new UserTiXianDetailDto
+ {
+ Id = a.Id,
+ UserId = a.UserId,
+ YiTiXianJine = a.YiTiXianJine,
+ ZhiChuShouRu = a.ZhiChuShouRu,
+ Remark = a.Remark,
+
+
+ })
+
+ .ToPageListAsync(page.PageIndex, page.PageSize, total);
+
+ if (data != null && data.Count > 0)
+ {
+ foreach (var userTiXianDetailDto in data)
+ {
+
+ switch (userTiXianDetailDto.ZhiChuShouRu)
+ {
+ case (int)ZhiChuShouRus.zhichu: userTiXianDetailDto.ZhiChuShouRuName = "鏀嚭"; break;
+ case (int)ZhiChuShouRus.shouru: userTiXianDetailDto.ZhiChuShouRuName = "鏀跺叆"; break;
+ default: break;
+ }
+
+
+
+
+
+
+
+
+ }
+
+ }
+ result.Items = data;
+ result.PageIndex = page.PageIndex;
+ result.PageSize = page.PageSize;
+ result.TotalCount = total;
+
+ return result;
+ }
+
+
+
}
}
--
Gitblit v1.9.1