FZCZTB.git - Gitblit

			@@ -1,8 +1,11 @@
			using Admin.NET.Core;
			using Admin.NET.Core.Service;
			using Furion.DependencyInjection;
			using Furion.FriendlyException;
			using FZCZTB.NET.MD.CutomerMd;
			using FZCZTB.NET.MD.CutomerMd.Extend;
			using Mapster;
			using SqlSugar;
			using System;
			using System.Collections.Generic;
			using System.ComponentModel.DataAnnotations;
			@@ -18,12 +21,12 @@
			public class CustomerManagerS: IScoped
			{
			private readonly SqlSugarRepository<FBS_ExRole> _fBS_ExRoleRep;
			private readonly SqlSugarRepository<FBS_Customer> _fBS_CustomerRep;
			private readonly SqlSugarRepository<FBS_CustormerUsers> _fBS_CustomerRep;
			private readonly SysCacheService _sysCacheService;

			public CustomerManagerS(SysCacheService sysCacheService,
			SqlSugarRepository<FBS_ExRole> fBS_ExRoleRep,
			SqlSugarRepository<FBS_Customer> fBS_CustomerRep)
			SqlSugarRepository<FBS_CustormerUsers> fBS_CustomerRep)
			{
			_sysCacheService = sysCacheService;
			_fBS_ExRoleRep = fBS_ExRoleRep;
			@@ -44,12 +47,14 @@
			/// 返回当前可用的用户角色再注册和登录时需要返回编码
			/// </summary>
			/// <returns></returns>
			public async Task<CustomerDto> GetCustomer(int id)
			public async Task<FBS_CustormerUsers> GetCustomer(long id)
			{



			return (await _fBS_CustomerRep.GetFirstAsync(x => x.Id == id && x.Status == StatusEnum.Enable)).Adapt<CustomerDto>();

			return await _fBS_CustomerRep.AsQueryable().Where(x=>x.Id==id&&x.IsEn== true)
			//.Includes(x=>x.CoutomerExRols,y=>y.ExRole)
			.WithCache(20).FirstAsync();
			//return (await _fBS_CustomerRep.GetFirstAsync(x => x.Id == id && x.Status == StatusEnum.Enable)).Adapt<CustomerRDto>();



			@@ -58,24 +63,25 @@
			}


			/// <summary>
			/// 返回当前可用的用户角色再注册和登录时需要返回编码
			/// </summary>
			/// <returns></returns>
			public async Task<CustomerDto> UpDataCustomer(int id)
			{
			///// <summary>
			///// 返回当前可用的用户角色再注册和登录时需要返回编码
			///// </summary>
			///// <returns></returns>
			//public async Task<CustomerRDto> UpDataCustomer(int id)
			//{



			return (await _fBS_CustomerRep.GetFirstAsync(x => x.Id == id && x.Status == StatusEnum.Enable)).Adapt<CustomerDto>();
			// return (await _fBS_CustomerRep.GetFirstAsync(x => x.Id == id && x.Status == StatusEnum.Enable)).Adapt<CustomerRDto>();





			}
			//}



			}


			@@ -127,213 +133,196 @@

			}



			/// <summary>
			/// 客户表输出参数
			/// </summary>
			public class CustomerDto
			public class CustomerRDto
			{
			/// <summary>
			/// 主键Id
			/// </summary>
			public long Id { get; set; }

			/// <summary>
			/// 账号
			/// </summary>
			public string Account { get; set; }

			public virtual string Account { get; set; }

			/// <summary>
			/// 密码
			/// </summary>
			public string Password { get; set; }

			[MaxLength(512)]

			public virtual string Password { get; set; }

			/// <summary>
			/// 真实姓名
			/// </summary>
			public string RealName { get; set; }

			[MaxLength(32)]
			public virtual string RealName { get; set; }

			/// <summary>
			/// 昵称
			/// </summary>

			[MaxLength(32)]
			public string? NickName { get; set; }

			/// <summary>
			/// 头像
			/// </summary>

			[MaxLength(512)]
			public string? Avatar { get; set; }

			/// <summary>
			/// 性别
			/// </summary>
			public GenderEnum Sex { get; set; }

			/// <summary>
			/// 年龄
			/// </summary>
			public int Age { get; set; }

			/// <summary>
			/// 出生日期
			/// </summary>
			public DateTime? Birthday { get; set; }

			/// <summary>
			/// 民族
			/// </summary>
			public string? Nation { get; set; }


			/// <summary>
			/// 手机号码
			/// </summary>

			[MaxLength(16)]
			public string? Phone { get; set; }

			/// <summary>
			/// 证件类型
			/// </summary>
			public CardTypeEnum CardType { get; set; }

			/// <summary>
			/// 身份证号
			/// </summary>
			public string? IdCardNum { get; set; }

			/// <summary>
			/// 身份证
			/// </summary>
			public string? IdCardPath { get; set; }


			/// <summary>
			/// 邮箱
			/// </summary>

			[MaxLength(64)]
			public string? Email { get; set; }

			/// <summary>
			/// 地址
			/// </summary>
			public string? Address { get; set; }

			/// <summary>
			/// 文化程度
			/// </summary>
			public CultureLevelEnum CultureLevel { get; set; }

			/// <summary>
			/// 政治面貌
			/// </summary>
			public string? PoliticalOutlook { get; set; }

			/// <summary>
			/// 毕业院校
			/// </summary>
			public string? College { get; set; }

			/// <summary>
			/// 办公电话
			/// </summary>
			public string? OfficePhone { get; set; }

			/// <summary>
			/// 紧急联系人
			/// </summary>
			public string? EmergencyContact { get; set; }

			/// <summary>
			/// 紧急联系人电话
			/// </summary>
			public string? EmergencyPhone { get; set; }

			/// <summary>
			/// 紧急联系人地址
			/// </summary>
			public string? EmergencyAddress { get; set; }

			/// <summary>
			/// 个人简介
			/// </summary>
			public string? Introduction { get; set; }

			/// <summary>
			/// 排序
			/// </summary>
			public int OrderNo { get; set; }

			/// <summary>
			/// 状态
			/// </summary>
			public StatusEnum Status { get; set; }


			/// <summary>
			/// 备注
			/// </summary>

			[MaxLength(256)]
			public string? Remark { get; set; }

			/// <summary>
			/// 职级
			/// </summary>
			public string? PosLevel { get; set; }


			/// <summary>
			/// 职称
			/// </summary>
			public string? PosTitle { get; set; }

			/// <summary>
			/// 擅长领域
			/// </summary>
			public string? Expertise { get; set; }

			/// <summary>
			/// 办公区域
			/// </summary>
			public string? OfficeZone { get; set; }

			/// <summary>
			/// 办公室
			/// </summary>
			public string? Office { get; set; }

			/// <summary>
			/// 入职日期
			/// </summary>
			public DateTime? JoinDate { get; set; }

			/// <summary>
			/// 最新登录Ip
			/// </summary>
			public string? LastLoginIp { get; set; }

			/// <summary>
			/// 最新登录地点
			/// </summary>
			public string? LastLoginAddress { get; set; }

			/// <summary>
			/// 最新登录时间
			/// </summary>
			public DateTime? LastLoginTime { get; set; }

			/// <summary>
			/// 最新登录设备
			/// </summary>
			public string? LastLoginDevice { get; set; }

			/// <summary>
			/// 电子签名
			/// </summary>

			public string? Signature { get; set; }

			/// <summary>
			/// 租户Id
			/// </summary>
			public long? TenantId { get; set; }
			///// <summary>
			///// 登录角色
			///// </summary>
			//[Navigate(NavigateType.OneToMany, nameof(FBS_CoutomerExRole.CustomerId))]
			//public List<FBS_CoutomerExRole> CoutomerExRols { set; get; }

			/// <summary>
			/// 注册用户角色
			/// 注册用户角色
			/// </summary>
			public string? ExRoleCode { get; set; }

			/// <summary>
			/// 用户注册手机验证码
			/// </summary>
			public string? PhoneVCode { get; set; }

			}



			/// <summary>
			/// 客户表输出参数
			/// </summary>
			public class Cu
			{
			/// <summary>
			/// 账号
			/// </summary>

			public virtual string Account { get; set; }

			/// <summary>
			/// 密码
			/// </summary>

			[MaxLength(512)]

			public virtual string Password { get; set; }

			/// <summary>
			/// 真实姓名
			/// </summary>

			[MaxLength(32)]
			public virtual string RealName { get; set; }

			/// <summary>
			/// 昵称
			/// </summary>

			[MaxLength(32)]
			public string? NickName { get; set; }

			/// <summary>
			/// 头像
			/// </summary>

			[MaxLength(512)]
			public string? Avatar { get; set; }



			/// <summary>
			/// 手机号码
			/// </summary>

			[MaxLength(16)]
			public string? Phone { get; set; }



			/// <summary>
			/// 邮箱
			/// </summary>

			[MaxLength(64)]
			public string? Email { get; set; }




			/// <summary>
			/// 备注
			/// </summary>

			[MaxLength(256)]
			public string? Remark { get; set; }




			/// <summary>
			/// 电子签名
			/// </summary>

			public string? Signature { get; set; }

			///// <summary>
			///// 登录角色
			///// </summary>
			//[Navigate(NavigateType.OneToMany, nameof(FBS_CoutomerExRole.CustomerId))]
			//public List<FBS_CoutomerExRole> CoutomerExRols { set; get; }

			/// <summary>
			/// 注册用户角色
			/// </summary>
			public string? ExRoleCode { get; set; }

			/// <summary>
			/// 用户注册手机验证码
			/// </summary>
			public string? PhoneVCode { get; set; }

			}
			}