Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob

sunpengfei

17 分钟以前 8cc3bff6979c8e3d66e9d4caa91398c3f0e58f0a

 FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs

@@ -173,6 +173,11 @@
        {
            var logier = JwtUtils.GetCurrentLogier();
            var list = new GetSettlementTaskUsersQueryResult();

            list.Detail = await TaskInfoRepository.GetQueryable(repTaskInfo, true, logier)
                .Where(it => it.Id == request.TaskInfoId)
                .GetDetail<TaskInfo, GetSettlementTaskQueryResult>();

            var q = rep.AsQueryable().AsNoTracking()
                .Where(it => it.TaskInfoId == request.TaskInfoId);
            list.Data = q
@@ -208,7 +213,7 @@
                    {
                        errors.Add("请填写身份证号");
                    }
                    else if (!model.Identity.TryValidate(EnumValidationTypes.ValiIdentity).IsValid)
                    else if (!model.Identity.TryValidate(EnumValidationTypes.ValidIdentity).IsValid)
                    {
                        errors.Add("身份证号格式不正确");
                    }
@@ -240,7 +245,7 @@
                    {
                        errors.Add("实发金额不可为负数");
                    }
                    else if (model.ActualSettlementAmount > 0 && model.ActualSettlementAmount < (decimal)0.3)
                    else if (model.ActualSettlementAmount > 0 && model.ActualSettlementAmount < 1)
                    {
                        errors.Add("实发金额不可小于1元");
                    }
@@ -250,10 +255,10 @@
                    {
                        errors.Add("灵工不存在");
                    }
                    else if (item.CheckReceiveStatus != EnumTaskCheckReceiveStatus.Completed)
                    {
                        errors.Add("未完成验收");
                    }
                    //else if (item.CheckReceiveStatus != EnumTaskCheckReceiveStatus.Completed)
                    //{
                    //    errors.Add("未完成验收");
                    //}
                    else if (item.Name != model.Name)
                    {
                        errors.Add("灵工姓名与实名信息不一致");
@@ -265,6 +270,10 @@
                        item.ReceiveAccount = model.ReceiveAccount;
                        item.Bank = model.Bank;
                        item.BankBranch = model.BankBranch;
                    }
                    if (model.TaskName != list.Detail.Name)
                    {
                        errors.Add("任务名称不一致");
                    }

                    if (errors.IsNotNull())
@@ -289,6 +298,13 @@
                        .Where(it => successList.Any(s => s.Identity == it.Identity))
                        .ToList();
                }

                list.Detail.SettlementOrderStatus = EnumTaskSettlementOrderStatus.Wait;
                list.Detail.SettlementOrderName = request.SettlementOrderUrl.Substring(request.SettlementOrderUrl.LastIndexOf("/") + 1);
                list.Detail.SettlementOrderTime = DateTime.Now;
                list.Detail.SettlementStatus = EnumTaskSettlementStatus.Wait;
                list.Detail.SettlementAmount = list.Data.Sum(it => it.SettlementAmount ?? 0);
                list.Detail.ActualSettlementAmount = list.Data.Sum(it => it.ActualSettlementAmount ?? 0);
            }
            else
            {