From 5c45bc53e2c18e45130c21048df4af4896455c6d Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 12 九月 2025 15:58:48 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
index 2ee2a19..9e4a3fe 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
+++ b/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("韬唤璇佸彿鏍煎紡涓嶆纭�");
}
@@ -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
{
--
Gitblit v1.9.1