username@email.com
2024-10-11 152f48ca3cae46bbffca3fa0af4bc9e8216fafff
cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
@@ -107,11 +107,11 @@
                            }
                            else if (orderBidding.IsSelected.Value == true)
                            {
                                orderDto.IsSelectedName = "已录用";
                                orderDto.IsSelectedName = "已确认";
                            }
                            else
                            {
                                orderDto.IsSelectedName = "未录用";
                                orderDto.IsSelectedName = "不录用";
                            }
                           
                        }
@@ -271,7 +271,7 @@
                case (int)OrderStatuses.jiesuanwanbi: orderDto.OrderStatusName = "结算完毕"; break;
                default: break;
            }
            var orderBiddings = await orderBiddingRes.GetListAsync(x => x.OrderId == orderDto.Id && x.IsEn == true && x.IsDeleted == false && (x.IsSelected ==null || x.IsSelected !=false) );
            var orderBiddings = await orderBiddingRes.GetListAsync(x => x.OrderId == orderDto.Id && x.IsEn == true && x.IsDeleted == false  ); //&& (x.IsSelected ==null || x.IsSelected !=false)
            var IsSelected = orderBiddings.Count(x => x.IsSelected == true);
            orderDto.WorderCounted = IsSelected;
@@ -310,7 +310,7 @@
                }
            }
            orderBiddings = orderBiddings.Where(x => (x.IsSelected == null || x.IsSelected != false)).ToList();
            var orderBiddingDtos = _mapper.Map<List<OrderBiddingDto>>(orderBiddings);
            if(orderBiddingDtos != null&& orderBiddingDtos.Count > 0)
            {
@@ -542,6 +542,17 @@
            {
                throw Oops.Oh("该打卡记录已经审批,不能打卡!");
            }
            if (orderBiddingDetail != null)
            {
                var orderBiddingDetailCheck1  =   (await OrderBiddingDetailCheckRes.GetListAsync(x => x.OrderBiddingDetailId == orderBiddingDetail.Id && x.IsDeleted == false && x.IsEn == true )).OrderByDescending(x=>x.Checktime).FirstOrDefault();
                if (orderBiddingDetailCheck1 != null && orderBiddingDetailCheck1.Checktime >= DateTime.Now.AddMinutes(-10))
                {
                    throw Oops.Oh("两次打卡时间之间必须间隔超过10分钟!");
                }
            }
            //人脸识别
            if (App.Configuration["VerifyFace:Enable"].ObjToBool())
            {