小修改

username@email.com

2024-10-25 abe24f3ad638e033c0d13d6332ccae425d7d1ada

小修改

 cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs

@@ -101,7 +101,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;
@@ -545,8 +545,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))

 cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs

@@ -193,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;
@@ -266,7 +266,7 @@
            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;
@@ -640,8 +640,8 @@
                 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 )
                     .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))
@@ -919,7 +919,7 @@
            var order = await orderRes.GetByIdAsync(orderBidding.OrderId);

            
            if (order == null || order.OrderStatus > 1 || order.IsDeleted == true || order.IsEn == false )
            if (order == null || order.OrderStatus > 1 || order.IsDeleted == true)// || order.IsEn == false
            {
                throw Oops.Oh("该招工状态已无法打卡确认！");
            }