两次打卡必须超过10分钟！

username@email.com

2024-10-11 152f48ca3cae46bbffca3fa0af4bc9e8216fafff

 cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs

@@ -47,6 +47,13 @@
        [HttpPost]
        public async Task<PageResult<OrderDto>> PostListPage(OrderPageSearch page)
        {
            var UserID = App.User?.FindFirstValue("UserID");
            int userid = 0;
            if (!string.IsNullOrEmpty(UserID))
            {
                userid = int.Parse(UserID);
            }

            PageResult<OrderDto> result = new PageResult<OrderDto>();

            Expression<Func<Order, bool>> expression = t => true;
@@ -89,6 +96,36 @@
                    {
                        orderDto.OrderComName = userCompany.Suppliername;
                    }
                    if (userid > 0)
                    {
                        var orderBidding = await orderBiddingRepository.GetFirstAsync(x => x.OrderId == orderDto.Id && x.WorkerUserId == userid && x.IsEn == true && x.IsDeleted == false);
                        if (orderBidding != null)
                        {
                            if (!orderBidding.IsSelected.HasValue)
                            {
                                orderDto.IsSelectedName = "审核中";
                            }
                            else if (orderBidding.IsSelected.Value == true)
                            {
                                orderDto.IsSelectedName = "已确认";
                            }
                            else
                            {
                                orderDto.IsSelectedName = "不录用";
                            }
                           
                        }
                        else
                        {
                            orderDto.IsSelectedName = null;
                        }
                    }
                    else
                    {
                        orderDto.IsSelectedName = null;
                    }
                  

                }

            }
@@ -223,6 +260,7 @@
            var orderRes = new BaseRepository<Order>();
            var orderBiddingRes = new BaseRepository<OrderBidding>();
            var userWorkerRes = new BaseRepository<UserWorker>();
            var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
            var userRes = new BaseRepository<User>();
            var order = await orderRes.GetByIdAsync(orderid);
            orderDto = _mapper.Map<OrderDto>(order);
@@ -233,13 +271,30 @@
                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;

           var orderBidding = orderBiddings.Where(x => x.WorkerUserId == userid).FirstOrDefault();
            if (orderBidding != null)
            {
                var dangqianshijian = DateTime.Now.Date;
                //当前有效的工价
                var orderBiddingWorkPrices = await orderBiddingWorkPriceRepository.GetListAsync(x => x.OrderBiddingId == orderBidding.Id && x.IsEn == true && x.IsDeleted == false );

                orderBiddingWorkPrices = orderBiddingWorkPrices.OrderByDescending(x => x.Id).ToList();
                orderDto.orderBiddingWorkPrices = orderBiddingWorkPrices;
                var orderBiddingWorkPrice = orderBiddingWorkPrices.Where(x => x.EffectTime <= DateTime.Now.Date).FirstOrDefault();
                if (orderBiddingWorkPrice != null)
                {
                    orderDto.WorkPriceDangqian = orderBiddingWorkPrice.WorkPrice;
                }
                else
                {
                    orderDto.WorkPriceDangqian = orderDto.WorkPrice;
                }


                orderDto.IsSelected = orderBidding.IsSelected;
                if (!orderDto.IsSelected.HasValue)
                {
@@ -255,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)
            {
@@ -286,6 +341,23 @@
                    {
                        orderBiddingDto.WorkerName = userWorker.name;
                    }
                     
                        //当前有效的工价
                        var orderBiddingWorkPrices = await orderBiddingWorkPriceRepository.GetListAsync(x => x.OrderBiddingId == orderBiddingDto.Id && x.IsEn == true && x.IsDeleted == false);
                        orderBiddingWorkPrices = orderBiddingWorkPrices.OrderByDescending(x => x.Id).ToList();
                        orderBiddingDto.orderBiddingWorkPrices = orderBiddingWorkPrices;
                        var orderBiddingWorkPrice = orderBiddingWorkPrices.Where(x => x.EffectTime <= DateTime.Now.Date).FirstOrDefault();
                        if (orderBiddingWorkPrice != null)
                        {

                            orderBiddingDto.WorkPrice = orderBiddingWorkPrice.WorkPrice;
                        }
                        else
                        {
                            orderBiddingDto.WorkPrice = orderDto.WorkPrice;
                        }
                    
                   

                }
            }
@@ -470,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())
            {
@@ -551,7 +634,7 @@


            var orderBiddingDetailCheckRepository = new BaseRepository<OrderBiddingDetailCheck>();

            var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
            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 ,
@@ -578,6 +661,7 @@
                          IsShenPi = c.IsShenPi,
                          WorkCount = c.WorkCount,
                          Suppliername = d.Suppliername,
                          OrderBiddingId = c.OrderBiddingId,
                      })
                     
                    .ToPageListAsync(page.PageIndex, page.PageSize, total);
@@ -631,6 +715,12 @@
                    //如果当天还没有填写申请，则计算工作时间和工资
                    if(dakaDto.IsShenPi == 0)
                    {
                        //当前有效的工价
                        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;
                        }
                        dakaDto.WorkTime = hours+(minutes/60);
                        if(dakaDto.WorkerType == 0)
                        {
@@ -703,6 +793,7 @@
            var orderRes = new BaseRepository<Order>();
            var orderBiddingDetailRes = new BaseRepository<OrderBiddingDetail>();
            var OrderBiddingDetailCheckRes = new BaseRepository<OrderBiddingDetailCheck>();
            var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
            var userRes = new BaseRepository<User>();
            var userWorkerRes = new BaseRepository<UserWorker>();

@@ -766,7 +857,12 @@

                    }
                }

                //当前有效的工价
                var orderBiddingWorkPrice = (await orderBiddingWorkPriceRepository.GetListAsync(x => x.OrderBiddingId == orderBidding.Id && x.IsEn == true && x.IsDeleted == false && x.EffectTime <= orderDakaMingxiDto.WorkDate)).OrderByDescending(x => x.Id).FirstOrDefault();
                if (orderBiddingWorkPrice != null)
                {
                    orderDakaMingxiDto.WorkPrice = orderBiddingWorkPrice.WorkPrice;
                }
                orderDakaMingxiDto.WorkTime = hours + (minutes / 60);
                if (orderDakaMingxiDto.WorkerType == 0)
                {