FlexJobApi.Core/Entities/UserServer/Enterprises/EnterpriseEmployee.cs
@@ -102,6 +102,16 @@ public DateTime? EnterpriseSignContractTime { get; set; } /// <summary> /// 合同编号 /// </summary> public string ContractCode { get; set; } /// <summary> /// 电子合同 /// </summary> public string ContractUrl { get; set; } /// <summary> /// 任务人员信息 /// </summary> public List<TaskInfoUser> TaskInfoUsers { get; set; } @@ -110,5 +120,6 @@ /// 合同 /// </summary> public List<EnterpriseEmployeeContract> Contracts { get; set; } } } FlexJobApi.Core/Entities/UserServer/Enterprises/EnterpriseEmployeeContract.cs
@@ -44,12 +44,12 @@ /// <summary> /// 合同编号 /// </summary> public string Code { get; set; } public string ContractCode { get; set; } /// <summary> /// 电子合同 /// </summary> public string Url { get; set; } public string ContractUrl { get; set; } } } FlexJobApi.Core/FlexJobApi.Core.xml
@@ -1740,6 +1740,16 @@ 企业签约时间 </summary> </member> <member name="P:FlexJobApi.Core.EnterpriseEmployee.ContractCode"> <summary> 合同编号 </summary> </member> <member name="P:FlexJobApi.Core.EnterpriseEmployee.ContractUrl"> <summary> 电子合同 </summary> </member> <member name="P:FlexJobApi.Core.EnterpriseEmployee.TaskInfoUsers"> <summary> 任务人员信息 @@ -1785,12 +1795,12 @@ 企业签约时间 </summary> </member> <member name="P:FlexJobApi.Core.EnterpriseEmployeeContract.Code"> <member name="P:FlexJobApi.Core.EnterpriseEmployeeContract.ContractCode"> <summary> 合同编号 </summary> </member> <member name="P:FlexJobApi.Core.EnterpriseEmployeeContract.Url"> <member name="P:FlexJobApi.Core.EnterpriseEmployeeContract.ContractUrl"> <summary> 电子合同 </summary> @@ -8184,9 +8194,69 @@ 查询个人用户签约详情 </summary> </member> <member name="P:FlexJobApi.Core.GetEnterpriseEmployeeElectronSignQuery.Id"> <summary> 灵工Id </summary> </member> <member name="P:FlexJobApi.Core.GetEnterpriseEmployeeElectronSignQuery.Code"> <summary> </summary> </member> <member name="T:FlexJobApi.Core.GetEnterpriseEmployeeElectronSignQueryResult"> <summary> 查询个人用户签约详情-结果 </summary> </member> <member name="P:FlexJobApi.Core.GetEnterpriseEmployeeElectronSignQueryResult.ContractCode"> <summary> 合同编号 </summary> </member> <member name="P:FlexJobApi.Core.GetEnterpriseEmployeeElectronSignQueryResult.UserSignContractStatus"> <summary> 灵工签约状态 </summary> </member> <member name="P:FlexJobApi.Core.GetEnterpriseEmployeeElectronSignQueryResult.Name"> <summary> 签约方信息-员工-姓名 </summary> </member> <member name="P:FlexJobApi.Core.GetEnterpriseEmployeeElectronSignQueryResult.IdentityType"> <summary> 签约方信息-员工-证件类型 </summary> </member> <member name="P:FlexJobApi.Core.GetEnterpriseEmployeeElectronSignQueryResult.Identity"> <summary> 签约方信息-员工-证件号码 </summary> </member> <member name="P:FlexJobApi.Core.GetEnterpriseEmployeeElectronSignQueryResult.UserSignContractTime"> <summary> 签约方信息-员工-签约时间 </summary> </member> <member name="P:FlexJobApi.Core.GetEnterpriseEmployeeElectronSignQueryResult.EnterpriseType"> <summary> 签约方信息-公司主体-主体类型 </summary> </member> <member name="P:FlexJobApi.Core.GetEnterpriseEmployeeElectronSignQueryResult.EnterpriseEnterpriseName"> <summary> 签约方信息-公司主体-签约主体 </summary> </member> <member name="P:FlexJobApi.Core.GetEnterpriseEmployeeElectronSignQueryResult.EnterpriseSignContractTime"> <summary> 签约方信息-公司主体-签约时间 </summary> </member> <member name="P:FlexJobApi.Core.GetEnterpriseEmployeeElectronSignQueryResult.ContractUrl"> <summary> 协议内容 </summary> </member> <member name="T:FlexJobApi.Core.GetEnterpriseEmployeeQuery"> @@ -13234,7 +13304,7 @@ </member> <member name="P:FlexJobApi.UserServer.Application.GetEnterpriseEmployeeElectronSignsQueryResultItem.Id"> <summary> Id 灵工Id </summary> </member> <member name="P:FlexJobApi.UserServer.Application.GetEnterpriseEmployeeElectronSignsQueryResultItem.EnterpriseName"> FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Queries/GetEnterpriseEmployeeElectronSignQuery.cs
@@ -1,6 +1,9 @@ using MediatR; using Mapster; using MediatR; using Newtonsoft.Json; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -13,6 +16,15 @@ [Resource([EnumResourceController.UserServerEnterpriseEmployee])] public class GetEnterpriseEmployeeElectronSignQuery : IRequest<GetEnterpriseEmployeeElectronSignQueryResult> { /// <summary> /// 灵工Id /// </summary> public Guid? Id { get; set; } /// <summary> /// /// </summary> public string Code { get; set; } } /// <summary> @@ -20,6 +32,59 @@ /// </summary> public class GetEnterpriseEmployeeElectronSignQueryResult { /// <summary> /// 合同编号 /// </summary> public string ContractCode { get; set; } /// <summary> /// 灵工签约状态 /// </summary> public EnumTaskUserSignContractStatus? UserSignContractStatus { get; set; } /// <summary> /// 签约方信息-员工-姓名 /// </summary> [MaxLength(32)] public string Name { get; set; } /// <summary> /// 签约方信息-员工-证件类型 /// </summary> [AdaptIgnore] public string IdentityType { get; set; } = "居民身份证"; /// <summary> /// 签约方信息-员工-证件号码 /// </summary> public string Identity { get; set; } /// <summary> /// 签约方信息-员工-签约时间 /// </summary> public DateTime? UserSignContractTime { get; set; } /// <summary> /// 签约方信息-公司主体-主体类型 /// </summary> [AdaptIgnore] public string EnterpriseType { get; set; } = "公司"; /// <summary> /// 签约方信息-公司主体-签约主体 /// </summary> [JsonProperty("enterpriseName")] public string EnterpriseEnterpriseName { get; set; } /// <summary> /// 签约方信息-公司主体-签约时间 /// </summary> public DateTime? EnterpriseSignContractTime { get; set; } /// <summary> /// 协议内容 /// </summary> public string ContractUrl { get; set; } } } FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Queries/GetEnterpriseEmployeeElectronSignsQuery.cs
@@ -34,7 +34,7 @@ public class GetEnterpriseEmployeeElectronSignsQueryResultItem { /// <summary> /// Id /// 灵工Id /// </summary> public Guid Id { get; set; }
@@ -54,9 +54,12 @@ .Where(it => it.SocietyCreditCode == request.Enterprise.SocietyCreditCode) .FirstOrDefaultAsync(cancellationToken); var add = false; if (enterprise == null) { add = true; enterprise = new Enterprise(); enterprise.Id = IDGen.NextID(); if (request.Enterprise.ElectronSignAccesses.IsNotNull()) { request.Enterprise.ElectronSignAccesses = await repElectronSignSetting.AsQueryable().AsNoTracking() @@ -70,6 +73,10 @@ ElectronSignAccess = it }) .ToList(); } if (request.Enterprise.EnterpriseAuth == null) { request.Enterprise.EnterpriseAuth = new SyncEnterpriseUserCommandEnterpriseAuth(); } request.Enterprise.Adapt(enterprise); enterprise.LicenseImage = GetOssUrl(enterprise.LicenseImage, request.Enterprise.LicenseImage); @@ -101,11 +108,6 @@ enterprise.EnterpriseAuth.IdentityBackImg = GetOssUrl(enterprise.EnterpriseAuth.IdentityBackImg, request.Enterprise.EnterpriseAuth.IdentityBackImg); enterprise.EnterpriseAuth.BankCardImg = GetOssUrl(enterprise.EnterpriseAuth.BankCardImg, request.Enterprise.EnterpriseAuth.BankCardImg); } if (enterprise.Id == Guid.Empty) await repEnterprise.InsertAsync(enterprise); else await repEnterprise.UpdateAsync(enterprise); if (enterprise.EnterpriseAuth.ElectronSignEnterpriseId == null) { @@ -160,6 +162,11 @@ enterprise.EnterpriseAuth.CertAccount = resultReal.Result.CertAccount; } if (add) await repEnterprise.InsertNowAsync(enterprise); else await repEnterprise.UpdateNowAsync(enterprise); var user = await repUser.AsQueryable() .Include(it => it.UserRoles) .Where(it => it.Type == EnumUserType.Enterprise && it.DataSource == request.DataSource && it.DataSourceId == request.DataSourceId) FlexJobApi.UserServer.Application/Users/Queries/GetPersonalUserInfosQueryHandler.cs
@@ -126,10 +126,7 @@ UserSignContractStatus = it.UserSignContractStatus, EnterpriseSignContractStatus = it.EnterpriseSignContractStatus, EnterpriseSignContractTime = it.EnterpriseSignContractTime, ContractUrl = it.Contracts .Where(c => c.EnterpriseSignContractStatus == it.EnterpriseSignContractStatus) .Select(c => c.Url) .FirstOrDefault(), ContractUrl = it.ContractUrl }); return request.PageModel.GetPagedListAsync<GetPersonalUserInfoSignContractsQueryResult, GetPersonalUserInfoSignContractsQueryResultItem>(q, cancellationToken); }
