From 550b9b8b3b8b39e384652c916ccb154367a21f1a Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 05 九月 2025 09:04:48 +0800
Subject: [PATCH] fix: s
---
FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | 225 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 157 insertions(+), 68 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
index a363e48..e051adb 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
@@ -1,6 +1,9 @@
-锘縰sing FlexJobApi.Core;
+锘縰sing Aop.Api.Domain;
+using FlexJobApi.Core;
using Furion.DatabaseAccessor;
+using Furion.DataValidation;
using Furion.FriendlyException;
+using Mapster;
using MediatR;
using Microsoft.EntityFrameworkCore;
using System;
@@ -18,7 +21,8 @@
IRepository<TaskInfoUser> rep) :
IRequestHandler<GetTaskUsersQuery, GetTaskUsersQueryResult>,
IRequestHandler<GetArrangeTaskUsersQuery, GetArrangeTaskUsersQueryResult>,
- IRequestHandler<GetCheckReceiveTaskUserInfosQuery, GetCheckReceiveTaskUserInfosQueryResult>
+ IRequestHandler<GetTaskUserHireStatusQuery, GetTaskUserHireStatusQueryResult>,
+ IRequestHandler<GetSettlementTaskUsersQuery, GetSettlementTaskUsersQueryResult>
{
private readonly IRepository<TaskInfoUser> rep = rep;
@@ -34,10 +38,22 @@
var q = rep.AsQueryable().AsNoTracking()
.OrderBy(it => it.CreatedTime)
.Where(it => it.TaskInfo.EnterpriseId == logier.EnterpriseId && it.TaskInfoId == request.Id);
+ if (request.Keywords.IsNotNull())
+ {
+ q = q.Where(it =>
+ it.EnterpriseEmployee.User.Name.Contains(request.Keywords)
+ || it.EnterpriseEmployee.User.Identity.Contains(request.Keywords)
+ || it.EnterpriseEmployee.User.PhoneNumber.Contains(request.Keywords));
+ }
+ if (request.HireStatus.HasValue)
+ {
+ q = q.Where(it => it.HireStatus == request.HireStatus);
+ }
var s = q
.Select(it => new GetTaskUsersQueryResultItem
{
Id = it.Id,
+ EnterpriseEmployeeId = it.EnterpriseEmployeeId,
Avatar = it.EnterpriseEmployee.User.Avatar,
Name = it.EnterpriseEmployee.User.Name,
Identity = it.EnterpriseEmployee.User.Identity,
@@ -50,10 +66,10 @@
PersonalIdentityContent = it.EnterpriseEmployee.User.PersonalIdentity.Content,
EducationalBackgroundCode = it.EnterpriseEmployee.User.EducationalBackgroundCode,
EducationalBackgroundContent = it.EnterpriseEmployee.User.EducationalBackground.Content,
- TaskCount = it.EnterpriseEmployee.TaskInfoUsers.Count(tu => tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Pass),
+ TaskCount = it.EnterpriseEmployee.TaskInfoUsers.Count(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass),
WorkSeniority = it.EnterpriseEmployee.User.WorkSeniority,
WorkExperience = it.EnterpriseEmployee.User.WorkExperience,
- HireStatus = it.EnterpriseEmployee.HireStatus
+ HireStatus = it.HireStatus
});
return await request.PageModel.GetPagedListAsync<GetTaskUsersQueryResult, GetTaskUsersQueryResultItem>(s, cancellationToken);
}
@@ -72,7 +88,7 @@
.Where(it =>
it.TaskInfo.EnterpriseId == logier.EnterpriseId
&& it.TaskInfoId == request.Id
- && it.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Pass
+ && it.HireStatus == EnumTaskUserHireStatus.Pass
&& it.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Pass
&& it.EnterpriseEmployee.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass);
if (request.ArrangeStatus.HasValue)
@@ -102,7 +118,7 @@
PersonalIdentityContent = it.EnterpriseEmployee.User.PersonalIdentity.Content,
EducationalBackgroundCode = it.EnterpriseEmployee.User.EducationalBackgroundCode,
EducationalBackgroundContent = it.EnterpriseEmployee.User.EducationalBackground.Content,
- TaskCount = it.EnterpriseEmployee.TaskInfoUsers.Count(tu => tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Pass),
+ TaskCount = it.EnterpriseEmployee.TaskInfoUsers.Count(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass),
WorkSeniority = it.EnterpriseEmployee.User.WorkSeniority,
WorkExperience = it.EnterpriseEmployee.User.WorkExperience,
ArrangeStatus = it.ArrangeStatus
@@ -111,86 +127,159 @@
}
/// <summary>
- /// 鏌ヨ楠屾敹鍒嗛〉鍒楄〃
+ /// 鏌ヨ搴旇仒鎶ュ悕浜哄憳褰曠敤鐘舵��
/// </summary>
/// <param name="request"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public async Task<GetCheckReceiveTaskUserInfosQueryResult> Handle(GetCheckReceiveTaskUserInfosQuery request, CancellationToken cancellationToken)
+ public async Task<GetTaskUserHireStatusQueryResult> Handle(GetTaskUserHireStatusQuery request, CancellationToken cancellationToken)
{
var logier = JwtUtils.GetCurrentLogier();
var q = rep.AsQueryable().AsNoTracking()
- .OrderBy(it => it.CreatedTime)
- .AsQueryable();
-
+ .Where(it => it.TaskInfoId == request.TaskInfoId);
if (logier.Type == EnumUserType.Personal)
{
- q = q.Where(it => it.EnterpriseEmployee.UserId == logier.Id);
+ q = q.Where(it => it.EnterpriseEmployee.UserId == request.UserId);
}
- else if (logier.Type == EnumUserType.Enterprise)
+ else if (request.UserId == null)
{
- q = q.Where(it => it.TaskInfo.EnterpriseId == logier.EnterpriseId);
- }
- if (request.TaskInfoId.HasValue)
- {
- q = q.Where(it => it.TaskInfoId == request.TaskInfoId);
- }
- if (request.Keywords.IsNotNull())
- {
- q = q.Where(it =>
- it.EnterpriseEmployee.User.Name.Contains(request.Keywords)
- || it.EnterpriseEmployee.User.ContactPhoneNumber.Contains(request.Keywords)
- || it.EnterpriseEmployee.User.Identity.Contains(request.Keywords));
- }
- if (logier.ClientType == EnumClientType.Wxmp)
- {
- if (request.CheckReceiveStatus == null)
- {
- throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨楠屾敹鐘舵��");
- }
- if (request.DateBegin == null || request.DateEnd == null)
- {
- throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鏃ユ湡");
- }
- q = q.Where(it => it.Submits.Any(s =>
- request.DateBegin.Value.Date <= s.Date.Date
- && s.Date.Date <= request.DateEnd.Value.Date
- && (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
- ? s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Submit
- : request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitCheckReceive
- ? s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Wait
- : (s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Success
- || s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Fail))));
+ throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鐢ㄦ埛");
}
else
{
- if (request.DateBegin.HasValue && request.DateEnd.HasValue)
+ q = q.Where(it => it.EnterpriseEmployee.UserId == request.UserId);
+ }
+ var model = await q
+ .Select(it => new GetTaskUserHireStatusQueryResult
{
- q = q.Where(it => it.Submits.Any(s =>
- request.DateBegin.Value.Date <= s.Date.Date
- && s.Date.Date <= request.DateEnd.Value.Date));
- }
- if (request.CheckReceiveStatus.HasValue)
+ HireStatus = it.HireStatus
+ })
+ .FirstOrDefaultAsync(cancellationToken);
+ if (model == null) throw Oops.Oh(EnumErrorCodeType.s404, "鎶ュ悕淇℃伅");
+ return model;
+ }
+
+ /// <summary>
+ /// 鏌ヨ缁撶畻鍚嶅崟鍒嗛〉鍒楄〃鏁版嵁
+ /// </summary>
+ /// <param name="request"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<GetSettlementTaskUsersQueryResult> Handle(GetSettlementTaskUsersQuery request, CancellationToken cancellationToken)
+ {
+ var logier = JwtUtils.GetCurrentLogier();
+ var q = rep.AsQueryable().AsNoTracking()
+ .Where(it => it.TaskInfoId == request.TaskInfoId);
+ var s = q
+ .Select(it => new GetSettlementTaskUsersQueryResultItem
{
- q = q.Where(it => it.CheckReceiveStatus == request.CheckReceiveStatus);
+ Id = it.Id,
+ Name = it.EnterpriseEmployee.Name,
+ Identity = it.EnterpriseEmployee.Identity,
+ ContactPhoneNumber = it.EnterpriseEmployee.ContactPhoneNumber,
+ CheckReceiveStatus = it.CheckReceiveStatus,
+ Bank = it.Bank,
+ BankBranch = it.BankBranch,
+ ReceiveAccount = it.ReceiveAccount,
+ SettlementAmount = it.SettlementAmount,
+ ActualSettlementAmount = it.ActualSettlementAmount,
+ SettlementTime = it.SettlementTime
+ });
+ var list = await request.PageModel.GetPagedListAsync<GetSettlementTaskUsersQueryResult, GetSettlementTaskUsersQueryResultItem>(s, cancellationToken);
+
+ var successList = new List<GetSettlementTaskUsersQueryResultExcelRow>();
+ if (request.SettlementOrderUrl.IsNotNull())
+ {
+ var models = await ExcelUtils.ImportExcelFromOSS<GetSettlementTaskUsersQueryResultExcelRow>(request.SettlementOrderUrl);
+ foreach (var model in models)
+ {
+ var errors = new List<string>();
+ if (model.Name.IsNull())
+ {
+ errors.Add("璇峰～鍐欏鍚�");
+ }
+ if (model.Identity.IsNull())
+ {
+ errors.Add("璇峰～鍐欒韩浠借瘉鍙�");
+ }
+ else if (!model.Identity.TryValidate(EnumValidationTypes.ValiIdentity).IsValid)
+ {
+ errors.Add("韬唤璇佸彿鏍煎紡涓嶆纭�");
+ }
+ else if (successList.Any(it => it.Identity == model.Identity))
+ {
+ errors.Add("韬唤璇佸彿閲嶅");
+ }
+ if (model.Bank.IsNull())
+ {
+ errors.Add("璇峰～鍐欐墍灞為摱琛�");
+ }
+ if (model.ReceiveAccount.IsNull())
+ {
+ errors.Add("璇峰～鍐欐敹娆捐处鍙�");
+ }
+ if (model.SettlementAmount == null)
+ {
+ errors.Add("璇峰～鍐欑粨绠楅噾棰�");
+ }
+ else if (model.SettlementAmount < 0)
+ {
+ errors.Add("缁撶畻閲戦涓嶅彲涓鸿礋鏁�");
+ }
+ if (model.ActualSettlementAmount == null)
+ {
+ errors.Add("璇峰～鍐欏疄鍙戦噾棰�");
+ }
+ else if (model.ActualSettlementAmount < 0)
+ {
+ errors.Add("瀹炲彂閲戦涓嶅彲涓鸿礋鏁�");
+ }
+ else if (model.ActualSettlementAmount > 0 && model.ActualSettlementAmount < 1)
+ {
+ errors.Add("瀹炲彂閲戦涓嶅彲灏忎簬1鍏�");
+ }
+
+ var item = list.Data.FirstOrDefault(it => it.Identity == model.Identity);
+ if (item == null)
+ {
+ errors.Add("鐏靛伐涓嶅瓨鍦�");
+ }
+ else if (item.CheckReceiveStatus != EnumTaskCheckReceiveStatus.Completed)
+ {
+ errors.Add("鏈畬鎴愰獙鏀�");
+ }
+ else
+ {
+ item.SettlementAmount = model.SettlementAmount;
+ item.ActualSettlementAmount = model.ActualSettlementAmount;
+ item.ReceiveAccount = model.ReceiveAccount;
+ item.Bank = model.Bank;
+ item.BankBranch = model.BankBranch;
+ }
+
+ if (errors.IsNotNull())
+ {
+ var error = model.Adapt<GetSettlementTaskUsersQueryResultError>();
+ error.ErrorMessage = errors.SplitJoin("锛�");
+ list.Errors.Add(error);
+ }
+ else
+ {
+ successList.Add(model);
+ }
}
}
- var s = q.Select(it => new GetCheckReceiveTaskUserInfosQueryResultItem
- {
- Id = it.TaskInfoId,
- TaskName = it.TaskInfo.Name,
- BeginTime = it.TaskInfo.BeginTime,
- EndTime = it.TaskInfo.EndTime,
- AddressName = it.TaskInfo.AddressName,
- Name = it.EnterpriseEmployee.User.Name,
- Identity = it.EnterpriseEmployee.User.Identity,
- Age = it.EnterpriseEmployee.User.Age,
- Gender = it.EnterpriseEmployee.User.Gender,
- ContactPhoneNumber = it.EnterpriseEmployee.User.ContactPhoneNumber,
- CheckReceiveStatus = it.CheckReceiveStatus,
- LastSubmitTime = it.LastSubmitTime,
- });
- return await request.PageModel.GetPagedListAsync<GetCheckReceiveTaskUserInfosQueryResult, GetCheckReceiveTaskUserInfosQueryResultItem>(s, cancellationToken);
+
+ var pagedList = await list.Data
+ .Where(it => successList.Any(s => s.Identity == it.Identity))
+ .AsQueryable()
+ .ToPagedListAsync(request.PageModel.Page, request.PageModel.Rows, cancellationToken);
+ list.PageModel = request.PageModel.Adapt<PagedListQueryResultPageModel>();
+ list.PageModel.TotalCount = pagedList.TotalCount;
+ list.PageModel.TotalPage = pagedList.TotalPages;
+ list.Data = pagedList.Items.ToList();
+
+ return list;
}
}
}
--
Gitblit v1.9.1