username@email.com
2024-10-29 5a72c00dca19dd6dd9be9db9e14f00f512f93f02
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;
@@ -226,6 +226,14 @@
            }
            else
            {
                if (orderDto.OldId > 0)
                {
                    //删除旧的下架订单
                    var order1 = await orderRes.GetByIdAsync(orderDto.OldId);
                    order1.IsDeleted = true;
                    res = await orderRes.UpdateAsync(order1);
                }
                var order = _mapper.Map<Order>(orderDto);
                order.UpDataBy = NickName;
                order.UpDataTime = DateTime.Now;
@@ -545,8 +553,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))