cylsg/cylsg.Application/Orders/Dtos/Mapper.cs
New file @@ -0,0 +1,28 @@ using cylsg.Model.OrderModel; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace cylsg.Application.Orders.Dtos { public class Mapper : IRegister { public void Register(TypeAdapterConfig config) { config.ForType<Order, OrderDto>(); config.ForType<OrderDto, Order>(); config.ForType<OrderBidding, OrderBiddingDto>(); config.ForType<OrderBiddingDto, OrderBidding>(); config.ForType<OrderBiddingDetail, OrderBiddingDetailDto>(); config.ForType<OrderBiddingDetailDto, OrderBiddingDetail>(); config.ForType<OrderBiddingDetailCheck, OrderBiddingDetailCheckDto>(); config.ForType<OrderBiddingDetailCheckDto, OrderBiddingDetailCheck>(); } } } cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
New file @@ -0,0 +1,504 @@ using cylsg.Model.OrderModel; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace cylsg.Application.Orders.Dtos { public class OrderDto { /// <summary> /// 招工Id /// </summary> public int Id { get; set; } /// <summary> /// 招工用户id /// </summary> public int OrderUserId { get; set; } /// <summary> /// 招工名称 /// </summary> public string OrderName { get; set; } /// <summary> /// 工作开始时间 /// </summary> public DateTime? WordStartTime { get; set; } /// <summary> /// 工作结束时间 /// </summary> public DateTime? WordEndTime { get; set; } /// <summary> /// 需求 /// </summary> public string Demand { get; set; } /// <summary> /// 招工人数 /// </summary> public int? WorderCount { get; set; } /// <summary> /// 已招工人数 /// </summary> public int WorderCounted { get; set; } /// <summary> /// 工作地点 /// </summary> public string WorderAddress { get; set; } /// <summary> /// 联系电话 /// </summary> public string ContactPhone { get; set; } /// <summary> /// 工作方式 /// </summary> public int? WorkerType { get; set; } /// <summary> /// 工价 /// </summary> public decimal? WorkPrice { get; set; } /// <summary> /// 招工状态 /// </summary> public int? OrderStatus { get; set; } /// <summary> /// 是否选中 /// </summary> public string OrderStatusName { get; set; } /// <summary> /// 是否选中 /// </summary> public bool? IsSelected { get; set; } /// <summary> /// 是否选中 /// </summary> public string IsSelectedName { get; set; } /// <summary> /// 招工明细 /// </summary> public List<OrderBiddingDto> orderBidding { get; set; } } /// <summary> /// 招工明细 /// </summary> public class OrderBiddingDto() { /// <summary> /// 工人投递Id /// </summary> public int Id { get; set; } /// <summary> /// 用户id /// </summary> public int WorkerUserId { get; set; } /// <summary> /// 用户昵称 /// </summary> public string WorkerName { get; set; } /// <summary> /// 用户昵称 /// </summary> public string WorkerAvatar { get; set; } /// <summary> /// 招工id /// </summary> public int OrderId { get; set; } /// <summary> /// 是否选中 /// </summary> public bool? IsSelected { get; set; } /// <summary> /// 是否选中 /// </summary> public string IsSelectedName { get; set; } /// <summary> /// 选中时间 /// </summary> public DateTime? Selectedtime { get; set; } /// <summary> /// 备注 /// </summary> public string Remark { get; set; } /// <summary> /// 工资总额 /// </summary> public decimal? Salary { get; set; } } public class BaoMingDto { /// <summary> /// 招工OrderId /// </summary> public int OrderId { get; set; } } public class QueRenDto { /// <summary> /// 招工明细OrderBiddingId /// </summary> public int OrderBiddingId { get; set; } } public class DakaDetailDto { /// <summary> /// 招工明细OrderBiddingId /// </summary> public int OrderBiddingDetailId { get; set; } } public class DakaDto { /// <summary> /// 招工明细OrderBiddingId /// </summary> public int OrderBiddingId { get; set; } /// <summary> /// 打卡照片 /// </summary> public string CheckPhoto { get; set; } } public class OrderBiddingDetailDto { /// <summary> /// 工人工作明细表Id /// </summary> public int OrderBiddingDetailId { get; set; } /// <summary> /// 工人投递id /// </summary> public int OrderBiddingId { get; set; } /// <summary> /// 工作日期 /// </summary> public DateTime? WorkDate { get; set; } /// <summary> /// 工作时长 /// </summary> public decimal? WorkTime { get; set; } /// <summary> /// 计件数量 /// </summary> public decimal? WorkCount { get; set; } /// <summary> /// 当日工资 /// </summary> public decimal? TodaySalary { get; set; } /// <summary> /// 审批状态 /// </summary> public int? IsShenPi { get; set; } /// <summary> /// 审批时间 /// </summary> public DateTime? ShenPitime { get; set; } /// <summary> /// 是否提现 /// </summary> public bool? IsTiXian { get; set; } /// <summary> /// 提现时间 /// </summary> public DateTime? TiXiantime { get; set; } /// <summary> /// 打卡明细 /// </summary> public List<OrderBiddingDetailCheckDto> orderBiddingDetailCheck { get; set; } } public class OrderBiddingDetailCheckDto { /// <summary> /// 打卡记录表Id /// </summary> public int OrderBiddingDetailCheckId { get; set; } /// <summary> /// 工人工作明细表Id /// </summary> public int OrderBiddingDetailId { get; set; } /// <summary> /// 打卡照片 /// </summary> public string CheckPhoto { get; set; } /// <summary> /// 打卡时间 /// </summary> public DateTime? Checktime { get; set; } } public class OrderDakaDto { /// <summary> /// 招工打卡Id /// </summary> public int OrderBiddingDetailId { get; set; } /// <summary> /// 招工名称 /// </summary> public string OrderName { get; set; } /// <summary> /// 工作日期 /// </summary> public DateTime? WorkDate { get; set; } /// <summary> /// 工作时长 /// </summary> public decimal? WorkTime { get; set; } /// <summary> /// 工作方式 /// </summary> public int? WorkerType { get; set; } /// <summary> /// 工作方式名称 /// </summary> public string WorkerTypeName { get; set; } /// <summary> /// 工价 /// </summary> public decimal? WorkPrice { get; set; } /// <summary> /// 计件数量 /// </summary> public decimal? WorkCount { get; set; } /// <summary> /// 当日工资 /// </summary> public decimal? TodaySalary { get; set; } /// <summary> /// 审批状态 /// </summary> public int? IsShenPi { get; set; } /// <summary> /// 审批状态名称 /// </summary> public string IsShenPiName { get; set; } /// <summary> /// 打卡明细 /// </summary> public string DakaMingxi { get; set; } } public class OrderDakaMingxiDto { /// <summary> /// 招工打卡Id /// </summary> public int OrderBiddingDetailId { get; set; } /// <summary> /// 招工名称 /// </summary> public string OrderName { get; set; } /// <summary> /// 工作日期 /// </summary> public DateTime? WorkDate { get; set; } /// <summary> /// 工作时长 /// </summary> public decimal? WorkTime { get; set; } /// <summary> /// 工作方式 /// </summary> public int? WorkerType { get; set; } /// <summary> /// 工作方式名称 /// </summary> public string WorkerTypeName { get; set; } /// <summary> /// 工价 /// </summary> public decimal? WorkPrice { get; set; } /// <summary> /// 计件数量 /// </summary> public decimal? WorkCount { get; set; } /// <summary> /// 当日工资 /// </summary> public decimal? TodaySalary { get; set; } /// <summary> /// 审批状态 /// </summary> public int? IsShenPi { get; set; } /// <summary> /// 审批状态名称 /// </summary> public string IsShenPiName { get; set; } /// <summary> /// 用户id /// </summary> public int WorkerUserId { get; set; } /// <summary> /// 用户昵称 /// </summary> public string WorkerUserName { get; set; } /// <summary> /// 用户头像 /// </summary> public string WorkerUserAvatar { get; set; } /// <summary> /// 打卡明细 /// </summary> public List<OrderBiddingDetailCheckDto> orderBiddingDetailCheck { get; set; } } public class DakaQuerenDetailDto { /// <summary> /// 招工打卡Id /// </summary> public int OrderBiddingDetailId { get; set; } /// <summary> /// 工作时长 /// </summary> public decimal? WorkTime { get; set; } /// <summary> /// 计件数量 /// </summary> public decimal? WorkCount { get; set; } /// <summary> /// 当日工资 /// </summary> public decimal? TodaySalary { get; set; } } } cylsg/cylsg.Application/Orders/Dtos/PageBaseSearch.cs
New file @@ -0,0 +1,97 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace cylsg.Application.Orders.Dtos { public class PageBaseSearch { /// <summary> /// 页码 /// </summary> public int PageIndex { get; set; } = 1; /// <summary> /// 分页大小 /// </summary> public int PageSize { get; set; } = 20; } /// <summary> /// 分页数据信息 /// </summary> /// <typeparam name="T"></typeparam> public class PageResult<T> { /// <summary> /// 页码 /// </summary> public int PageIndex { get; set; } /// <summary> /// 分页大小 /// </summary> public int PageSize { get; set; } /// <summary> /// 记录总数 /// </summary> public int TotalCount { get; set; } /// <summary> /// 记录集合 /// </summary> public List<T> Items { get; set; } = new(); /// <summary> /// 总页数 /// </summary> public int TotalPage { get; set; } } /// <summary> /// 招工订单分页查询 /// </summary> public class OrderPageSearch : PageBaseSearch { /// <summary> /// 招工名称 /// </summary> public string OrderName { get; set; } /// <summary> /// 工作开始时间 /// </summary> public DateTime? WordStartTime { get; set; } /// <summary> /// 工作结束时间 /// </summary> public DateTime? WordEndTime { get; set; } } /// <summary> /// 招工订单分页查询 /// </summary> public class OrderDakaPageSearch : PageBaseSearch { /// <summary> /// 工作日期 /// </summary> public DateTime? WordDate { get; set; } /// <summary> /// 是否结算 /// </summary> public bool? IsJieSuan { get; set; } } } cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
New file @@ -0,0 +1,530 @@ using cylsg.Application.Orders.Dtos; using cylsg.Application.Users.Dtos; using cylsg.Core; using cylsg.Model.OrderModel; using cylsg.Model.UserModel; using Furion.LinqBuilder; using MapsterMapper; using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Security.Claims; using System.Text; using System.Threading.Tasks; namespace cylsg.Application.Orders { /// <summary> /// 订单公司接口 /// </summary> public class OrderCompanyAppService : IDynamicApiController { private readonly ISystemService _systemService; private ISqlSugarClient _sqlSugarClient; private IMapper _mapper; public OrderCompanyAppService(ISystemService systemService, ISqlSugarClient sqlSugarClient, IMapper mapper) { _systemService = systemService; _sqlSugarClient = sqlSugarClient; _mapper = mapper; } /// <summary> /// 查询公司已经发布的招工订单 /// </summary> /// <param name="page"></param> /// <returns></returns> [Authorize] [HttpPost] public async Task<PageResult<OrderDto>> PostMyListPage(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>(); var orderRepository = new BaseRepository<Order>(); Expression<Func<Order, bool>> expression = t => true; expression = expression.And(t => t.IsDeleted == false && t.IsEn == true && t.OrderUserId == userid); if (!string.IsNullOrEmpty(page.OrderName)) { expression = expression.And(t => t.OrderName.Contains(page.OrderName)); } if (page.WordStartTime.HasValue) { expression = expression.And(t => t.WordStartTime >= page.WordStartTime); } if (page.WordEndTime.HasValue) { expression = expression.And(t => t.WordStartTime <= page.WordEndTime); } RefAsync<int> total = 0; var orderBiddingRepository = new BaseRepository<OrderBidding>(); var data = await orderRepository.Context.Queryable<Order>() .Where(expression) .OrderByDescending(c => c.WordStartTime) .ToPageListAsync(page.PageIndex, page.PageSize, total); var datadto = _mapper.Map<List<OrderDto>>(data); if (datadto != null && datadto.Count > 0) { foreach (var orderDto in datadto) { switch (orderDto.OrderStatus) { 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 orderBiddingRepository.CountAsync(x => x.OrderId == orderDto.Id && x.IsSelected == true && x.IsEn == true && x.IsDeleted == false); orderDto.WorderCounted = orderBiddings; } } result.Items = datadto; result.PageIndex = page.PageIndex; result.PageSize = page.PageSize; result.TotalCount = total; return result; } /// <summary> /// 保存招工信息（新增/修改） /// </summary> /// <returns></returns> [Authorize] [HttpPost] public async Task<bool> saveOrder(OrderDto orderDto) { var UserID = App.User?.FindFirstValue("UserID"); int userid = 0; string ITCode = App.User?.FindFirstValue("ITCode"); if (!string.IsNullOrEmpty(UserID)) { userid = int.Parse(UserID); } var userCompanyRes = new BaseRepository<UserCompany>(); var userCompany = await userCompanyRes.GetFirstAsync(p => p.UserId == userid && p.IsEn == true && p.IsDeleted == false); if (userCompany == null || string.IsNullOrEmpty(userCompany.BusinessLicense)) { throw Oops.Oh("请先完成公司认证才能发布招工！"); } var orderRes = new BaseRepository<Order>(); bool res; if (orderDto.Id > 0) { var order = await orderRes.GetByIdAsync(orderDto.Id); if (order.OrderStatus > 0) { throw Oops.Oh("招工已经结束不能修改！"); } order.OrderName = orderDto.OrderName; order.WordStartTime = orderDto.WordStartTime; order.WordEndTime = orderDto.WordEndTime; order.Demand = orderDto.Demand; order.WorderCount = orderDto.WorderCount; order.WorderAddress = orderDto.WorderAddress; order.ContactPhone = orderDto.ContactPhone; order.WorkerType = orderDto.WorkerType; order.WorkPrice = orderDto.WorkPrice; order.UpDataBy = ITCode; order.UpDataTime = DateTime.Now; res = await orderRes.UpdateAsync(order); } else { var order = _mapper.Map<Order>(orderDto); order.UpDataBy = ITCode; order.UpDataTime = DateTime.Now; order.CreateBy = ITCode; order.CreateTime = DateTime.Now; order.OrderStatus = 0; order.OrderUserId = userid; res = await orderRes.InsertAsync(order); } return res; } /// <summary> /// 公司选择工人 /// </summary> /// <returns></returns> [Authorize] [HttpPost] public async Task<bool> saveQueRen(QueRenDto queRenDto) { var UserID = App.User?.FindFirstValue("UserID"); int userid = 0; string ITCode = App.User?.FindFirstValue("ITCode"); 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("该招工状态已经无法投递！"); } var orderBiddings = await orderBiddingRes.CountAsync(x => x.OrderId == orderBidding.OrderId && x.IsSelected == true && x.IsDeleted == false && x.IsEn == true); if (orderBiddings >= order.WorderCount) { throw Oops.Oh("招工人数已经满了，不能报名！"); } bool res; orderBidding.IsSelected = true; orderBidding.Selectedtime = DateTime.Now; orderBidding.UpDataBy = ITCode; orderBidding.UpDataTime = DateTime.Now; res = await orderBiddingRes.UpdateAsync(orderBidding); if(order.WorderCount == (orderBiddings + 1)) { order.OrderStatus = 1; res = await orderRes.UpdateAsync(order); } return res; } /// <summary> /// 查询公司下工人的打卡记录 /// </summary> /// <param name="page"></param> /// <returns></returns> [Authorize] [HttpPost] public async Task<PageResult<OrderDakaDto>> PostMyComDakaListPage(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>(); RefAsync<int> total = 0; var orderBiddingDetailCheckRepository = new BaseRepository<OrderBiddingDetailCheck>(); var data = await orderRepository.Context.Queryable<Order, OrderBidding, OrderBiddingDetail>((a, b, c) => new JoinQueryInfos(JoinType.Inner, a.Id == b.OrderId, JoinType.Inner, b.Id == c.OrderBiddingId )) .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 && 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)) .OrderByDescending((a,b,c) => c.WorkDate) .Select((a, b, c) => new OrderDakaDto { OrderBiddingDetailId = c.Id, OrderName = a.OrderName, WorkDate = c.WorkDate, WorkTime = c.WorkTime, WorkerType = a.WorkerType, WorkPrice = a.WorkPrice, TodaySalary = c.TodaySalary, IsShenPi = c.IsShenPi, WorkCount = c.WorkCount, }) .ToPageListAsync(page.PageIndex, page.PageSize, total); if (data != null && data.Count > 0) { foreach (var dakaDto in data) { int hours = 0; int minutes = 0; var orderBiddingDetailChecks = await orderBiddingDetailCheckRepository.GetListAsync(x => x.OrderBiddingDetailId == dakaDto.OrderBiddingDetailId && x.IsEn == true && x.IsDeleted == false); string DakaMingxi = ""; for (int i = 0; i < orderBiddingDetailChecks.Count; i++) { if (i != orderBiddingDetailChecks.Count - 1) { DakaMingxi += orderBiddingDetailChecks[i].Checktime.Value.ToString("HH:mm") + "-"; } else { DakaMingxi += orderBiddingDetailChecks[i].Checktime.Value.ToString("HH:mm"); } if (i == 1 || i == 3 || i == 5 || i == 7 || i == 9 || i == 11 || i == 13 || i == 15 || i == 17 || i == 19) { var timeDifference = orderBiddingDetailChecks[i].Checktime.Value - orderBiddingDetailChecks[i - 1].Checktime.Value; hours += timeDifference.Hours; minutes += timeDifference.Minutes; } } //如果当天还没有填写申请，则计算工作时间和工资 if (dakaDto.IsShenPi == 0) { dakaDto.WorkTime = hours + (minutes / 60); if (dakaDto.WorkerType == 0) { dakaDto.TodaySalary = dakaDto.WorkTime * dakaDto.WorkPrice; } else { var WorkCount = dakaDto.WorkCount ?? 0; dakaDto.TodaySalary = WorkCount * dakaDto.WorkPrice; } } switch (dakaDto.IsShenPi) { case (int)IsShenPis.baocun: dakaDto.IsShenPiName = "未结算"; break; case (int)IsShenPis.tijiao: dakaDto.IsShenPiName = "未结算"; break; case (int)IsShenPis.yishenpi: dakaDto.IsShenPiName = "已结算"; break; default: break; } switch (dakaDto.WorkerType) { case (int)WorkerTypes.time: dakaDto.WorkerTypeName = "计时"; break; case (int)WorkerTypes.count: dakaDto.WorkerTypeName = "计价"; break; default: break; } dakaDto.DakaMingxi = DakaMingxi; } } result.Items = data; result.PageIndex = page.PageIndex; result.PageSize = page.PageSize; result.TotalCount = total; return result; } /// <summary> /// 公司确认工人当天打卡详情 /// </summary> /// <returns></returns> [Authorize] [HttpPost] public async Task<bool> saveDakaDetail(DakaQuerenDetailDto dakaDto) { var UserID = App.User?.FindFirstValue("UserID"); int userid = 0; string ITCode = App.User?.FindFirstValue("ITCode"); if (!string.IsNullOrEmpty(UserID)) { userid = int.Parse(UserID); } var orderBiddingRes = new BaseRepository<OrderBidding>(); var orderRes = new BaseRepository<Order>(); var orderBiddingDetailRes = new BaseRepository<OrderBiddingDetail>(); var userTiXianDetailRes = new BaseRepository<UserTiXianDetail>(); //var OrderBiddingDetailCheckRes = new BaseRepository<OrderBiddingDetailCheck>(); var userWorkerRes = new BaseRepository<UserWorker>(); var userCompanyRes = new BaseRepository<UserCompany>(); var orderBiddingDetail = await orderBiddingDetailRes.GetByIdAsync(dakaDto.OrderBiddingDetailId); 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) //{ // throw Oops.Oh("该招工状态已无法打卡确认！"); //} var res = false; try { var TodaySalary = orderBiddingDetail.TodaySalary.HasValue? orderBiddingDetail.TodaySalary.Value:0; if(orderBiddingDetail.IsShenPi == (int)IsShenPis.yishenpi) { TodaySalary = dakaDto.TodaySalary.Value - TodaySalary; } else { TodaySalary = dakaDto.TodaySalary.Value; } orderRes.Context.Ado.BeginTran(); orderBiddingDetail.WorkTime = dakaDto.WorkTime; orderBiddingDetail.WorkCount = dakaDto.WorkCount; orderBiddingDetail.TodaySalary = dakaDto.TodaySalary; orderBiddingDetail.IsShenPi = (int)IsShenPis.yishenpi; orderBiddingDetail.ShenPitime = DateTime.Now; orderBiddingDetail.UpDataBy = ITCode; orderBiddingDetail.UpDataTime = DateTime.Now; orderBiddingDetail.IsTiXian = true; orderBiddingDetail.TiXiantime = DateTime.Now; //orderBiddingDetail.CreateBy = ITCode; //orderBiddingDetail.CreateTime = DateTime.Now; res = await orderBiddingDetailRes.UpdateAsync(orderBiddingDetail); if (!res) { orderRes.Context.Ado.RollbackTran(); throw Oops.Oh("结算失败！"); } var userCompany = await userCompanyRes.GetFirstAsync(x => x.UserId == order.OrderUserId); if(userCompany!=null && userCompany.IsTiXian == true) { //插入用户的结算金额 UserTiXianDetail userTiXianDetail = new UserTiXianDetail(); userTiXianDetail.UserId = orderBidding.WorkerUserId; userTiXianDetail.YiTiXianJine = TodaySalary; userTiXianDetail.ZhiChuShouRu = (int)ZhiChuShouRus.shouru; userTiXianDetail.Remark = "招工订单" + order.OrderName + orderBiddingDetail.WorkDate.Value.ToString("yyyy-MM-dd") + "工资结算"; userTiXianDetail.UpDataBy = ITCode; userTiXianDetail.UpDataTime = DateTime.Now; userTiXianDetail.CreateBy = ITCode; userTiXianDetail.CreateTime = DateTime.Now; res = await userTiXianDetailRes.InsertAsync(userTiXianDetail); if (!res) { orderRes.Context.Ado.RollbackTran(); throw Oops.Oh("结算失败！"); } var userWorker = await userWorkerRes.GetFirstAsync(x => x.UserId == orderBidding.WorkerUserId); if (userWorker != null) { var TiXianZonge = userWorker.TiXianZonge ?? 0; userWorker.TiXianZonge = TiXianZonge + TodaySalary; res = await userWorkerRes.UpdateAsync(userWorker); if (!res) { orderRes.Context.Ado.RollbackTran(); throw Oops.Oh("结算失败！"); } } } //判断订单是否可以修改为结算状态 if (order.WordEndTime <= DateTime.Now) { var sss = await orderBiddingRes.GetListAsync(x => x.OrderId == order.Id && x.IsEn == true && x.IsDeleted == false && x.IsSelected == true); var bbb =sss.Select(x => x.Id).ToList(); var oCount = await orderBiddingDetailRes.CountAsync(x => bbb.Contains(x.OrderBiddingId) && x.IsEn == true && x.IsDeleted == false && x.IsShenPi != (int)IsShenPis.yishenpi); if (oCount == 0) { order.OrderStatus = (int)OrderStatuses.jiesuanwanbi; res = await orderRes.UpdateAsync(order); if (!res) { orderRes.Context.Ado.RollbackTran(); throw Oops.Oh("结算失败！"); } } } orderRes.Context.Ado.CommitTran(); } catch (Exception ex ) { orderRes.Context.Ado.RollbackTran(); throw Oops.Oh(ex.Message); } return res; } } } cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
New file @@ -0,0 +1,746 @@ using cylsg.Application.Orders.Dtos; using cylsg.Application.Users.Dtos; using cylsg.Core; using cylsg.Model.OrderModel; using cylsg.Model.UserModel; using Furion.LinqBuilder; using MapsterMapper; using Org.BouncyCastle.Asn1.X509; using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Security.Claims; using System.Text; using System.Threading.Tasks; using static SKIT.FlurlHttpClient.Wechat.Api.Models.ChannelsECOrderDeliverySendRequest.Types.Delivery.Types; using static SKIT.FlurlHttpClient.Wechat.Api.Models.SemanticSemproxySearchResponse.Types; namespace cylsg.Application.Orders { /// <summary> /// 订单工人接口 /// </summary> public class OrderWorkerAppService : IDynamicApiController { private readonly ISystemService _systemService; private ISqlSugarClient _sqlSugarClient; private IMapper _mapper; public OrderWorkerAppService(ISystemService systemService, ISqlSugarClient sqlSugarClient, IMapper mapper) { _systemService = systemService; _sqlSugarClient = sqlSugarClient; _mapper = mapper; } /// <summary> /// 查询工人可以投递的招工订单 /// </summary> /// <param name="page"></param> /// <returns></returns> [HttpPost] public async Task<PageResult<OrderDto>> PostListPage(OrderPageSearch page) { 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); if (!string.IsNullOrEmpty(page.OrderName)) { expression = expression.And(t => t.OrderName.Contains(page.OrderName)); } if (page.WordStartTime.HasValue) { expression = expression.And(t => t.WordStartTime >= page.WordStartTime); } if (page.WordEndTime.HasValue) { expression = expression.And(t => t.WordStartTime <= page.WordEndTime); } RefAsync<int> total = 0; var orderRepository = new BaseRepository<Order>(); var orderBiddingRepository = new BaseRepository<OrderBidding>(); var data = await orderRepository.Context.Queryable<Order>() .Where(expression) .OrderByDescending(c => c.WordStartTime) .ToPageListAsync(page.PageIndex, page.PageSize, total); var datadto = _mapper.Map<List<OrderDto>>(data); if (datadto != null && datadto.Count > 0) { foreach (var orderDto in datadto) { var orderBiddings = await orderBiddingRepository.CountAsync(x => x.OrderId == orderDto.Id && x.IsSelected == true && x.IsEn == true && x.IsDeleted == false); orderDto.WorderCounted = orderBiddings; } } result.Items = datadto; result.PageIndex = page.PageIndex; result.PageSize = page.PageSize; result.TotalCount = total; return result; } /// <summary> /// 查询工人已经投递的招工订单 /// </summary> /// <param name="page"></param> /// <returns></returns> [Authorize] [HttpPost] public async Task<PageResult<OrderDto>> PostMyListPage(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>(); var orderRepository = new BaseRepository<Order>(); Expression<Func<Order, bool>> expression = t => true; expression = expression.And(t => t.IsDeleted == false && t.IsEn == true && SqlFunc.Subqueryable<OrderBidding>().Where(oi => oi.OrderId == t.Id && oi.IsDeleted == false && oi.IsEn == true && oi.WorkerUserId == userid).Any()); if (!string.IsNullOrEmpty(page.OrderName)) { expression = expression.And(t => t.OrderName.Contains(page.OrderName)); } if (page.WordStartTime.HasValue) { expression = expression.And(t => t.WordStartTime >= page.WordStartTime); } if (page.WordEndTime.HasValue) { expression = expression.And(t => t.WordStartTime <= page.WordEndTime); } RefAsync<int> total = 0; var orderBiddingRepository = new BaseRepository<OrderBidding>(); var data = await orderRepository.Context.Queryable<Order>() .Where(expression) .OrderByDescending(c => c.WordStartTime) .ToPageListAsync(page.PageIndex, page.PageSize, total); var datadto = _mapper.Map<List<OrderDto>>(data); if (datadto != null && datadto.Count > 0) { foreach (var orderDto in datadto) { switch (orderDto.OrderStatus) { 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 orderBiddingRepository.CountAsync(x => x.OrderId == orderDto.Id && x.IsSelected == true && x.IsEn == true && x.IsDeleted == false); orderDto.WorderCounted = orderBiddings; var orderBidding = await orderBiddingRepository.GetFirstAsync(x => x.OrderId == orderDto.Id && x.WorkerUserId == userid && x.IsEn == true && x.IsDeleted == false); if (orderBidding != null) { orderDto.IsSelected = orderBidding.IsSelected; if (orderDto.IsSelected.HasValue && orderDto.IsSelected.Value) { orderDto.IsSelectedName ="已确认"; } else { orderDto.IsSelectedName = "未确认"; } } } } result.Items = datadto; result.PageIndex = page.PageIndex; result.PageSize = page.PageSize; result.TotalCount = total; return result; } /// <summary> /// 根据Id查询招工明细 /// </summary> /// <returns></returns> [Authorize] public async Task<OrderDto> getOrder(int orderid) { var UserID = App.User?.FindFirstValue("UserID"); int userid = 0; if (!string.IsNullOrEmpty(UserID)) { userid = int.Parse(UserID); } OrderDto orderDto = new OrderDto(); var orderRes = new BaseRepository<Order>(); var orderBiddingRes = new BaseRepository<OrderBidding>(); var userRes = new BaseRepository<User>(); var order = await orderRes.GetByIdAsync(orderid); orderDto = _mapper.Map<OrderDto>(order); switch (orderDto.OrderStatus) { 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 IsSelected = orderBiddings.Count(x => x.IsSelected == true); orderDto.WorderCounted = IsSelected; var orderBidding = orderBiddings.Where(x => x.WorkerUserId == userid).FirstOrDefault(); if (orderBidding != null) { orderDto.IsSelected = orderBidding.IsSelected; if (orderDto.IsSelected.HasValue && orderDto.IsSelected.Value) { orderDto.IsSelectedName = "已确认"; } else { orderDto.IsSelectedName = "未确认"; } } 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) { orderBiddingDto.IsSelectedName = "已确认"; } else { orderBiddingDto.IsSelectedName = "未确认"; } var user = await userRes.GetByIdAsync(orderBiddingDto.WorkerUserId); if (user != null) { orderBiddingDto.WorkerName = user.name; orderBiddingDto.WorkerAvatar = user.Avatar; } } } orderDto.orderBidding = orderBiddingDtos; return orderDto; } /// <summary> /// 工人投递 /// </summary> /// <returns></returns> [Authorize] [HttpPost] public async Task<bool> saveBaoMing(BaoMingDto baoMingDto) { var UserID = App.User?.FindFirstValue("UserID"); int userid = 0; string ITCode = App.User?.FindFirstValue("ITCode"); if (!string.IsNullOrEmpty(UserID)) { userid = int.Parse(UserID); } var orderBiddingRes = new BaseRepository<OrderBidding>(); var orderRes = new BaseRepository<Order>(); var userWorkerRes = new BaseRepository<UserWorker>(); var userWorker = await userWorkerRes.GetFirstAsync(p=>p.UserId == userid && p.IsEn == true && p.IsDeleted == false); if (userWorker == null || string.IsNullOrEmpty(userWorker.IdCode)) { throw Oops.Oh("请先完成工人实名认证才能投递！"); } var order = await orderRes.GetByIdAsync(baoMingDto.OrderId); if (order == null || order.OrderStatus>0) { throw Oops.Oh("该招工状态已经无法投递！"); } bool res; var orderBidding = await orderBiddingRes.GetFirstAsync(x => x.OrderId == baoMingDto.OrderId && x.WorkerUserId == userid && x.IsDeleted == false && x.IsEn == true); if (orderBidding != null) { throw Oops.Oh("已经投递过了！"); } else { var orderBiddings = await orderBiddingRes.CountAsync(x => x.OrderId == baoMingDto.OrderId && x.IsSelected == true && x.IsDeleted == false && x.IsEn == true); if(orderBiddings>= order.WorderCount) { throw Oops.Oh("招工人数已经满了，不能报名！"); } OrderBidding orderBidding1 = new OrderBidding(); orderBidding1.WorkerUserId = userid; orderBidding1.OrderId = baoMingDto.OrderId; orderBidding1.IsSelected = false; orderBidding1.UpDataBy = ITCode; orderBidding1.UpDataTime = DateTime.Now; orderBidding1.CreateBy = ITCode; orderBidding1.CreateTime = DateTime.Now; res = await orderBiddingRes.InsertAsync(orderBidding1); } return res; } /// <summary> /// 进入打卡页面 /// </summary> /// <returns></returns> [Authorize] [HttpPost] public async Task<OrderBiddingDetailDto> getDaka(BaoMingDto baoMingDto) { var UserID = App.User?.FindFirstValue("UserID"); int userid = 0; string ITCode = App.User?.FindFirstValue("ITCode"); if (!string.IsNullOrEmpty(UserID)) { userid = int.Parse(UserID); } OrderBiddingDetailDto orderBiddingDetailDto = null; var orderBiddingRes = new BaseRepository<OrderBidding>(); var orderRes = new BaseRepository<Order>(); var orderBiddingDetailRes = new BaseRepository<OrderBiddingDetail>(); var OrderBiddingDetailCheckRes = new BaseRepository<OrderBiddingDetailCheck>(); var order = await orderRes.GetByIdAsync(baoMingDto.OrderId); if (order == null || order.OrderStatus > 1) { throw Oops.Oh("该招工状态已经无法打卡！"); } var orderBidding = await orderBiddingRes.GetFirstAsync(x => x.OrderId == baoMingDto.OrderId && x.WorkerUserId == userid && x.IsDeleted == false && x.IsEn == true); if (orderBidding == null || orderBidding.IsSelected != true) { throw Oops.Oh("没有确认的投递！"); } var dateTime = DateTime.Now.Date; var orderBiddingDetail = await orderBiddingDetailRes.GetFirstAsync(x => x.OrderBiddingId == orderBidding.Id && x.WorkDate == dateTime && x.IsDeleted == false && x.IsEn == true); if (orderBiddingDetail != null ) { if(orderBiddingDetail.IsShenPi>0) { throw Oops.Oh("当天的打卡已经提交，不能打卡！"); } orderBiddingDetailDto = _mapper.Map<OrderBiddingDetailDto>(orderBiddingDetail); var orderBiddingDetailChecks = await OrderBiddingDetailCheckRes.GetListAsync(x => x.OrderBiddingDetailId == orderBiddingDetail.Id && x.IsDeleted == false && x.IsEn == true); orderBiddingDetailDto.orderBiddingDetailCheck = _mapper.Map<List<OrderBiddingDetailCheckDto>>(orderBiddingDetailChecks); } return orderBiddingDetailDto; } /// <summary> /// 工人打卡 /// </summary> /// <returns></returns> [Authorize] [HttpPost] public async Task<bool> saveDaka(DakaDto dakaDto) { var UserID = App.User?.FindFirstValue("UserID"); int userid = 0; string ITCode = App.User?.FindFirstValue("ITCode"); if (!string.IsNullOrEmpty(UserID)) { userid = int.Parse(UserID); } var orderBiddingRes = new BaseRepository<OrderBidding>(); var orderRes = new BaseRepository<Order>(); var orderBiddingDetailRes = new BaseRepository<OrderBiddingDetail>(); var OrderBiddingDetailCheckRes = new BaseRepository<OrderBiddingDetailCheck>(); var orderBidding = await orderBiddingRes.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; 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) { orderBiddingDetail = new OrderBiddingDetail(); orderBiddingDetail.OrderBiddingId = orderBidding.Id; orderBiddingDetail.WorkDate = dateTime; orderBiddingDetail.IsShenPi = 0; orderBiddingDetail.IsTiXian = false; orderBiddingDetail.UpDataBy = ITCode; orderBiddingDetail.UpDataTime = DateTime.Now; orderBiddingDetail.CreateBy = ITCode; orderBiddingDetail.CreateTime = DateTime.Now; orderBiddingDetail.Id = await orderBiddingDetailRes.InsertReturnIdentityAsync(orderBiddingDetail); } //插入打卡记录 var orderBiddingDetailCheck = new OrderBiddingDetailCheck(); orderBiddingDetailCheck.OrderBiddingDetailId = orderBiddingDetail.Id; orderBiddingDetailCheck.CheckPhoto = dakaDto.CheckPhoto; orderBiddingDetailCheck.Checktime = DateTime.Now; orderBiddingDetailCheck.UpDataBy = ITCode; orderBiddingDetailCheck.UpDataTime = DateTime.Now; orderBiddingDetailCheck.CreateBy = ITCode; orderBiddingDetailCheck.CreateTime = DateTime.Now; res = await OrderBiddingDetailCheckRes.InsertAsync(orderBiddingDetailCheck); return res; } /// <summary> /// 查询工人的打卡记录 /// </summary> /// <param name="page"></param> /// <returns></returns> [Authorize] [HttpPost] public async Task<PageResult<OrderDakaDto>> PostMyDakaListPage(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>(); RefAsync<int> total = 0; var orderBiddingDetailCheckRepository = new BaseRepository<OrderBiddingDetailCheck>(); var data = await orderRepository.Context.Queryable<Order, OrderBidding, OrderBiddingDetail>((a, b ,c) => new JoinQueryInfos(JoinType.Inner, a.Id == b.OrderId , JoinType.Inner, b.Id == c.OrderBiddingId )) .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 { OrderBiddingDetailId = c.Id, OrderName = a.OrderName, WorkDate = c.WorkDate, WorkTime = c.WorkTime, WorkerType = a.WorkerType, WorkPrice = a.WorkPrice, TodaySalary = c.TodaySalary, IsShenPi = c.IsShenPi, WorkCount = c.WorkCount, }) .ToPageListAsync(page.PageIndex, page.PageSize, total); if (data != null && data.Count > 0) { foreach (var dakaDto in data) { var orderBiddingDetailChecks = await orderBiddingDetailCheckRepository.GetListAsync(x => x.OrderBiddingDetailId == dakaDto.OrderBiddingDetailId && x.IsEn == true && x.IsDeleted == false); string DakaMingxi = ""; int hours = 0; int minutes = 0; for (int i = 0; i < orderBiddingDetailChecks.Count; i++) { if (i != orderBiddingDetailChecks.Count - 1) { DakaMingxi += orderBiddingDetailChecks[i].Checktime.Value.ToString("HH:mm") + "-"; } else { DakaMingxi += orderBiddingDetailChecks[i].Checktime.Value.ToString("HH:mm"); } if (i == 1 || i == 3 || i == 5 || i == 7 || i == 9 || i == 11 || i == 13 || i == 15 || i == 17 || i == 19 ) { var timeDifference = orderBiddingDetailChecks[i].Checktime.Value - orderBiddingDetailChecks[i - 1].Checktime.Value; hours += timeDifference.Hours; minutes += timeDifference.Minutes; } } //如果当天还没有填写申请，则计算工作时间和工资 if(dakaDto.IsShenPi == 0) { dakaDto.WorkTime = hours+(minutes/60); if(dakaDto.WorkerType == 0) { dakaDto.TodaySalary = dakaDto.WorkTime * dakaDto.WorkPrice; } else { var WorkCount = dakaDto.WorkCount ?? 0; dakaDto.TodaySalary = WorkCount * dakaDto.WorkPrice; } } switch (dakaDto.IsShenPi) { case (int)IsShenPis.baocun: dakaDto.IsShenPiName = "未结算"; break; case (int)IsShenPis.tijiao: dakaDto.IsShenPiName = "未结算"; break; case (int)IsShenPis.yishenpi: dakaDto.IsShenPiName = "已结算"; break; default: break; } switch (dakaDto.WorkerType) { case (int)WorkerTypes.time: dakaDto.WorkerTypeName = "计时"; break; case (int)WorkerTypes.count: dakaDto.WorkerTypeName = "计价"; break; default: break; } dakaDto.DakaMingxi = DakaMingxi; } } result.Items = data; result.PageIndex = page.PageIndex; result.PageSize = page.PageSize; result.TotalCount = total; return result; } /// <summary> /// 进入填写/审批工价页面 /// </summary> /// <returns></returns> [Authorize] [HttpPost] public async Task<OrderDakaMingxiDto> getDakaDetail(DakaDetailDto dakaDetailDto) { var UserID = App.User?.FindFirstValue("UserID"); int userid = 0; string ITCode = App.User?.FindFirstValue("ITCode"); if (!string.IsNullOrEmpty(UserID)) { userid = int.Parse(UserID); } OrderDakaMingxiDto orderDakaMingxiDto = new OrderDakaMingxiDto(); ; var orderBiddingRes = new BaseRepository<OrderBidding>(); var orderRes = new BaseRepository<Order>(); var orderBiddingDetailRes = new BaseRepository<OrderBiddingDetail>(); var OrderBiddingDetailCheckRes = new BaseRepository<OrderBiddingDetailCheck>(); var userRes = new BaseRepository<User>(); var orderBiddingDetail = await orderBiddingDetailRes.GetByIdAsync(dakaDetailDto.OrderBiddingDetailId); var orderBidding = await orderBiddingRes.GetByIdAsync(orderBiddingDetail.OrderBiddingId); var order = await orderRes.GetByIdAsync(orderBidding.OrderId); var orderBiddingDetailChecks = await OrderBiddingDetailCheckRes.GetListAsync(x => x.OrderBiddingDetailId == orderBiddingDetail.Id && x.IsEn == true && x.IsDeleted == false); orderDakaMingxiDto.orderBiddingDetailCheck = _mapper.Map<List<OrderBiddingDetailCheckDto>>(orderBiddingDetailChecks); orderDakaMingxiDto.OrderBiddingDetailId = orderBiddingDetail.Id; orderDakaMingxiDto.OrderName = order.OrderName; orderDakaMingxiDto.WorkDate = orderBiddingDetail.WorkDate; orderDakaMingxiDto.WorkTime = orderBiddingDetail.WorkTime; orderDakaMingxiDto.WorkerType = order.WorkerType; orderDakaMingxiDto.WorkPrice = order.WorkPrice; orderDakaMingxiDto.TodaySalary = orderBiddingDetail.TodaySalary; orderDakaMingxiDto.IsShenPi = orderBiddingDetail.IsShenPi; 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; } switch (orderDakaMingxiDto.IsShenPi) { case (int)IsShenPis.baocun: orderDakaMingxiDto.IsShenPiName = "未结算"; break; case (int)IsShenPis.tijiao: orderDakaMingxiDto.IsShenPiName = "未结算"; break; case (int)IsShenPis.yishenpi: orderDakaMingxiDto.IsShenPiName = "已结算"; break; default: break; } switch (orderDakaMingxiDto.WorkerType) { case (int)WorkerTypes.time: orderDakaMingxiDto.WorkerTypeName = "计时"; break; case (int)WorkerTypes.count: orderDakaMingxiDto.WorkerTypeName = "计价"; break; default: break; } if (orderDakaMingxiDto.IsShenPi == 0) { int hours = 0; int minutes = 0; for (int i = 0; i < orderBiddingDetailChecks.Count; i++) { if (i == 1 || i == 3 || i == 5 || i == 7 || i == 9 || i == 11 || i == 13 || i == 15 || i == 17 || i == 19) { var timeDifference = orderBiddingDetailChecks[i].Checktime.Value - orderBiddingDetailChecks[i - 1].Checktime.Value; hours += timeDifference.Hours; minutes += timeDifference.Minutes; } } orderDakaMingxiDto.WorkTime = hours + (minutes / 60); if (orderDakaMingxiDto.WorkerType == 0) { orderDakaMingxiDto.TodaySalary = orderDakaMingxiDto.WorkTime * orderDakaMingxiDto.WorkPrice; } else { var WorkCount = orderDakaMingxiDto.WorkCount ?? 0; orderDakaMingxiDto.TodaySalary = WorkCount * orderDakaMingxiDto.WorkPrice; } } return orderDakaMingxiDto; } /// <summary> /// 工人确认当天打卡详情 /// </summary> /// <returns></returns> [Authorize] [HttpPost] public async Task<bool> saveDakaDetail(DakaQuerenDetailDto dakaDto) { var UserID = App.User?.FindFirstValue("UserID"); int userid = 0; string ITCode = App.User?.FindFirstValue("ITCode"); if (!string.IsNullOrEmpty(UserID)) { userid = int.Parse(UserID); } var orderBiddingRes = new BaseRepository<OrderBidding>(); var orderRes = new BaseRepository<Order>(); var orderBiddingDetailRes = new BaseRepository<OrderBiddingDetail>(); //var OrderBiddingDetailCheckRes = new BaseRepository<OrderBiddingDetailCheck>(); var orderBiddingDetail = await orderBiddingDetailRes.GetByIdAsync(dakaDto.OrderBiddingDetailId); 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) { 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; orderBiddingDetail.UpDataTime = DateTime.Now; //orderBiddingDetail.CreateBy = ITCode; //orderBiddingDetail.CreateTime = DateTime.Now; var res = await orderBiddingDetailRes.UpdateAsync(orderBiddingDetail); return res; } } } cylsg/cylsg.Application/Users/Dtos/Mapper.cs
New file @@ -0,0 +1,24 @@ using cylsg.Model.UserModel; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace cylsg.Application.Users.Dtos { public class Mapper : IRegister { public void Register(TypeAdapterConfig config) { config.ForType<User, UserDto>(); config.ForType<UserDto, User>(); config.ForType<UserCompany, UserCompanyDto>(); config.ForType<UserCompanyDto, UserCompany>(); config.ForType<UserWorker, UserWorkerDto>(); config.ForType<UserWorkerDto, UserWorker>(); } } } cylsg/cylsg.Application/Users/Dtos/UserDto.cs
New file @@ -0,0 +1,193 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace cylsg.Application.Users.Dtos { public class UserDto { /// <summary> /// 用户Id /// </summary> public int Id { get; set; } /// <summary> /// 电话 /// </summary> public string Phone { get; set; } /// <summary> /// 名称 /// </summary> public string name { get; set; } /// <summary> /// 电话号码 /// </summary> public string ItCode { get; set; } /// <summary> /// 昵称 /// </summary> public string? Nickname { get; set; } /// <summary> /// 密码 /// </summary> public string? PassWord { get; set; } /// <summary> /// 头像地址 /// </summary> public string? Avatar { get; set; } /// <summary> /// 微信WxOpenId /// </summary> public string? WxOpenId { get; set; } /// <summary> /// 用户工人信息 /// </summary> public UserWorkerDto userWorker { get; set; } /// <summary> /// 用户公司信息 /// </summary> public UserCompanyDto userCompany { get; set; } } public class UserWorkerDto { /// <summary> /// 用户工人Id /// </summary> public int Id { get; set; } /// <summary> /// 用户id /// </summary> public int UserId { get; set; } /// <summary> /// 身份证正面路径 /// </summary> public string IdCardFace { get; set; } /// <summary> /// 身份证反面路径 /// </summary> public string IdCardBack { get; set; } /// <summary> /// 姓名 /// </summary> public string name { get; set; } /// <summary> /// 电话号码 /// </summary> public string Phone { get; set; } /// <summary> /// 身份证号 /// </summary> public string IdCode { get; set; } /// <summary> /// 联系地址 /// </summary> public string Address { get; set; } /// <summary> /// 简历描述 /// </summary> public string Resume { get; set; } /// <summary> /// 提现总额 /// </summary> public decimal? TiXianZonge { get; set; } /// <summary> /// 已提现金额 /// </summary> public decimal? YiTiXianJine { get; set; } } public class UserCompanyDto { /// <summary> /// 用户公司Id /// </summary> public int Id { get; set; } /// <summary> /// 用户id /// </summary> public int UserId { get; set; } /// <summary> /// 营业执照路径 /// </summary> public string BusinessLicense { get; set; } /// <summary> /// 企业名称 /// </summary> public string Suppliername { get; set; } /// <summary> /// 注册时间 /// </summary> public DateTime? Regtime { get; set; } /// <summary> /// 联系地址 /// </summary> public string Address { get; set; } /// <summary> /// 企业注册号 /// </summary> public string Suppliercode { get; set; } /// <summary> /// 联系人 /// </summary> public string Contact { get; set; } /// <summary> /// 联系电话 /// </summary> public string Phone { get; set; } /// <summary> /// 公司简介 /// </summary> public string Resume { get; set; } /// <summary> /// 充值余额 /// </summary> public decimal? ChongZhiYue { get; set; } /// <summary> /// 是否可以充值，工人提现 /// </summary> public bool? IsTiXian { get; set; } } } cylsg/cylsg.Application/Users/UserAppService.cs
New file @@ -0,0 +1,206 @@ using cylsg.Core.Attributes; using cylsg.Core; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using cylsg.Application.Users.Dtos; using cylsg.Model.UserModel; using System.Security.Claims; using System.Runtime.Intrinsics.Arm; using MapsterMapper; namespace cylsg.Application.Users { /// <summary> /// 用户接口 /// </summary> [Authorize] public class UserAppService : IDynamicApiController { private readonly ISystemService _systemService; private ISqlSugarClient _sqlSugarClient; private IMapper _mapper; public UserAppService(ISystemService systemService, ISqlSugarClient sqlSugarClient, IMapper mapper) { _systemService = systemService; _sqlSugarClient = sqlSugarClient; _mapper = mapper; } /// <summary> /// 查询当前用户 /// </summary> /// <returns></returns> public async Task<UserDto> getUser() { var UserID = App.User?.FindFirstValue("UserID"); int userid = 0; if (!string.IsNullOrEmpty(UserID)) { userid = int.Parse(UserID); } UserDto userDto = new UserDto(); var userRes = new BaseRepository<User>(); var userWorkerRes = new BaseRepository<UserWorker>(); var userCompanyRes = new BaseRepository<UserCompany>(); var user = await userRes.GetByIdAsync(userid); userDto = _mapper.Map<UserDto>(user); var userWorker = await userWorkerRes.GetFirstAsync(p=>p.UserId== userid); userDto.userWorker = _mapper.Map<UserWorkerDto>(userWorker); var userCompany = await userCompanyRes.GetFirstAsync(p => p.UserId == userid); userDto.userCompany = _mapper.Map<UserCompanyDto>(userCompany); return userDto; } /// <summary> /// 保存用户工人信息 /// </summary> /// <returns></returns> public async Task<bool> saveUserWorker(UserWorkerDto userWorkerDto) { var UserID = App.User?.FindFirstValue("UserID"); int userid = 0; string ITCode = App.User?.FindFirstValue("ITCode"); if (!string.IsNullOrEmpty(UserID)) { userid = int.Parse(UserID); } var userWorkerRes = new BaseRepository<UserWorker>(); bool res; if (userWorkerDto.Id > 0) { var userWorker1 = await userWorkerRes.GetByIdAsync(userWorkerDto.Id); userWorker1.IdCardBack = userWorkerDto.IdCardBack; userWorker1.IdCardFace = userWorkerDto.IdCardFace; userWorker1.name = userWorkerDto.name; userWorker1.Phone = userWorkerDto.Phone; userWorker1.IdCode = userWorkerDto.IdCode; userWorker1.Address = userWorkerDto.Address; userWorker1.Resume = userWorkerDto.Resume; userWorker1.UpDataBy = ITCode; userWorker1.UpDataTime = DateTime.Now; res = await userWorkerRes.UpdateAsync(userWorker1); } else { var userWorker = _mapper.Map<UserWorker>(userWorkerDto); userWorker.UpDataBy = ITCode; userWorker.UpDataTime = DateTime.Now; userWorker.CreateBy = ITCode; userWorker.CreateTime = DateTime.Now; userWorker.UserId = userid; res = await userWorkerRes.InsertAsync(userWorker); } return res; } /// <summary> /// 保存用户公司信息 /// </summary> /// <returns></returns> public async Task<bool> saveUserCompany(UserCompanyDto userCompanyDto) { var UserID = App.User?.FindFirstValue("UserID"); int userid = 0; string ITCode = App.User?.FindFirstValue("ITCode"); if (!string.IsNullOrEmpty(UserID)) { userid = int.Parse(UserID); } var userCompanyRes = new BaseRepository<UserCompany>(); bool res; if (userCompanyDto.Id > 0) { var userCompany1 = await userCompanyRes.GetByIdAsync(userCompanyDto.Id); userCompany1.BusinessLicense = userCompanyDto.BusinessLicense; userCompany1.Suppliername = userCompanyDto.Suppliername; userCompany1.Regtime = userCompanyDto.Regtime; userCompany1.Address = userCompanyDto.Address; userCompany1.Suppliercode = userCompanyDto.Suppliercode; userCompany1.Contact = userCompanyDto.Contact; userCompany1.Phone = userCompanyDto.Phone; userCompany1.Resume = userCompanyDto.Resume; userCompany1.UpDataBy = ITCode; userCompany1.UpDataTime = DateTime.Now; res = await userCompanyRes.UpdateAsync(userCompany1); } else { var userCompany = _mapper.Map<UserCompany>(userCompanyDto); userCompany.UpDataBy = ITCode; userCompany.UpDataTime = DateTime.Now; userCompany.CreateBy = ITCode; userCompany.CreateTime = DateTime.Now; userCompany.UserId = userid; res = await userCompanyRes.InsertAsync(userCompany); } return res; } /// <summary> /// 根据Id查询用户 /// </summary> /// <returns></returns> public async Task<UserDto> getUser(int userid) { UserDto userDto = new UserDto(); var userRes = new BaseRepository<User>(); var userWorkerRes = new BaseRepository<UserWorker>(); var userCompanyRes = new BaseRepository<UserCompany>(); var user = await userRes.GetByIdAsync(userid); userDto = _mapper.Map<UserDto>(user); var userWorker = await userWorkerRes.GetFirstAsync(p => p.UserId == userid); userDto.userWorker = _mapper.Map<UserWorkerDto>(userWorker); var userCompany = await userCompanyRes.GetFirstAsync(p => p.UserId == userid); userDto.userCompany = _mapper.Map<UserCompanyDto>(userCompany); return userDto; } } } cylsg/cylsg.Model/OrderModel/Order.cs
@@ -80,7 +80,7 @@ /// 工作方式 /// </summary> [SugarColumn(ColumnDescription = "工作方式", IsNullable = true)] public WorkerTypes? WorkerType { get; set; } public int? WorkerType { get; set; } /// <summary> @@ -94,7 +94,7 @@ /// 招工状态 /// </summary> [SugarColumn(ColumnDescription = "招工状态", IsNullable = true)] public OrderStatuses? OrderStatus { get; set; } public int? OrderStatus { get; set; } }
@@ -29,6 +29,12 @@ [SugarColumn(ColumnDescription = "用户id")] public int WorkerUserId { get; set; } /// <summary> /// 招工id /// </summary> [SugarColumn(ColumnDescription = "招工id")] public int OrderId { get; set; } /// <summary> /// 是否选中 cylsg/cylsg.Model/OrderModel/OrderBiddingDetail.cs
@@ -57,7 +57,7 @@ /// 审批状态 /// </summary> [SugarColumn(ColumnDescription = "审批状态", IsNullable = true)] public IsShenPis? IsShenPi { get; set; } public int? IsShenPi { get; set; } /// <summary> /// 审批时间 @@ -87,13 +87,17 @@ public enum IsShenPis { /// <summary> ///计时 ///保存 /// </summary> weishenpi = 0, baocun = 0, /// <summary> ///计件 ///提交 /// </summary> yishenpi = 1 tijiao = 1, /// <summary> ///已审批 /// </summary> yishenpi = 2 } } cylsg/cylsg.Model/UserModel/UserTiXianDetail.cs
New file @@ -0,0 +1,72 @@ using cylsg.Core; using cylsg.Core.Attributes; using SqlSugar; using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; namespace cylsg.Model.UserModel { /// <summary> /// 用户工人提现明细表 /// </summary> [Description("用户工人提现明细表")] [CoderFirst] public class UserTiXianDetail : BaseModel { /// <summary> /// 提现明细Id /// </summary> [SugarColumn(ColumnDescription = "提现明细Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } /// <summary> /// 用户id /// </summary> [SugarColumn(ColumnDescription = "用户id")] public int UserId { get; set; } /// <summary> /// 金额 /// </summary> [SugarColumn(ColumnDescription = "金额", Length = 18, DecimalDigits = 2, IsNullable = true)] public decimal? YiTiXianJine { get; set; } /// <summary> /// 支出还是收入 /// </summary> [SugarColumn(ColumnDescription = "支出还是收入")] public int ZhiChuShouRu { get; set; } /// <summary> /// 备注 /// </summary> [SugarColumn(ColumnDescription = "备注", ColumnDataType = "nvarchar(200)", IsNullable = true)] public string Remark { get; set; } } /// <summary> /// 指出还是收入 /// </summary> public enum ZhiChuShouRus { /// <summary> ///支出 /// </summary> zhichu = 0, /// <summary> ///收入 /// </summary> shouru = 1 } } cylsg/cylsg.Model/UserModel/UserWorker.cs
@@ -73,10 +73,17 @@ public string Resume { get; set; } /// <summary> /// 提现余额 /// 提现总额 /// </summary> [SugarColumn(ColumnDescription = "提现余额", Length = 18, DecimalDigits = 2, IsNullable = true)] public decimal? TiXianYue { get; set; } [SugarColumn(ColumnDescription = "提现总额", Length = 18, DecimalDigits = 2, IsNullable = true)] public decimal? TiXianZonge { get; set; } /// <summary> /// 已提现金额 /// </summary> [SugarColumn(ColumnDescription = "已提现金额", Length = 18, DecimalDigits = 2, IsNullable = true)] public decimal? YiTiXianJine { get; set; } } }
