feat:开发

sunpengfei

9 小时以前 2370d9c2c36f6e132603a7674474489e82ae942c

feat:开发

 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,
    }
}

 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>

 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; }
    }
}

 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; }
    }
}

 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>

 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>

 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>

 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("身份证号格式不正确");
                    }

 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("身份证号格式不正确");
                }

 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
            {