fix 档案明细返回人脸base64

2024-02-27 18:25:31 +08:00
parent e61833fa81
commit dd44750a97
5 changed files with 124 additions and 113 deletions
--- a/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs
+++ b/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs
@@ -154,7 +154,7 @@ public class GainfosController : ControllerBase
    [HttpGet("list")]
    public async Task<Pagination<GainfoListResponse>> GetGainfoListTaskAsync([FromQuery] GainfoListRequest request)
    {
-        return await _gainfoService.GetGainfoListTaskAsync(request);
+        return await _gainfoService.GetGainfoListAsync(request);
    }

    /// <summary>
@@ -163,9 +163,9 @@ public class GainfosController : ControllerBase
    /// <param name="request"></param>
    /// <returns></returns>
    [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);
    }
 }

--- a/Src/Dlhis.Basic/Organization/Request/GainfoDetailRequest.cs
+++ b/Src/Dlhis.Basic/Organization/Request/GainfoDetailRequest.cs
@@ -1,23 +1,25 @@
 using Dlhis.Entity.Basic.Enums;
-using Kurisu.Core.DataAccess.Dto;
-using SqlSugar;
 using System.ComponentModel.DataAnnotations;

-namespace Dlhis.Basic.Organization.Request
-{
-    public class GainfoDetailRequest : PageDto
-    {
-        /// <summary>
-        /// 档案类型
-        /// </summary>
-        [Required]
-        [EnumDataType(typeof(GainfoStatusEnumType))]
-        public GainfoStatusEnumType Status { get; set; }
+namespace Dlhis.Basic.Organization.Request;

-        /// <summary>
-        /// 档案号
-        /// </summary>
-        [Required]
-        public string No { get; set; }
-    }
+public class GainfoDetailRequest
+{
+    /// <summary>
+    /// 档案类型
+    /// </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; }
 }
--- a/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs
+++ b/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs
@@ -1,109 +1,112 @@
 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>
-        public string No { get; set; }
+    /// <summary>
+    /// 档案号
+    /// </summary>
+    public string No { get; set; }

-        /// <summary>
-        /// SAP内部编号
-        /// </summary>
-        public string SapNo { get; set; }
+    /// <summary>
+    /// SAP内部编号
+    /// </summary>
+    public string SapNo { get; set; }

-        /// <summary>
-        /// 姓名
-        /// </summary>
-        public string Name { get; set; }
+    /// <summary>
+    /// 姓名
+    /// </summary>
+    public string Name { get; set; }

-        /// <summary>
-        /// 学工号
-        /// </summary>
-        public string Code { get; set; }
+    /// <summary>
+    /// 学工号
+    /// </summary>
+    public string Code { get; set; }

-        /// <summary>
-        /// 部门名称
-        /// </summary>
-        public string DepartmentName { get; set; }
+    /// <summary>
+    /// 部门名称
+    /// </summary>
+    public string DepartmentName { get; set; }

-        /// <summary>
-        /// 证件类型代码
-        /// </summary>
-        public string IdClass { get; set; }
+    /// <summary>
+    /// 证件类型代码
+    /// </summary>
+    public string IdClass { get; set; }

-        /// <summary>
-        /// 身份证号
-        /// </summary>
-        public string IdNo { get; set; }
+    /// <summary>
+    /// 身份证号
+    /// </summary>
+    public string IdNo { get; set; }

-        /// <summary>
-        /// 性别
-        /// </summary>
-        public GenderEnumType Gender { get; set; }
+    /// <summary>
+    /// 性别
+    /// </summary>
+    public GenderEnumType Gender { get; set; }

-        /// <summary>
-        /// 身份证籍贯
-        /// </summary>
-        public string NativeName { get; set; }
+    /// <summary>
+    /// 身份证籍贯
+    /// </summary>
+    public string NativeName { get; set; }

-        /// <summary>
-        /// 身份证地址
-        /// </summary>
-        public string Address { get; set; }
+    /// <summary>
+    /// 身份证地址
+    /// </summary>
+    public string Address { get; set; }

-        /// <summary>
-        /// 生日
-        /// </summary>
-        public DateTime Birthday { get; set; }
+    /// <summary>
+    /// 生日
+    /// </summary>
+    public DateTime Birthday { get; set; }

-        /// <summary>
-        /// 手机号码
-        /// </summary>
-        public string Phone { get; set; }
+    /// <summary>
+    /// 手机号码
+    /// </summary>
+    public string Phone { get; set; }

-        /// <summary>
-        /// 岗位
-        /// </summary>
-        public string Position { get; set; }
+    /// <summary>
+    /// 岗位
+    /// </summary>
+    public string Position { get; set; }

-        /// <summary>
-        /// 职等
-        /// </summary>
-        public string Grade { get; set; }
+    /// <summary>
+    /// 职等
+    /// </summary>
+    public string Grade { get; set; }

-        /// <summary>
-        /// 学历
-        /// </summary>
-        public string Degree { get; set; }
+    /// <summary>
+    /// 学历
+    /// </summary>
+    public string Degree { get; set; }

-        /// <summary>
-        /// 人事范围
-        /// </summary>
-        public string Werks { get; set; }
+    /// <summary>
+    /// 人事范围
+    /// </summary>
+    public string Werks { get; set; }

-        /// <summary>
-        /// 成本中心
-        /// </summary>
-        public string CostId { get; set; }
+    /// <summary>
+    /// 成本中心
+    /// </summary>
+    public string CostId { get; set; }

-        /// <summary>
-        /// 已婚/未婚
-        /// </summary>
-        public string Marital { get; set; }
+    /// <summary>
+    /// 已婚/未婚
+    /// </summary>
+    public string Marital { get; set; }

-        /// <summary>
-        /// 国家
-        /// </summary>
-        public string CountryName { get; set; }
+    /// <summary>
+    /// 国家
+    /// </summary>
+    public string CountryName { get; set; }

-        /// <summary>
-        /// 民族代码
-        /// </summary>
-        public string NationName { get; set; }
-    }
+    /// <summary>
+    /// 民族代码
+    /// </summary>
+    public string NationName { get; set; }
+
+
+    /// <summary>
+    /// 人脸base64
+    /// </summary>
+    public string Face { get; set; }
 }
--- a/Src/Dlhis.Basic/Organization/Services/IGainfoService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/IGainfoService.cs
@@ -29,7 +29,7 @@ public interface IGainfoService : IScopeDependency

    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);
 }
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
@@ -332,7 +332,7 @@ public class GainfoService : IGainfoService
    /// </summary>
    /// <param name="request"></param>
    /// <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)
            .LeftJoin<DepartmentEntity>((ga, de) => ga.DepartmentNo == de.No)
@@ -360,14 +360,14 @@ public class GainfoService : IGainfoService
    /// </summary>
    /// <param name="request"></param>
    /// <returns></returns>
-    public async Task<GainfoDetailResponse> GetGainfoDetailTaskAsync(GainfoDetailRequest request)
+    public async Task<GainfoDetailResponse> GetGainfoDetailAsync(GainfoDetailRequest request)
    {
        var info = await _gainfoStore.Queryable(request.Status)
            .LeftJoin<DepartmentEntity>((ga, de) => ga.DepartmentNo == de.No)
            .LeftJoin<BasicTypeEntity>((ga, de, type) => ga.Native == type.Code && type.Type == "native")
            .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, 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)
            .Select((ga, de, type, posi, type2, type3) => new GainfoDetailResponse
            {
@@ -391,7 +391,13 @@ public class GainfoService : IGainfoService
                Marital = ga.Marital,
                CountryName = type2.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;
    }