Merge remote-tracking branch 'origin/master' into cyronghe

移动系统liao

2025-02-08 8c8404c55a863844cc674a8bedb2cfdb92c1c288

 cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs

@@ -6,6 +6,7 @@
using EzTencentCloud;
using Furion.LinqBuilder;
using MapsterMapper;
using Microsoft.IdentityModel.Tokens;
using Org.BouncyCastle.Asn1.X509;
using SqlSugar.Extensions;
using System;
@@ -46,11 +47,19 @@
        [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;

            expression = expression.And(t => t.IsDeleted == false && t.IsEn == true && t.OrderStatus == 0);
           // expression = expression.And(t => t.WordEndTime >= DateTime.Now.Date.AddDays(-30));
            if (!string.IsNullOrEmpty(page.OrderName))
            {
                expression = expression.And(t => t.OrderName.Contains(page.OrderName));
@@ -68,6 +77,7 @@
            var orderRepository = new BaseRepository<Order>();

            var orderBiddingRepository = new BaseRepository<OrderBidding>();
            var userCompanyRepository = new BaseRepository<UserCompany>();

            var data = await orderRepository.Context.Queryable<Order>()
                    .Where(expression)
@@ -81,6 +91,41 @@
                {
                    var orderBiddings = await orderBiddingRepository.CountAsync(x => x.OrderId == orderDto.Id && x.IsSelected == true && x.IsEn == true && x.IsDeleted == false);
                    orderDto.WorderCounted = orderBiddings;
                    var userCompany = await userCompanyRepository.GetFirstAsync(x => x.UserId == orderDto.OrderUserId && x.IsDeleted == false && x.IsEn == true);
                    if (userCompany != null)
                    {
                        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;
                    }
                  

                }

            }
@@ -134,6 +179,7 @@
            

            var orderBiddingRepository = new BaseRepository<OrderBidding>();
            var userCompanyRepository = new BaseRepository<UserCompany>();

            var data = await orderRepository.Context.Queryable<Order>()
                    .Where(expression)
@@ -147,7 +193,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;
@@ -161,14 +207,23 @@
                    if (orderBidding != null)
                    {
                        orderDto.IsSelected = orderBidding.IsSelected;
                        if (orderDto.IsSelected.HasValue && orderDto.IsSelected.Value)
                        if (!orderDto.IsSelected.HasValue  )
                        {
                            orderDto.IsSelectedName ="已确认";
                            orderDto.IsSelectedName = "审核中";
                        }
                        else if(orderDto.IsSelected.Value)
                        {
                            orderDto.IsSelectedName = "已确认";
                        }
                        else
                        {
                            orderDto.IsSelectedName = "未确认";
                            orderDto.IsSelectedName = "不录用";
                        }
                    }
                    var userCompany = await userCompanyRepository.GetFirstAsync(x => x.UserId == orderDto.OrderUserId && x.IsDeleted == false && x.IsEn == true);
                    if (userCompany != null)
                    {
                        orderDto.OrderComName = userCompany.Suppliername;
                    }
                }

@@ -204,55 +259,109 @@
            OrderDto orderDto = new OrderDto();
            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);
            if (order.IsDeleted == true)
            {
                throw Oops.Oh("订单已经删除无法查看！");
            }
            orderDto = _mapper.Map<OrderDto>(order);
            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 orderBiddingRes.GetListAsync(x => x.OrderId == orderDto.Id && x.IsEn == true && x.IsDeleted == 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 && orderDto.IsSelected.Value)
                if (!orderDto.IsSelected.HasValue)
                {
                    orderDto.IsSelectedName = "审核中";
                }
                else if (orderDto.IsSelected.Value)
                {
                    orderDto.IsSelectedName = "已确认";
                }
                else
                {
                    orderDto.IsSelectedName = "未确认";
                    orderDto.IsSelectedName = "不录用";
                }
            }


            orderBiddings = orderBiddings.Where(x => (x.IsSelected == null || x.IsSelected != false)).OrderBy(x=>x.IsSelected).ToList();
            var orderBiddingDtos = _mapper.Map<List<OrderBiddingDto>>(orderBiddings);
            if(orderBiddingDtos != null&& orderBiddingDtos.Count > 0)
            {
                foreach (var  orderBiddingDto in orderBiddingDtos)
                {
                    if (orderBiddingDto.IsSelected.HasValue && orderBiddingDto.IsSelected.Value)
                    if (!orderBiddingDto.IsSelected.HasValue)
                    {
                        orderBiddingDto.IsSelectedName = "审核中";
                    }
                    else if (orderBiddingDto.IsSelected.Value)
                    {
                        orderBiddingDto.IsSelectedName = "已确认";
                    }
                    else
                    {
                        orderBiddingDto.IsSelectedName = "未确认";
                        orderBiddingDto.IsSelectedName = "不录用";
                    }


                    var user = await userRes.GetByIdAsync(orderBiddingDto.WorkerUserId);
                   
                    if (user != null)
                    {
                        orderBiddingDto.WorkerName = user.name;
                        orderBiddingDto.WorkerAvatar = user.Avatar;
                    }
                    var userWorker = await userWorkerRes.GetFirstAsync(x => x.UserId == orderBiddingDto.WorkerUserId && x.IsEn == true && x.IsDeleted == false);
                    if (userWorker != null)
                    {
                        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;
                        }
                    
                   

                }
            }
@@ -278,7 +387,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);
@@ -294,9 +403,13 @@
            }

            var order = await orderRes.GetByIdAsync(baoMingDto.OrderId);
            if (order == null || order.OrderStatus>0)
            if (order == null || order.OrderStatus>0 || order.IsEn !=true )
            {
                throw Oops.Oh("该招工状态已经无法投递！");
            }
            if (order.OrderUserId == userid)
            {
                throw Oops.Oh("自己无法投递自己发布的招工！");
            }

            bool res;
@@ -320,10 +433,10 @@
                OrderBidding orderBidding1 = new OrderBidding();
                orderBidding1.WorkerUserId = userid;
                orderBidding1.OrderId = baoMingDto.OrderId;
                orderBidding1.IsSelected = false;
                orderBidding1.UpDataBy = ITCode;
                orderBidding1.IsSelected = null;
                orderBidding1.UpDataBy = NickName;
                orderBidding1.UpDataTime = DateTime.Now;
                orderBidding1.CreateBy = ITCode;
                orderBidding1.CreateBy = NickName;
                orderBidding1.CreateTime = DateTime.Now;

                res = await orderBiddingRes.InsertAsync(orderBidding1);
@@ -343,7 +456,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 +468,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 +488,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 +511,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,24 +522,41 @@
            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)
            {
                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())
            {
@@ -434,7 +570,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 +588,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 +599,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);

@@ -502,18 +638,22 @@


            var orderBiddingDetailCheckRepository = new BaseRepository<OrderBiddingDetailCheck>();

            var data = await orderRepository.Context.Queryable<Order, OrderBidding, OrderBiddingDetail>((a, b ,c) =>
            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
                 JoinType.Inner, b.Id == c.OrderBiddingId ,
                  JoinType.Inner, a.OrderUserId == d.UserId 
                ))
                     .Where((a, b, c) => a.IsEn == true && a.IsDeleted == false && b.IsEn == true && b.IsDeleted == false && c.IsEn == true && c.IsDeleted == false
                     && b.IsSelected == true && b.WorkerUserId == userid)
                      .WhereIF(page.WordDate.HasValue, (a, b, c) => (c.WorkDate == page.WordDate))
                      .WhereIF(page.IsJieSuan.HasValue && page.IsJieSuan == true, (a, b, c) => (c.IsShenPi == 2))
                        .WhereIF(page.IsJieSuan.HasValue && page.IsJieSuan == false, (a, b, c) => (c.IsShenPi < 2))
                        .OrderByDescending((a, b, c) => c.WorkDate)
                      .Select((a, b, c) => new OrderDakaDto
                     .Where((a, b, c, d) =>  a.IsDeleted == false && b.IsEn == true && b.IsDeleted == false && c.IsEn == true && c.IsDeleted == false
                     && b.IsSelected == true && b.WorkerUserId == userid && d.IsEn == true && d.IsDeleted == false) //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))
                      .WhereIF(page.IsJieSuan.HasValue && page.IsJieSuan == true, (a, b, c, d) => (c.IsShenPi == 2))
                        .WhereIF(page.IsJieSuan.HasValue && page.IsJieSuan == false, (a, b, c, d) => (c.IsShenPi < 2))
                         .WhereIF(!string.IsNullOrEmpty(page.Suppliername), (a, b, c, d) =>d.Suppliername.Contains(page.Suppliername))
                        .OrderByDescending((a, b, c, d) => c.WorkDate)
                      .Select((a, b, c, d) => new OrderDakaDto
                      {
                          OrderBiddingDetailId = c.Id,
                          OrderName = a.OrderName,
@@ -524,10 +664,29 @@
                          TodaySalary = c.TodaySalary,
                          IsShenPi = c.IsShenPi,
                          WorkCount = c.WorkCount,

                          Suppliername = d.Suppliername,
                          OrderBiddingId = c.OrderBiddingId,
                      })
                     
                    .ToPageListAsync(page.PageIndex, page.PageSize, total);




            var heji =  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,
                 JoinType.Inner, a.OrderUserId == 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 && b.WorkerUserId == userid && d.IsEn == true && d.IsDeleted == false)
                     .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))
                     .WhereIF(page.IsJieSuan.HasValue && page.IsJieSuan == true, (a, b, c, d) => (c.IsShenPi == 2))
                       .WhereIF(page.IsJieSuan.HasValue && page.IsJieSuan == false, (a, b, c, d) => (c.IsShenPi < 2))
                        .WhereIF(!string.IsNullOrEmpty(page.Suppliername), (a, b, c, d) => d.Suppliername.Contains(page.Suppliername))
                     .Sum((a, b, c, d) => c.TodaySalary);

            if (data != null && data.Count > 0)
            {
@@ -560,6 +719,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)
                        {
@@ -584,7 +749,7 @@
                    switch (dakaDto.WorkerType)
                    {
                        case (int)WorkerTypes.time: dakaDto.WorkerTypeName = "计时"; break;
                        case (int)WorkerTypes.count: dakaDto.WorkerTypeName = "计价"; break;
                        case (int)WorkerTypes.count: dakaDto.WorkerTypeName = "计件"; break;
                        default: break;
                    }

@@ -601,7 +766,7 @@
            result.PageIndex = page.PageIndex;
            result.PageSize = page.PageSize;
            result.TotalCount = total;

            result.Heji = heji ?? 0;
            return result;
        }

@@ -620,7 +785,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);
@@ -632,8 +797,9 @@
            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>();

            var orderBiddingDetail = await orderBiddingDetailRes.GetByIdAsync(dakaDetailDto.OrderBiddingDetailId);
            var orderBidding = await orderBiddingRes.GetByIdAsync(orderBiddingDetail.OrderBiddingId);
@@ -650,15 +816,19 @@
            orderDakaMingxiDto.WorkPrice = order.WorkPrice;
            orderDakaMingxiDto.TodaySalary = orderBiddingDetail.TodaySalary;
            orderDakaMingxiDto.IsShenPi = orderBiddingDetail.IsShenPi;
            orderDakaMingxiDto.ShenPitime = orderBiddingDetail.ShenPitime;
            orderDakaMingxiDto.WorkCount = orderBiddingDetail.WorkCount;
            orderDakaMingxiDto.WorkerUserId = orderBidding.WorkerUserId;
            var user = await userRes.GetByIdAsync(orderDakaMingxiDto.WorkerUserId);
            if (user != null)
            {
                orderDakaMingxiDto.WorkerUserName = user.name;
                orderDakaMingxiDto.WorkerUserAvatar = user.Avatar;
            }
               
            var userWorker = await userWorkerRes.GetFirstAsync(x => x.UserId == orderDakaMingxiDto.WorkerUserId && x.IsEn == true && x.IsDeleted == false);
            if (userWorker != null)
            {
                orderDakaMingxiDto.WorkerUserName = userWorker.name;
            }


            switch (orderDakaMingxiDto.IsShenPi)
@@ -672,7 +842,7 @@
            switch (orderDakaMingxiDto.WorkerType)
            {
                case (int)WorkerTypes.time: orderDakaMingxiDto.WorkerTypeName = "计时"; break;
                case (int)WorkerTypes.count: orderDakaMingxiDto.WorkerTypeName = "计价"; break;
                case (int)WorkerTypes.count: orderDakaMingxiDto.WorkerTypeName = "计件"; break;
                default: break;
            }

@@ -692,7 +862,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)
                {
@@ -724,7 +899,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 +911,40 @@
            //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;
            if(order.WorkerType == (int)WorkerTypes.count)
            {
                orderBiddingDetail.TodaySalary = dakaDto.WorkCount * order.WorkPrice;
            }
            else
            {
                orderBiddingDetail.TodaySalary = dakaDto.TodaySalary;
            }
           
            orderBiddingDetail.IsShenPi = (int)IsShenPis.tijiao;
            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 +956,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;
        }



    }
}