cylsg.git - Gitblit

			@@ -101,14 +101,20 @@
			{
			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;
			}

			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);

			}

			@@ -206,6 +212,7 @@
			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;
			@@ -219,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;
			@@ -438,6 +453,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>
			@@ -538,8 +609,8 @@
			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))
			@@ -558,6 +629,7 @@
			WorkPrice = a.WorkPrice,
			TodaySalary = c.TodaySalary,
			IsShenPi = c.IsShenPi,
			ShenPitime = c.ShenPitime,
			WorkCount = c.WorkCount,
			WorkerUserId = b.WorkerUserId,
			WorkerUserName = d.name,
			@@ -611,17 +683,17 @@

			}
			}

			//当前有效的工价
			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;
			}
			//如果当天还没有填写申请，则计算工作时间和工资
			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)
			@@ -716,6 +788,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
			{