修改上下架，自己安排工作时间，员工工资统计查询

username@email.com

2024-09-30 18590e3512d2d348e5149ee2bb3018c28c9a5b22

修改上下架，自己安排工作时间，员工工资统计查询

 cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs

@@ -198,6 +198,63 @@
        /// </summary>
        public List<OrderBiddingDto> orderBidding { get; set; }



        /// <summary>
        /// 自行安排工作时间
        /// </summary>
        public bool? Zixinganpai { get; set; }


        /// <summary>
        /// 工作开始日期名称
        /// </summary>
        public string ZixinganpaiName
        {
            get
            {
                if (this.Zixinganpai.HasValue)
                {
                    // 可以添加自己的逻辑
                    return "自行安排工作时间";
                }
                else
                {
                    return "";
                }


            }
        }


        /// <summary>
        /// 是否有效
        /// </summary>
        public bool IsEn { get; set; }


        /// <summary>
        /// 工作开始日期名称
        /// </summary>
        public string IsEnName
        {
            get
            {
                if (this.IsEn)
                {
                    // 可以添加自己的逻辑
                    return "已上架";
                }
                else
                {
                    return "已下架";
                }


            }
        }

    }



 cylsg/cylsg.Application/Orders/Dtos/PageBaseSearch.cs

@@ -77,6 +77,11 @@
        /// 工作结束时间
        /// </summary>
        public DateTime? WordEndTime { get; set; }

        /// <summary>
        /// 是否有效
        /// </summary>
        public bool? IsEn { get; set; } 
    }


@@ -113,5 +118,16 @@
        /// 公司名称
        /// </summary>
        public string Suppliername { get; set; }


        /// <summary>
        /// 工人名字
        /// </summary>
        public string WorkerUserName { get; set; }

        /// <summary>
        /// 工人id
        /// </summary>
        public int  WorkerUserId { get; set; }
    }
}

 cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs

@@ -63,7 +63,7 @@

            Expression<Func<Order, bool>> expression = t => true;

            expression = expression.And(t => t.IsDeleted == false && t.IsEn == true
            expression = expression.And(t => t.IsDeleted == false /*&& t.IsEn == true*/
            && userids.Contains(t.OrderUserId)); //t.OrderUserId == userid

            if (!string.IsNullOrEmpty(page.OrderName))
@@ -78,6 +78,11 @@
            {
                expression = expression.And(t => t.WordStartTime <= page.WordEndTime);
            }
            if (page.IsEn.HasValue)
            {
                expression = expression.And(t => t.IsEn == page.IsEn);
            }
            

            RefAsync<int> total = 0;

@@ -161,18 +166,32 @@

            var orderRes = new BaseRepository<Order>();
            bool res;
            if (!orderDto.Zixinganpai.HasValue)
            {
                orderDto.Zixinganpai = false;
            }
            if (orderDto.Id > 0)
            {
                var order = await orderRes.GetByIdAsync(orderDto.Id);
                if (order.OrderStatus > 0)
                if (order.OrderStatus > 0 && order.IsEn == true)
                {
                    throw Oops.Oh("招工已经结束不能修改！");
                }
                var orderBiddingRes = new BaseRepository<OrderBidding>();
                var count = await orderBiddingRes.CountAsync(x=>x.OrderId == orderDto.Id && x.IsEn == true && x.IsDeleted == true && x.IsSelected == true);
                if (count > 0)
                if (count > 0 && order.IsEn == true)
                {
                    throw Oops.Oh("已经确认招工人员，不能修改！");
                }


                if (order.IsEn == false)
                {
                    var orderBiddings = await orderBiddingRes.GetListAsync(x => x.OrderId == orderDto.Id);
                    foreach (var orderBidding in orderBiddings)
                    {
                        res = await orderBiddingRes.DeleteByIdAsync(orderBidding.Id);
                    }
                }

                order.OrderName = orderDto.OrderName;
@@ -186,11 +205,14 @@
                order.ContactPhone = orderDto.ContactPhone;
                order.WorkerType = orderDto.WorkerType;
                order.WorkPrice = orderDto.WorkPrice;


                order.OrderStatus = 0;
                order.IsEn = true;
                order.UpDataBy = NickName;
                order.UpDataTime = DateTime.Now;
                res = await orderRes.UpdateAsync(order);


                


            }
@@ -203,6 +225,7 @@
                order.CreateTime = DateTime.Now;
                order.OrderStatus = 0;
                order.OrderUserId = userid;
                order.IsEn = true;
                res = await orderRes.InsertAsync(order);
            }

@@ -283,6 +306,63 @@


        /// <summary>
        /// 公司不录用一个工人
        /// </summary>
        /// <returns></returns>
        [Authorize]
        [HttpPost]
        public async Task<bool> saveBuLuYong(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.IsSelected = false;
            //orderBidding.Selectedtime = DateTime.Now;
            orderBidding.UpDataBy = NickName;
            orderBidding.UpDataTime = DateTime.Now;


            res = await orderBiddingRes.UpdateAsync(orderBidding);

         

            return res;
        }



        /// <summary>
        /// 公司取消选择工人
        /// </summary>
        /// <returns></returns>
@@ -325,7 +405,7 @@

            bool res;

            orderBidding.IsSelected = false;
            orderBidding.IsSelected = null;
            orderBidding.Selectedtime = null;
            orderBidding.UpDataBy = NickName;
            orderBidding.UpDataTime = DateTime.Now;
@@ -378,17 +458,22 @@

            var orderBiddingDetailCheckRepository = new BaseRepository<OrderBiddingDetailCheck>();
            var userWorkerRes = new BaseRepository<UserWorker>();
            var data = await orderRepository.Context.Queryable<Order, OrderBidding, OrderBiddingDetail>((a, b, c) =>
            var data = await orderRepository.Context.Queryable<Order, OrderBidding, OrderBiddingDetail, UserWorker>((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, b.WorkerUserId == d.UserId 
                ))
                     .Where((a, b, c) => a.IsEn == true && a.IsDeleted == false && b.IsEn == true && b.IsDeleted == false && c.IsEn == true && c.IsDeleted == false
                     .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
                      .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))
                      .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.WorkerUserName), (a, b, c, d) => (d.name.Contains(page.WorkerUserName)))
                          .WhereIF(page.WorkerUserId >0 , (a, b, c, d) => (b.WorkerUserId == page.WorkerUserId)) 
                          .OrderByDescending((a,b,c) => c.WorkDate)
                      .Select((a, b, c) => new OrderDakaDto
                      .Select((a, b, c, d) => new OrderDakaDto
                      {
                          OrderBiddingDetailId = c.Id,
                          OrderName = a.OrderName,
@@ -400,9 +485,28 @@
                          IsShenPi = c.IsShenPi,
                          WorkCount = c.WorkCount,
                          WorkerUserId = b.WorkerUserId,
                          WorkerUserName = d.name,
                      })
                      
                    .ToPageListAsync(page.PageIndex, page.PageSize, total);



            var heji =  orderRepository.Context.Queryable<Order, OrderBidding, OrderBiddingDetail, UserWorker>((a, b, c, d) =>
                new JoinQueryInfos(JoinType.Inner, a.Id == b.OrderId,
                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
                     .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.WorkerUserName), (a, b, c, d) => (d.name.Contains(page.WorkerUserName)))
                          .WhereIF(page.WorkerUserId > 0, (a, b, c, d) => (b.WorkerUserId == page.WorkerUserId))
                     .Sum((a, b, c, d) => c.TodaySalary);

            if (data != null && data.Count > 0)
            {
@@ -450,9 +554,9 @@

                    switch (dakaDto.IsShenPi)
                    {
                        case (int)IsShenPis.baocun: dakaDto.IsShenPiName = "未结算"; break;
                        case (int)IsShenPis.tijiao: dakaDto.IsShenPiName = "未结算"; break;
                        case (int)IsShenPis.yishenpi: dakaDto.IsShenPiName = "已结算"; break;
                        case (int)IsShenPis.baocun: dakaDto.IsShenPiName = "未审核"; break;
                        case (int)IsShenPis.tijiao: dakaDto.IsShenPiName = "未审核"; break;
                        case (int)IsShenPis.yishenpi: dakaDto.IsShenPiName = "已审核"; break;
                        default: break;
                    }

@@ -470,11 +574,11 @@
                    dakaDto.DakaMingxi = DakaMingxi;


                    var userWorker = await userWorkerRes.GetFirstAsync(x => x.UserId == dakaDto.WorkerUserId && x.IsEn == true && x.IsDeleted == false );
                    if (userWorker != null)
                    {
                        dakaDto.WorkerUserName = userWorker.name;
                    }
                    //var userWorker = await userWorkerRes.GetFirstAsync(x => x.UserId == dakaDto.WorkerUserId && x.IsEn == true && x.IsDeleted == false );
                    //if (userWorker != null)
                    //{
                    //    dakaDto.WorkerUserName = userWorker.name;
                    //}

                }

@@ -483,7 +587,7 @@
            result.PageIndex = page.PageIndex;
            result.PageSize = page.PageSize;
            result.TotalCount = total;

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

@@ -761,22 +865,108 @@
                userid = int.Parse(UserID);
            }

            var orderBiddingRes = new BaseRepository<OrderBidding>();
            //var orderBiddingRes = new BaseRepository<OrderBidding>();
            var orderRes = new BaseRepository<Order>();
            var userWorkerRes = new BaseRepository<UserWorker>();
            //var userWorkerRes = new BaseRepository<UserWorker>();
           

            var order = await orderRes.GetByIdAsync(baoMingDto.OrderId);
            if (order.OrderStatus > 0)
            {
                throw Oops.Oh("已经招工完毕或者结算，无法删除");
                throw Oops.Oh("已经招工完毕或者结算，无法下架");
            }

            bool res;
            order.IsEn = false;
            order.UpDataBy = NickName;
            order.UpDataTime = DateTime.Now;

            res = await orderRes.DeleteAsync(order);
            res = await orderRes.UpdateAsync(order);

            return res;
        }




        /// <summary>
        /// 查询公司下工人的工资额度
        /// </summary>
        /// <param name="page"></param>
        /// <returns></returns>
        [Authorize]
        [HttpPost]
        public async Task<PageResult<OrderDakaDto>> PostMyComGongZiListPage(OrderDakaPageSearch page)
        {
            var UserID = App.User?.FindFirstValue("UserID");
            int userid = 0;
            if (!string.IsNullOrEmpty(UserID))
            {
                userid = int.Parse(UserID);
            }

            PageResult<OrderDakaDto> result = new PageResult<OrderDakaDto>();
            var orderRepository = new BaseRepository<Order>();
            var userCompanyRes = new BaseRepository<UserCompany>();
            //查询公司的所有员工的所有招工订单
            var userCompany = await userCompanyRes.GetFirstAsync(x => x.UserId == userid && x.IsEn == true && x.IsDeleted == false);
            if (userCompany == null)
            {
                throw Oops.Oh("你没有公司！");
            }
            var userCompanies = await userCompanyRes.GetListAsync(x => x.Suppliercode == userCompany.Suppliercode && x.IsEn == true && x.IsDeleted == false);
            var userids = userCompanies.Select(x => x.UserId).ToList();

            RefAsync<int> total = 0;


            var orderBiddingDetailCheckRepository = new BaseRepository<OrderBiddingDetailCheck>();
            var userWorkerRes = new BaseRepository<UserWorker>();
            var data = await orderRepository.Context.Queryable<Order, OrderBidding, OrderBiddingDetail, UserWorker>((a, b, c, d) =>
                 new JoinQueryInfos(JoinType.Inner, a.Id == b.OrderId,
                 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 && c.IsShenPi == 2 && userids.Contains(a.OrderUserId)) //a.OrderUserId == userid
                      .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(!string.IsNullOrEmpty(page.WorkerUserName), (a, b, c, d) => (d.name.Contains(page.WorkerUserName)))
                       .GroupBy((a, b, c, d) => new { b.WorkerUserId, d.name })

                      .Select((a, b, c, d) => new OrderDakaDto
                      {

                          TodaySalary = SqlFunc.AggregateSumNoNull(c.TodaySalary),
                          WorkerUserId = b.WorkerUserId,
                          WorkerUserName = d.name,
                      })

                    .ToPageListAsync(page.PageIndex, page.PageSize, total);




            var heji = orderRepository.Context.Queryable<Order, OrderBidding, OrderBiddingDetail, UserWorker>((a, b, c, d) =>
                 new JoinQueryInfos(JoinType.Inner, a.Id == b.OrderId,
                 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 && c.IsShenPi == 2 && userids.Contains(a.OrderUserId)) //a.OrderUserId == userid
                      .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(!string.IsNullOrEmpty(page.WorkerUserName), (a, b, c, d) => (d.name.Contains(page.WorkerUserName)))
                      .Sum((a, b, c, d) => c.TodaySalary);

            result.Items = data;
            result.PageIndex = page.PageIndex;
            result.PageSize = page.PageSize;
            result.TotalCount = total;
            result.Heji = heji ?? 0;
            return result;
        }
    }
}

 cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs

@@ -170,13 +170,17 @@
                    if (orderBidding != null)
                    {
                        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 = "不录用";
                        }
                    }
                    var userCompany = await userCompanyRepository.GetFirstAsync(x => x.UserId == orderDto.OrderUserId && x.IsDeleted == false && x.IsEn == true);
@@ -229,7 +233,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);
            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;

@@ -237,13 +241,17 @@
            if (orderBidding != null)
            {
                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 = "不录用";
                }
            }

@@ -253,14 +261,19 @@
            {
                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);
                   
@@ -314,7 +327,7 @@
            }

            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("该招工状态已经无法投递！");
            }
@@ -344,7 +357,7 @@
                OrderBidding orderBidding1 = new OrderBidding();
                orderBidding1.WorkerUserId = userid;
                orderBidding1.OrderId = baoMingDto.OrderId;
                orderBidding1.IsSelected = false;
                orderBidding1.IsSelected = null;
                orderBidding1.UpDataBy = NickName;
                orderBidding1.UpDataTime = DateTime.Now;
                orderBidding1.CreateBy = NickName;

 cylsg/cylsg.Model/OrderModel/Order.cs

@@ -110,6 +110,13 @@
        /// </summary>
        [SugarColumn(ColumnDescription = "招工状态", IsNullable = true)]
        public int? OrderStatus { get; set; }


        /// <summary>
        /// 自行安排工作时间
        /// </summary>
        [SugarColumn(ColumnDescription = "自行安排工作时间", IsNullable = true,DefaultValue = "0")]
        public bool? Zixinganpai { get; set; }
    }