From 59afa0eaecc1daf07128aa2fd02df238c9854d4c Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期三, 13 八月 2025 16:23:17 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 5 + FlexJobApi.Core/FlexJobApi.Core.xml | 60 ++++++++++++++++++++ FlexJobApi.Core/Models/UserServer/Users/Queries/GetEnterpriseLoginInfoQuery.cs | 64 +++++++++++++++++++++ 3 files changed, 127 insertions(+), 2 deletions(-) diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml index 2ae4b3e..3bf7f1a 100644 --- a/FlexJobApi.Core/FlexJobApi.Core.xml +++ b/FlexJobApi.Core/FlexJobApi.Core.xml @@ -4125,6 +4125,11 @@ 鏌ヨ楠屾敹璇︽儏-缁撴灉-璇︽儏-浜哄憳淇℃伅 </summary> </member> + <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser.Id"> + <summary> + 鐢ㄦ埛Id + </summary> + </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser.Avatar"> <summary> 澶村儚 @@ -4164,6 +4169,11 @@ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser.RealMethod"> <summary> 瀹炲悕鏂瑰紡 + </summary> + </member> + <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser.IsBindBankCard"> + <summary> + 鏄惁缁戝畾閾惰鍗� </summary> </member> <member name="T:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResultItem"> @@ -8013,6 +8023,56 @@ 鐘舵�� </summary> </member> + <member name="T:FlexJobApi.Core.GetEnterpriseLoginInfoQuery"> + <summary> + 鏌ヨ浼佷笟鐢ㄦ埛鐧诲綍淇℃伅 + </summary> + </member> + <member name="T:FlexJobApi.Core.GetEnterpriseLoginInfoQueryResult"> + <summary> + 鏌ヨ浼佷笟鐢ㄦ埛鐧诲綍淇℃伅-缁撴灉 + </summary> + </member> + <member name="P:FlexJobApi.Core.GetEnterpriseLoginInfoQueryResult.Id"> + <summary> + Id + </summary> + </member> + <member name="P:FlexJobApi.Core.GetEnterpriseLoginInfoQueryResult.Avatar"> + <summary> + 澶村儚 + </summary> + </member> + <member name="P:FlexJobApi.Core.GetEnterpriseLoginInfoQueryResult.Name"> + <summary> + 濮撳悕 + </summary> + </member> + <member name="P:FlexJobApi.Core.GetEnterpriseLoginInfoQueryResult.EnterpriseName"> + <summary> + 浼佷笟鍏ㄧО + </summary> + </member> + <member name="P:FlexJobApi.Core.GetEnterpriseLoginInfoQueryResult.Roles"> + <summary> + 瑙掕壊 + </summary> + </member> + <member name="P:FlexJobApi.Core.GetEnterpriseLoginInfoQueryResult.IsReal"> + <summary> + 鏄惁瀹炲悕 + </summary> + </member> + <member name="P:FlexJobApi.Core.GetEnterpriseLoginInfoQueryResult.CollectUsers"> + <summary> + 鎴戠殑鏀惰棌 + </summary> + </member> + <member name="P:FlexJobApi.Core.GetEnterpriseLoginInfoQueryResult.ContactRecords"> + <summary> + 鑱旂郴璁板綍 + </summary> + </member> <member name="T:FlexJobApi.Core.GetOperationUserInfosQuery"> <summary> 鏌ヨ杩愯惀绔敤鎴峰垎椤靛垪琛ㄦ暟鎹� diff --git a/FlexJobApi.Core/Models/UserServer/Users/Queries/GetEnterpriseLoginInfoQuery.cs b/FlexJobApi.Core/Models/UserServer/Users/Queries/GetEnterpriseLoginInfoQuery.cs new file mode 100644 index 0000000..7ffc091 --- /dev/null +++ b/FlexJobApi.Core/Models/UserServer/Users/Queries/GetEnterpriseLoginInfoQuery.cs @@ -0,0 +1,64 @@ +锘縰sing MediatR; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlexJobApi.Core +{ + /// <summary> + /// 鏌ヨ浼佷笟鐢ㄦ埛鐧诲綍淇℃伅 + /// </summary> + [Resource([EnumResourceController.Auth])] + public class GetEnterpriseLoginInfoQuery : IRequest<GetEnterpriseLoginInfoQueryResult> + { + } + + /// <summary> + /// 鏌ヨ浼佷笟鐢ㄦ埛鐧诲綍淇℃伅-缁撴灉 + /// </summary> + public class GetEnterpriseLoginInfoQueryResult + { + /// <summary> + /// Id + /// </summary> + public Guid Id { get; set; } + + /// <summary> + /// 澶村儚 + /// </summary> + public string Avatar { get; set; } + + /// <summary> + /// 濮撳悕 + /// </summary> + public string Name { get; set; } + + /// <summary> + /// 浼佷笟鍏ㄧО + /// </summary> + public string EnterpriseName { get; set; } + + /// <summary> + /// 瑙掕壊 + /// </summary> + public List<string> Roles { get; set; } + + /// <summary> + /// 鏄惁瀹炲悕 + /// </summary> + public bool IsReal { get; set; } + + /// <summary> + /// 鎴戠殑鏀惰棌 + /// </summary> + public int CollectUsers { get; set; } + + /// <summary> + /// 鑱旂郴璁板綍 + /// </summary> + public int ContactRecords { get; set; } + } +} diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs index 312d0e6..b46711c 100644 --- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs +++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs @@ -68,8 +68,9 @@ throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鏃ユ湡"); } q = q.Where(it => - it.TaskInfoUsers.Any(tu => - tu.EnterpriseEmployee.UserId == logier.Id + (logier.Type == EnumUserType.Enterprise ? it.EnterpriseId == logier.EnterpriseId : true) + && it.TaskInfoUsers.Any(tu => + (logier.Type == EnumUserType.Personal ? tu.EnterpriseEmployee.UserId == logier.Id : true) && (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit ? !tu.Submits.Any(s => s.Date.Date == request.Date.Value.Date) : tu.Submits.Any(s => -- Gitblit v1.9.1