字段统一命名
This commit is contained in:
parent
92043a4519
commit
976a1e7e43
@ -105,7 +105,7 @@ public class AppUserService : BaseService<AppUserEntity>, ITransient
|
|||||||
.Where(x => x.PersonType == input.PersonType && !x.DeleteMark)
|
.Where(x => x.PersonType == input.PersonType && !x.DeleteMark)
|
||||||
.WhereIF(!string.IsNullOrWhiteSpace(input.Name), x => x.Name.Contains(input.Name))
|
.WhereIF(!string.IsNullOrWhiteSpace(input.Name), x => x.Name.Contains(input.Name))
|
||||||
.WhereIF(input.Gender.HasValue, x => x.Gender == input.Gender)
|
.WhereIF(input.Gender.HasValue, x => x.Gender == input.Gender)
|
||||||
.WhereIF(!string.IsNullOrWhiteSpace(input.Phone), x => x.Mobile.Contains(input.Phone))
|
.WhereIF(!string.IsNullOrWhiteSpace(input.Mobile), x => x.Mobile.Contains(input.Mobile))
|
||||||
.WhereIF(!string.IsNullOrWhiteSpace(input.IdCardNumber), u => u.IdCardNumber.Contains(input.IdCardNumber))
|
.WhereIF(!string.IsNullOrWhiteSpace(input.IdCardNumber), u => u.IdCardNumber.Contains(input.IdCardNumber))
|
||||||
.WhereIF(input.PersonType == PersonType.Coach && !string.IsNullOrWhiteSpace(input.SkillLevel), x => x.SkillLevel == input.SkillLevel)
|
.WhereIF(input.PersonType == PersonType.Coach && !string.IsNullOrWhiteSpace(input.SkillLevel), x => x.SkillLevel == input.SkillLevel)
|
||||||
.WhereIF(input.PersonType == PersonType.Coach && input.CertificationStatus.HasValue, x => x.CertificationStatus == input.CertificationStatus)
|
.WhereIF(input.PersonType == PersonType.Coach && input.CertificationStatus.HasValue, x => x.CertificationStatus == input.CertificationStatus)
|
||||||
@ -142,10 +142,10 @@ public class AppUserService : BaseService<AppUserEntity>, ITransient
|
|||||||
// 校验唯一性 (手机号或身份证号,具体根据角色定)
|
// 校验唯一性 (手机号或身份证号,具体根据角色定)
|
||||||
// 运动员主要查身份证,领队教练查手机号。这里综合校验。
|
// 运动员主要查身份证,领队教练查手机号。这里综合校验。
|
||||||
var queryPhone = _appUserRep.AsQueryable()
|
var queryPhone = _appUserRep.AsQueryable()
|
||||||
.Where(x => x.Mobile == input.Phone && x.PersonType == input.PersonType && !x.DeleteMark);
|
.Where(x => x.Mobile == input.Mobile && x.PersonType == input.PersonType && !x.DeleteMark);
|
||||||
|
|
||||||
var queryIdCard = _appUserRep.AsQueryable()
|
var queryIdCard = _appUserRep.AsQueryable()
|
||||||
.Where(x => x.IdCardNumber == input.IdCard && x.PersonType == input.PersonType && !x.DeleteMark);
|
.Where(x => x.IdCardNumber == input.IdCardNumber && x.PersonType == input.PersonType && !x.DeleteMark);
|
||||||
|
|
||||||
if (input.Id.HasValue)
|
if (input.Id.HasValue)
|
||||||
{
|
{
|
||||||
@ -201,11 +201,11 @@ public class AppUserService : BaseService<AppUserEntity>, ITransient
|
|||||||
|
|
||||||
entity.Name = input.Name;
|
entity.Name = input.Name;
|
||||||
entity.Gender = input.Gender;
|
entity.Gender = input.Gender;
|
||||||
entity.IdCardNumber = input.IdCard;
|
entity.IdCardNumber = input.IdCardNumber;
|
||||||
entity.IdCardImageUrl = input.IdCardUrl;
|
entity.IdCardImageUrl = input.IdCardUrl;
|
||||||
entity.Mobile = input.Phone;
|
entity.Mobile = input.Mobile;
|
||||||
entity.Remark = input.Remark;
|
entity.Remark = input.Remark;
|
||||||
entity.AuditRemark = "";
|
entity.AuditRemark = "";
|
||||||
|
|
||||||
// 计算年龄逻辑
|
// 计算年龄逻辑
|
||||||
if (input.BirthDate.HasValue)
|
if (input.BirthDate.HasValue)
|
||||||
|
|||||||
@ -64,7 +64,7 @@ public class MemberQueryInput : Pagination
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 联系电话
|
/// 联系电话
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? Phone { get; set; }
|
public string? Mobile { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 身份证号 (运动员常用)
|
/// 身份证号 (运动员常用)
|
||||||
@ -157,7 +157,7 @@ public class CreateOrUpdateMemberInput
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
//[Required(ErrorMessage = "身份证号不能为空")]
|
//[Required(ErrorMessage = "身份证号不能为空")]
|
||||||
//[RegularExpression(@"(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)", ErrorMessage = "身份证号格式不正确")]
|
//[RegularExpression(@"(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)", ErrorMessage = "身份证号格式不正确")]
|
||||||
public string IdCard { get; set; }
|
public string IdCardNumber { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 身份证图片URL
|
/// 身份证图片URL
|
||||||
@ -174,7 +174,7 @@ public class CreateOrUpdateMemberInput
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[Required(ErrorMessage = "联系电话不能为空")]
|
[Required(ErrorMessage = "联系电话不能为空")]
|
||||||
[RegularExpression(@"^1[3456789]\d{9}$", ErrorMessage = "手机号格式不正确")]
|
[RegularExpression(@"^1[3456789]\d{9}$", ErrorMessage = "手机号格式不正确")]
|
||||||
public string Phone { get; set; }
|
public string Mobile { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 技能等级(教练特有)
|
/// 技能等级(教练特有)
|
||||||
|
|||||||
@ -302,7 +302,7 @@ public class CertificateTemplateOutput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 状态
|
/// 状态
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Status { get; set; }
|
public AvailabilityStatus Status { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 创建时间
|
/// 创建时间
|
||||||
|
|||||||
@ -1,57 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel.DataAnnotations;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace YD_Event.Application.Certificate.Dtos
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 创建证书输入参数
|
|
||||||
/// </summary>
|
|
||||||
public class CreateCertificateInput
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 证书名称
|
|
||||||
/// </summary>
|
|
||||||
[Required(ErrorMessage = "证书名称不能为空")]
|
|
||||||
[StringLength(100, ErrorMessage = "证书名称长度不能超过100个字符")]
|
|
||||||
public string Name { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 证书标题
|
|
||||||
/// </summary>
|
|
||||||
[Required(ErrorMessage = "证书标题不能为空")]
|
|
||||||
[StringLength(200, ErrorMessage = "证书标题长度不能超过200个字符")]
|
|
||||||
public string Title { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 发放规则
|
|
||||||
/// </summary>
|
|
||||||
[StringLength(500, ErrorMessage = "发放规则长度不能超过500个字符")]
|
|
||||||
public string IssueRule { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 证书模板内容
|
|
||||||
/// </summary>
|
|
||||||
public string TemplateContent { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 二维码地址
|
|
||||||
/// </summary>
|
|
||||||
[StringLength(200, ErrorMessage = "二维码地址长度不能超过200个字符")]
|
|
||||||
public string QrCodeUrl { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 证书状态
|
|
||||||
/// </summary>
|
|
||||||
[Required(ErrorMessage = "证书状态不能为空")]
|
|
||||||
public AvailabilityStatus Status { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 排序
|
|
||||||
/// </summary>
|
|
||||||
public int Sort { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -321,7 +321,7 @@ public class PersonInput
|
|||||||
/// 身份证号
|
/// 身份证号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Required]
|
[Required]
|
||||||
public string IdCard { get; set; }
|
public string IdCardNumber { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 性别
|
/// 性别
|
||||||
@ -331,7 +331,7 @@ public class PersonInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 电话
|
/// 电话
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Phone { get; set; }
|
public string Mobile { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 出生日期
|
/// 出生日期
|
||||||
@ -413,7 +413,7 @@ public class UpdatePlayerInput
|
|||||||
/// 身份证号
|
/// 身份证号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Required]
|
[Required]
|
||||||
public string IdCard { get; set; }
|
public string IdCardNumber { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 性别
|
/// 性别
|
||||||
@ -423,7 +423,7 @@ public class UpdatePlayerInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 电话
|
/// 电话
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Phone { get; set; }
|
public string Mobile { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -587,7 +587,7 @@ public class RegistrationPersonDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 身份证号
|
/// 身份证号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string IdCard { get; set; }
|
public string IdCardNumber { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 性别
|
/// 性别
|
||||||
@ -597,7 +597,7 @@ public class RegistrationPersonDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 电话
|
/// 电话
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Phone { get; set; }
|
public string Mobile { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@ -359,9 +359,9 @@ public class EventClientController : IDynamicApiController
|
|||||||
PersonType = PersonType.Athlete, // 运动员
|
PersonType = PersonType.Athlete, // 运动员
|
||||||
Name = pInput.Name,
|
Name = pInput.Name,
|
||||||
Gender = pInput.Gender,
|
Gender = pInput.Gender,
|
||||||
IdCard = pInput.IdCard,
|
IdCard = pInput.IdCardNumber,
|
||||||
BirthDate = pInput.BirthDate,
|
BirthDate = pInput.BirthDate,
|
||||||
Phone = pInput.Phone,
|
Phone = pInput.Mobile,
|
||||||
GroupName = item.GroupName,
|
GroupName = item.GroupName,
|
||||||
ProjectName = project.Name,
|
ProjectName = project.Name,
|
||||||
CreatedUserId = userId,
|
CreatedUserId = userId,
|
||||||
@ -437,9 +437,9 @@ public class EventClientController : IDynamicApiController
|
|||||||
if (reg == null || reg.CreatedUserId != userId) throw Oops.Bah("无权操作");
|
if (reg == null || reg.CreatedUserId != userId) throw Oops.Bah("无权操作");
|
||||||
|
|
||||||
person.Name = input.Name;
|
person.Name = input.Name;
|
||||||
person.IdCard = input.IdCard;
|
person.IdCard = input.IdCardNumber;
|
||||||
person.Gender = input.Gender;
|
person.Gender = input.Gender;
|
||||||
person.Phone = input.Phone;
|
person.Phone = input.Mobile;
|
||||||
person.UpdatedTime = DateTime.Now;
|
person.UpdatedTime = DateTime.Now;
|
||||||
person.UpdatedUserId = userId;
|
person.UpdatedUserId = userId;
|
||||||
|
|
||||||
@ -545,9 +545,9 @@ public class EventClientController : IDynamicApiController
|
|||||||
{
|
{
|
||||||
Id = p.Id,
|
Id = p.Id,
|
||||||
Name = p.Name,
|
Name = p.Name,
|
||||||
IdCard = p.IdCard,
|
IdCardNumber = p.IdCard,
|
||||||
Gender = p.Gender,
|
Gender = p.Gender,
|
||||||
Phone = p.Phone
|
Mobile = p.Phone
|
||||||
}).ToList()
|
}).ToList()
|
||||||
}).ToList()
|
}).ToList()
|
||||||
};
|
};
|
||||||
|
|||||||
@ -104,7 +104,7 @@ public class CoachLeaderQueryInput : Pagination
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 电话
|
/// 电话
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? Phone { get; set; }
|
public string? Mobile { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -135,12 +135,12 @@ public class CoachLeaderListOutput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 身份证号
|
/// 身份证号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string IdCard { get; set; }
|
public string IdCardNumber { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 电话
|
/// 电话
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Phone { get; set; }
|
public string Mobile { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 证书ID
|
/// 证书ID
|
||||||
|
|||||||
@ -326,7 +326,7 @@ public class UserTeamMemberOutput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 身份证号 (脱敏显示)
|
/// 身份证号 (脱敏显示)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string IdCard { get; set; }
|
public string IdCardNumber { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 性别
|
/// 性别
|
||||||
|
|||||||
@ -73,15 +73,15 @@ public class EventScoreService : BaseService<EventResult>, ITransient
|
|||||||
.InnerJoin<EventRegistration>((p, c, r) => p.RegistrationId == r.Id)
|
.InnerJoin<EventRegistration>((p, c, r) => p.RegistrationId == r.Id)
|
||||||
.Where((p, c, r) => r.EventId == input.EventId && p.PersonType == input.PersonType)
|
.Where((p, c, r) => r.EventId == input.EventId && p.PersonType == input.PersonType)
|
||||||
.WhereIF(!string.IsNullOrWhiteSpace(input.Name), p => p.Name.Contains(input.Name))
|
.WhereIF(!string.IsNullOrWhiteSpace(input.Name), p => p.Name.Contains(input.Name))
|
||||||
.WhereIF(!string.IsNullOrWhiteSpace(input.Phone), p => p.Phone.Contains(input.Phone))
|
.WhereIF(!string.IsNullOrWhiteSpace(input.Mobile), p => p.Phone.Contains(input.Mobile))
|
||||||
.Select((p, c) => new CoachLeaderListOutput
|
.Select((p, c) => new CoachLeaderListOutput
|
||||||
{
|
{
|
||||||
Id = p.Id,
|
Id = p.Id,
|
||||||
Name = p.Name,
|
Name = p.Name,
|
||||||
Age = p.Age,
|
Age = p.Age,
|
||||||
Gender = p.Gender.ToString(),
|
Gender = p.Gender.ToString(),
|
||||||
IdCard = p.IdCard,
|
IdCardNumber = p.IdCard,
|
||||||
Phone = p.Phone,
|
Mobile = p.Phone,
|
||||||
CertificateId = c.Id
|
CertificateId = c.Id
|
||||||
})
|
})
|
||||||
.ToPagedListAsync(input);
|
.ToPagedListAsync(input);
|
||||||
|
|||||||
@ -223,7 +223,7 @@ public class UserEventRegistrationService : IDynamicApiController, ITransient
|
|||||||
UserId = u.Id,
|
UserId = u.Id,
|
||||||
Name = u.Name,
|
Name = u.Name,
|
||||||
Mobile = u.Mobile,
|
Mobile = u.Mobile,
|
||||||
IdCard = MaskIdCard(u.IdCardNumber),
|
IdCardNumber = MaskIdCard(u.IdCardNumber),
|
||||||
Gender = u.Gender.ToString(),
|
Gender = u.Gender.ToString(),
|
||||||
IsEligible = true,
|
IsEligible = true,
|
||||||
IneligibilityReason = ""
|
IneligibilityReason = ""
|
||||||
@ -366,7 +366,7 @@ public class UserEventRegistrationService : IDynamicApiController, ITransient
|
|||||||
{
|
{
|
||||||
Name = p.Name,
|
Name = p.Name,
|
||||||
Mobile = p.Phone,
|
Mobile = p.Phone,
|
||||||
IdCard = MaskIdCard(p.IdCard),
|
IdCardNumber = MaskIdCard(p.IdCard),
|
||||||
Gender = p.Gender.ToString()
|
Gender = p.Gender.ToString()
|
||||||
}).ToList();
|
}).ToList();
|
||||||
|
|
||||||
|
|||||||
@ -53,12 +53,12 @@ public class CreateOrderPersonInput
|
|||||||
/// 证件号码
|
/// 证件号码
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Required]
|
[Required]
|
||||||
public string IdCard { get; set; }
|
public string IdCardNumber { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 手机号
|
/// 手机号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? Phone { get; set; }
|
public string? Mobile { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 性别
|
/// 性别
|
||||||
|
|||||||
@ -99,8 +99,8 @@
|
|||||||
},
|
},
|
||||||
// 微信小程序配置
|
// 微信小程序配置
|
||||||
"WeChat": {
|
"WeChat": {
|
||||||
"AppId": "wx1234567890abcdef",
|
"AppId": "wxf5a3f98d44c3a563",
|
||||||
"Secret": "1234567890abcdef1234567890abcdef"
|
"Secret": "ef6d17e0419700c137e066aa3dce23ca"
|
||||||
},
|
},
|
||||||
// 雪花id 文档:https://github.com/yitter/IdGenerator
|
// 雪花id 文档:https://github.com/yitter/IdGenerator
|
||||||
"SnowId": {
|
"SnowId": {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user