yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 档案明细返回人脸base64

Browse Source
This commit is contained in:
liguoyang
2024-02-27 18:25:31 +08:00
parent e61833fa81
commit dd44750a97
5 changed files with 124 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs
View File

@@ -154,7 +154,7 @@ public class GainfosController : ControllerBase
[HttpGet("list")] [HttpGet("list")]
public async Task<Pagination<GainfoListResponse>> GetGainfoListTaskAsync([FromQuery] GainfoListRequest request) public async Task<Pagination<GainfoListResponse>> GetGainfoListTaskAsync([FromQuery] GainfoListRequest request)
{ {
return await _gainfoService.GetGainfoListTaskAsync(request); return await _gainfoService.GetGainfoListAsync(request);
} }
/// <summary> /// <summary>
@@ -163,9 +163,9 @@ public class GainfosController : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("detail")] [HttpGet("detail")]
public async Task<GainfoDetailResponse> GetGainfoDetailTaskAsync([FromQuery] GainfoDetailRequest request) public async Task<GainfoDetailResponse> GetGainfoDetailAsync([FromQuery] GainfoDetailRequest request)
{ {
return await _gainfoService.GetGainfoDetailTaskAsync(request); return await _gainfoService.GetGainfoDetailAsync(request);
} }
} }

38
Src/Dlhis.Basic/Organization/Request/GainfoDetailRequest.cs
View File

@@ -1,23 +1,25 @@
using Dlhis.Entity.Basic.Enums; using Dlhis.Entity.Basic.Enums;
using Kurisu.Core.DataAccess.Dto;
using SqlSugar;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Dlhis.Basic.Organization.Request namespace Dlhis.Basic.Organization.Request;
{
public class GainfoDetailRequest : PageDto
{
/// <summary>
/// 档案类型
/// </summary>
[Required]
[EnumDataType(typeof(GainfoStatusEnumType))]
public GainfoStatusEnumType Status { get; set; }
/// <summary> public class GainfoDetailRequest
/// 档案号 {
/// </summary> /// <summary>
[Required] /// 档案类型
public string No { get; set; } /// </summary>
} [Required]
[EnumDataType(typeof(GainfoStatusEnumType))]
public GainfoStatusEnumType Status { get; set; }
/// <summary>
/// 档案号
/// </summary>
[Required]
public string No { get; set; }
/// <summary>
/// 是否需要人脸信息
/// </summary>
public bool WithFace { get; set; }
} }

175
Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs
View File

@@ -1,109 +1,112 @@
using Dlhis.Entity.Basic.Enums; using Dlhis.Entity.Basic.Enums;
using SqlSugar;
using SqlSugar.DbConvert;
namespace Dlhis.Basic.Organization.Response namespace Dlhis.Basic.Organization.Response;
public class GainfoDetailResponse
{ {
public class GainfoDetailResponse /// <summary>
{ /// 档案号
/// <summary> /// </summary>
/// 档案号 public string No { get; set; }
/// </summary>
public string No { get; set; }
/// <summary> /// <summary>
/// SAP内部编号 /// SAP内部编号
/// </summary> /// </summary>
public string SapNo { get; set; } public string SapNo { get; set; }
/// <summary> /// <summary>
/// 姓名 /// 姓名
/// </summary> /// </summary>
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// 学工号 /// 学工号
/// </summary> /// </summary>
public string Code { get; set; } public string Code { get; set; }
/// <summary> /// <summary>
/// 部门名称 /// 部门名称
/// </summary> /// </summary>
public string DepartmentName { get; set; } public string DepartmentName { get; set; }
/// <summary> /// <summary>
/// 证件类型代码 /// 证件类型代码
/// </summary> /// </summary>
public string IdClass { get; set; } public string IdClass { get; set; }
/// <summary> /// <summary>
/// 身份证号 /// 身份证号
/// </summary> /// </summary>
public string IdNo { get; set; } public string IdNo { get; set; }
/// <summary> /// <summary>
/// 性别 /// 性别
/// </summary> /// </summary>
public GenderEnumType Gender { get; set; } public GenderEnumType Gender { get; set; }
/// <summary> /// <summary>
/// 身份证籍贯 /// 身份证籍贯
/// </summary> /// </summary>
public string NativeName { get; set; } public string NativeName { get; set; }
/// <summary> /// <summary>
/// 身份证地址 /// 身份证地址
/// </summary> /// </summary>
public string Address { get; set; } public string Address { get; set; }
/// <summary> /// <summary>
/// 生日 /// 生日
/// </summary> /// </summary>
public DateTime Birthday { get; set; } public DateTime Birthday { get; set; }
/// <summary> /// <summary>
/// 手机号码 /// 手机号码
/// </summary> /// </summary>
public string Phone { get; set; } public string Phone { get; set; }
/// <summary> /// <summary>
/// 岗位 /// 岗位
/// </summary> /// </summary>
public string Position { get; set; } public string Position { get; set; }
/// <summary> /// <summary>
/// 职等 /// 职等
/// </summary> /// </summary>
public string Grade { get; set; } public string Grade { get; set; }
/// <summary> /// <summary>
/// 学历 /// 学历
/// </summary> /// </summary>
public string Degree { get; set; } public string Degree { get; set; }
/// <summary> /// <summary>
/// 人事范围 /// 人事范围
/// </summary> /// </summary>
public string Werks { get; set; } public string Werks { get; set; }
/// <summary> /// <summary>
/// 成本中心 /// 成本中心
/// </summary> /// </summary>
public string CostId { get; set; } public string CostId { get; set; }
/// <summary> /// <summary>
/// 已婚/未婚 /// 已婚/未婚
/// </summary> /// </summary>
public string Marital { get; set; } public string Marital { get; set; }
/// <summary> /// <summary>
/// 国家 /// 国家
/// </summary> /// </summary>
public string CountryName { get; set; } public string CountryName { get; set; }
/// <summary> /// <summary>
/// 民族代码 /// 民族代码
/// </summary> /// </summary>
public string NationName { get; set; } public string NationName { get; set; }
}
/// <summary>
/// 人脸base64
/// </summary>
public string Face { get; set; }
} }

4
Src/Dlhis.Basic/Organization/Services/IGainfoService.cs
View File

@@ -29,7 +29,7 @@ public interface IGainfoService : IScopeDependency
Task<Dictionary<string, string>> GetFaceByUserCodesAsync(GetFaceByUserCodesRequest request); Task<Dictionary<string, string>> GetFaceByUserCodesAsync(GetFaceByUserCodesRequest request);
Task<Pagination<GainfoListResponse>> GetGainfoListTaskAsync(GainfoListRequest request); Task<Pagination<GainfoListResponse>> GetGainfoListAsync(GainfoListRequest request);
Task<GainfoDetailResponse> GetGainfoDetailTaskAsync(GainfoDetailRequest request); Task<GainfoDetailResponse> GetGainfoDetailAsync(GainfoDetailRequest request);
} }

14
Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
View File

@@ -332,7 +332,7 @@ public class GainfoService : IGainfoService
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
public async Task<Pagination<GainfoListResponse>> GetGainfoListTaskAsync(GainfoListRequest request) public async Task<Pagination<GainfoListResponse>> GetGainfoListAsync(GainfoListRequest request)
{ {
var page = await _gainfoStore.Queryable(request.Status) var page = await _gainfoStore.Queryable(request.Status)
.LeftJoin<DepartmentEntity>((ga, de) => ga.DepartmentNo == de.No) .LeftJoin<DepartmentEntity>((ga, de) => ga.DepartmentNo == de.No)
@@ -360,14 +360,14 @@ public class GainfoService : IGainfoService
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
public async Task<GainfoDetailResponse> GetGainfoDetailTaskAsync(GainfoDetailRequest request) public async Task<GainfoDetailResponse> GetGainfoDetailAsync(GainfoDetailRequest request)
{ {
var info = await _gainfoStore.Queryable(request.Status) var info = await _gainfoStore.Queryable(request.Status)
.LeftJoin<DepartmentEntity>((ga, de) => ga.DepartmentNo == de.No) .LeftJoin<DepartmentEntity>((ga, de) => ga.DepartmentNo == de.No)
.LeftJoin<BasicTypeEntity>((ga, de, type) => ga.Native == type.Code && type.Type == "native") .LeftJoin<BasicTypeEntity>((ga, de, type) => ga.Native == type.Code && type.Type == "native")
.LeftJoin<PositionEntity>((ga, de, type, posi) => ga.Position == posi.Name) .LeftJoin<PositionEntity>((ga, de, type, posi) => ga.Position == posi.Name)
.LeftJoin<BasicTypeEntity>((ga, de, type, posi, type2) => ga.CountryNo == type2.Code && type2.Type == "country") .LeftJoin<BasicTypeEntity>((ga, de, type, posi, type2) => ga.CountryNo == type2.Code && type2.Type == "country")
.LeftJoin<BasicTypeEntity>((ga, de, type, posi, type2, type3) => ga.Nation == type3.Code && type3.Type == "nation") .LeftJoin<BasicTypeEntity>((ga, de, type, posi, type2, type3) => ga.Nation == type3.Code && type3.Type == "nation")
.Where(ga => ga.No == request.No) .Where(ga => ga.No == request.No)
.Select((ga, de, type, posi, type2, type3) => new GainfoDetailResponse .Select((ga, de, type, posi, type2, type3) => new GainfoDetailResponse
{ {
@@ -391,7 +391,13 @@ public class GainfoService : IGainfoService
Marital = ga.Marital, Marital = ga.Marital,
CountryName = type2.Display, CountryName = type2.Display,
NationName = type3.Display, NationName = type3.Display,
}).FirstAsync(); })
.FirstAsync();
if (info != null)
{
info.Face = await _dbContext.ChangeDb("face").Queryable<GainfoFaceEntity>().Where(x => x.UserCode == info.Code).Select(x => x.Face).SingleAsync();
}
return info; return info;
} }