From 2370d9c2c36f6e132603a7674474489e82ae942c Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 12 九月 2025 10:50:52 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/PersonalUserIdentity3RealCommand.cs | 5 +
FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/SendPersonalUserIdentity3RealSmsCommand.cs | 3
FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/PersonalUserFaceRealCommand.cs | 4
FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/EditEnterpriseEmployeeCommand.cs | 2
FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | 2
FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs | 68 +++++++++++++++-------
FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Queries/GetEnterpriseEmployeesQuery.cs | 21 +++++++
FlexJobApi.Core/Enums/Common/EnumValidationTypes.cs | 12 +++
FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs | 2
FlexJobApi.Core/Utils/StringUtils/StringUtils.cs | 2
10 files changed, 88 insertions(+), 33 deletions(-)
diff --git a/FlexJobApi.Core/Enums/Common/EnumValidationTypes.cs b/FlexJobApi.Core/Enums/Common/EnumValidationTypes.cs
index 0ae0a02..63547c8 100644
--- a/FlexJobApi.Core/Enums/Common/EnumValidationTypes.cs
+++ b/FlexJobApi.Core/Enums/Common/EnumValidationTypes.cs
@@ -22,6 +22,16 @@
/// 韬唤璇佸彿
/// </summary>
[ValidationItemMetadata(@"^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12][0-9]|3[01])\d{3}(\d|X|x)$", "韬唤璇佸彿鏍煎紡涓嶆纭�")]
- ValiIdentity,
+ ValidIdentity,
+ /// <summary>
+ /// 濮撳悕
+ /// </summary>
+ [ValidationItemMetadata(@"^[\u4E00-\u9FA5路]{2,15}$", "濮撳悕鏍煎紡涓嶆纭�")]
+ ValidRealName,
+ /// <summary>
+ /// 楠岃瘉鐮�
+ /// </summary>
+ [ValidationItemMetadata(@"^\d{6}$", "楠岃瘉鐮佹牸寮忎笉姝ｇ‘")]
+ ValidVerifyCode,
}
}
diff --git a/FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/PersonalUserFaceRealCommand.cs b/FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/PersonalUserFaceRealCommand.cs
index 5cd0f16..1c89f51 100644
--- a/FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/PersonalUserFaceRealCommand.cs
+++ b/FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/PersonalUserFaceRealCommand.cs
@@ -18,14 +18,14 @@
/// 濮撳悕
/// </summary>
[Required]
- [MaxLength(32)]
+ [DataValidation(EnumValidationTypes.ValidRealName)]
public string Name { get; set; }
/// <summary>
/// 韬唤璇佸彿
/// </summary>
[Required]
- [DataValidation(EnumValidationTypes.ValiIdentity)]
+ [DataValidation(EnumValidationTypes.ValidIdentity)]
public string Identity { get; set; }
/// <summary>
diff --git a/FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/PersonalUserIdentity3RealCommand.cs b/FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/PersonalUserIdentity3RealCommand.cs
index af9765e..4fb8b81 100644
--- a/FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/PersonalUserIdentity3RealCommand.cs
+++ b/FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/PersonalUserIdentity3RealCommand.cs
@@ -18,7 +18,7 @@
/// 濮撳悕
/// </summary>
[Required]
- [MaxLength(32)]
+ [DataValidation(EnumValidationTypes.ValidRealName)]
public string Name { get; set; }
/// <summary>
@@ -32,7 +32,7 @@
/// 韬唤璇佸彿
/// </summary>
[Required]
- [DataValidation(EnumValidationTypes.ValiIdentity)]
+ [DataValidation(EnumValidationTypes.ValidIdentity)]
public string Identity { get; set; }
/// <summary>
@@ -51,6 +51,7 @@
/// 楠岃瘉鐮�
/// </summary>
[Required]
+ [DataValidation(EnumValidationTypes.ValidVerifyCode)]
public string VerifyCode { get; set; }
}
}
diff --git a/FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/SendPersonalUserIdentity3RealSmsCommand.cs b/FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/SendPersonalUserIdentity3RealSmsCommand.cs
index 4a6e9ac..dac0954 100644
--- a/FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/SendPersonalUserIdentity3RealSmsCommand.cs
+++ b/FlexJobApi.Core/Models/UserServer/ElectronSigns/Commands/SendPersonalUserIdentity3RealSmsCommand.cs
@@ -18,6 +18,7 @@
/// 濮撳悕
/// </summary>
[Required]
+ [DataValidation(EnumValidationTypes.ValidRealName)]
public string Name { get; set; }
/// <summary>
@@ -32,7 +33,7 @@
/// 韬唤璇佸彿
/// </summary>
[Required]
- [DataValidation(EnumValidationTypes.ValiIdentity)]
+ [DataValidation(EnumValidationTypes.ValidIdentity)]
public string Identity { get; set; }
}
}
diff --git a/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/EditEnterpriseEmployeeCommand.cs b/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/EditEnterpriseEmployeeCommand.cs
index e541ed1..af85db3 100644
--- a/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/EditEnterpriseEmployeeCommand.cs
+++ b/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/EditEnterpriseEmployeeCommand.cs
@@ -24,7 +24,7 @@
/// 韬唤璇佸彿
/// </summary>
[Required]
- [DataValidation(EnumValidationTypes.ValiIdentity)]
+ [DataValidation(EnumValidationTypes.ValidIdentity)]
public string Identity { get; set; }
/// <summary>
diff --git a/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Queries/GetEnterpriseEmployeesQuery.cs b/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Queries/GetEnterpriseEmployeesQuery.cs
index a140177..c053f7b 100644
--- a/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Queries/GetEnterpriseEmployeesQuery.cs
+++ b/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Queries/GetEnterpriseEmployeesQuery.cs
@@ -58,6 +58,27 @@
/// 浼佷笟绛剧害鐘舵��
/// </summary>
public EnumTaskUserSignContractStatus? EnterpriseSignContractStatus { get; set; }
+
+ /// <summary>
+ /// 绛剧害鐘舵��
+ /// </summary>
+ public EnumGetEnterpriseEmployeesQuerySignContractStatus? SignContractStatus { get; set; }
+ }
+
+ public enum EnumGetEnterpriseEmployeesQuerySignContractStatus
+ {
+ /// <summary>
+ /// 鐏靛伐寰呯绾�
+ /// </summary>
+ UserWait = 10,
+ /// <summary>
+ /// 浼佷笟寰呯绾�
+ /// </summary>
+ EnterpriseWait = 20,
+ /// <summary>
+ /// 宸茬绾�
+ /// </summary>
+ Pass = 30
}
/// <summary>
diff --git a/FlexJobApi.Core/Utils/StringUtils/StringUtils.cs b/FlexJobApi.Core/Utils/StringUtils/StringUtils.cs
index 6a3a4b1..c026965 100644
--- a/FlexJobApi.Core/Utils/StringUtils/StringUtils.cs
+++ b/FlexJobApi.Core/Utils/StringUtils/StringUtils.cs
@@ -87,7 +87,7 @@
public static bool CheckIsIdentityNumber18(this string identity)
{
- return identity.IsNotNull() && identity.TryValidate(EnumValidationTypes.ValiIdentity).IsValid && identity.Length == 18;
+ return identity.IsNotNull() && identity.TryValidate(EnumValidationTypes.ValidIdentity).IsValid && identity.Length == 18;
}
/// <summary>
diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
index 2cdd47e..4c1cdff 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
@@ -213,7 +213,7 @@
{
errors.Add("璇峰～鍐欒韩浠借瘉鍙�");
}
- else if (!model.Identity.TryValidate(EnumValidationTypes.ValiIdentity).IsValid)
+ else if (!model.Identity.TryValidate(EnumValidationTypes.ValidIdentity).IsValid)
{
errors.Add("韬唤璇佸彿鏍煎紡涓嶆纭�");
}
diff --git a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs
index 28b6bcf..71584e7 100644
--- a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs
@@ -103,7 +103,7 @@
{
errors.Add("璇峰～鍐欒韩浠借瘉鍙�");
}
- else if (!model.Identity.TryValidate(EnumValidationTypes.ValiIdentity).IsValid)
+ else if (!model.Identity.TryValidate(EnumValidationTypes.ValidIdentity).IsValid)
{
errors.Add("韬唤璇佸彿鏍煎紡涓嶆纭�");
}
diff --git a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs
index beff6f6..0c59ee7 100644
--- a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs
@@ -80,34 +80,56 @@
{
q = q.Where(it => (it.UserId.HasValue && it.User.IsReal) == request.IsReal.Value);
}
- if (request.UserSignContractStatus.HasValue)
+ if (request.SignContractStatus.HasValue)
{
- if (logier.ClientType == EnumClientType.Wxmp)
+ switch (request.SignContractStatus.Value)
{
- switch (request.UserSignContractStatus.Value)
- {
- case EnumTaskUserSignContractStatus.Wait:
- q = q.Where(it => it.UserSignContractStatus == null || it.UserSignContractStatus == request.UserSignContractStatus);
- break;
- case EnumTaskUserSignContractStatus.Pass:
- q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus && it.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass);
- break;
- case EnumTaskUserSignContractStatus.Stop:
- q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
- break;
- default:
- q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
- break;
- }
- }
- else
- {
- q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
+ case EnumGetEnterpriseEmployeesQuerySignContractStatus.UserWait:
+ q = q.Where(it => it.UserSignContractStatus == null || it.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait);
+ break;
+ case EnumGetEnterpriseEmployeesQuerySignContractStatus.EnterpriseWait:
+ q = q.Where(it => it.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Wait);
+ break;
+ case EnumGetEnterpriseEmployeesQuerySignContractStatus.Pass:
+ q = q.Where(it =>
+ it.UserSignContractStatus == EnumTaskUserSignContractStatus.Pass
+ && it.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass);
+ break;
+ default:
+ break;
}
}
- if (request.EnterpriseSignContractStatus.HasValue)
+ else
{
- q = q.Where(it => it.EnterpriseSignContractStatus == request.EnterpriseSignContractStatus);
+ if (request.UserSignContractStatus.HasValue)
+ {
+ if (logier.ClientType == EnumClientType.Wxmp)
+ {
+ switch (request.UserSignContractStatus.Value)
+ {
+ case EnumTaskUserSignContractStatus.Wait:
+ q = q.Where(it => it.UserSignContractStatus == null || it.UserSignContractStatus == request.UserSignContractStatus);
+ break;
+ case EnumTaskUserSignContractStatus.Pass:
+ q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus && it.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass);
+ break;
+ case EnumTaskUserSignContractStatus.Stop:
+ q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
+ break;
+ default:
+ q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
+ break;
+ }
+ }
+ else
+ {
+ q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
+ }
+ }
+ if (request.EnterpriseSignContractStatus.HasValue)
+ {
+ q = q.Where(it => it.EnterpriseSignContractStatus == request.EnterpriseSignContractStatus);
+ }
}
var s = q.Select(it => new GetEnterpriseEmployeesQueryResultItem
{
--
Gitblit v1.9.1