From fc0da62986168fb738ff5a4249f22fb8b55f5aa7 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 31 May 2024 16:04:05 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E8=8E=B7=E5=8F=96=E9=A2=9D=E5=A4=96?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/GainfoOutsourceController.cs  | 17 ++++++++++++++--
 .../Request/GainfoOutsourceRequest.cs         |  6 ++++--
 .../GainfoOutSourceExternalInfoResponse.cs    | 11 ++++++++++
 .../Services/IGainfoOutsourceService.cs       | 13 ++++++++++++
 .../Implements/GainfoOutsourceService.cs      | 20 ++++++++++++++++++-
 5 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 Src/Dlhis.Basic/Organization/Response/GainfoOutSourceExternalInfoResponse.cs

diff --git a/Src/Dlhis.Basic/Organization/Controllers/GainfoOutsourceController.cs b/Src/Dlhis.Basic/Organization/Controllers/GainfoOutsourceController.cs
index be411c7e..9836807f 100644
--- a/Src/Dlhis.Basic/Organization/Controllers/GainfoOutsourceController.cs
+++ b/Src/Dlhis.Basic/Organization/Controllers/GainfoOutsourceController.cs
@@ -1,4 +1,6 @@
-using Dlhis.Basic.Organization.Request;
+using System.ComponentModel.DataAnnotations;
+using Dlhis.Basic.Organization.Request;
+using Dlhis.Basic.Organization.Response;
 using Dlhis.Basic.Organization.Services;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
 using Microsoft.AspNetCore.Authorization;
@@ -31,7 +33,7 @@ public class GainfoOutsourceController : ControllerBase
     {
         await _gainfoOutSourceService.SaveAsync(request);
     }
-    
+
     /// <summary>
     /// 编辑
     /// </summary>
@@ -42,4 +44,15 @@ public class GainfoOutsourceController : ControllerBase
     {
         await _gainfoOutSourceService.SaveAsync(request);
     }
+
+    /// <summary>
+    /// 获取外包人员额外信息
+    /// </summary>
+    /// <param name="userNo"></param>
+    /// <returns></returns>
+    [HttpGet("info")]
+    public async Task<GainfoOutSourceExternalInfoResponse> GetExternalInfoAsync([Required] string userNo)
+    {
+        return await _gainfoOutSourceService.GetExternalInfoAsync(userNo);
+    }
 }
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Organization/Request/GainfoOutsourceRequest.cs b/Src/Dlhis.Basic/Organization/Request/GainfoOutsourceRequest.cs
index ca34751c..35d9ef8a 100644
--- a/Src/Dlhis.Basic/Organization/Request/GainfoOutsourceRequest.cs
+++ b/Src/Dlhis.Basic/Organization/Request/GainfoOutsourceRequest.cs
@@ -55,13 +55,15 @@ public class GainfoOutsourceRequest
     /// <summary>
     /// 入职日期
     /// </summary>
-    public DateTime? EntryDate { get; set; }
+    public DateTime EntryDate { get; set; }
 
     /// <summary>
     /// 离职日期
     /// </summary>
     public DateTime? ResignationDate { get; set; }
 
-    
+    /// <summary>
+    /// 额外信息
+    /// </summary>
     public GainfoOutSourceExternalInfoDto ExternalInfo { get; set; }
 }
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoOutSourceExternalInfoResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoOutSourceExternalInfoResponse.cs
new file mode 100644
index 00000000..1a071002
--- /dev/null
+++ b/Src/Dlhis.Basic/Organization/Response/GainfoOutSourceExternalInfoResponse.cs
@@ -0,0 +1,11 @@
+using Dlhis.Basic.Organization.Dto;
+
+namespace Dlhis.Basic.Organization.Response;
+
+public class GainfoOutSourceExternalInfoResponse : GainfoOutSourceExternalInfoDto
+{
+    /// <summary>
+    /// 姓名
+    /// </summary>
+    public string Name { get; set; } 
+}
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Organization/Services/IGainfoOutsourceService.cs b/Src/Dlhis.Basic/Organization/Services/IGainfoOutsourceService.cs
index f1427fd9..d160e9fc 100644
--- a/Src/Dlhis.Basic/Organization/Services/IGainfoOutsourceService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/IGainfoOutsourceService.cs
@@ -1,8 +1,21 @@
 using Dlhis.Basic.Organization.Request;
+using Dlhis.Basic.Organization.Response;
 
 namespace Dlhis.Basic.Organization.Services;
 
 public interface IGainfoOutsourceService : IScopeDependency
 {
+    /// <summary>
+    /// 保存/编辑外包人员信息
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
     Task SaveAsync(GainfoOutsourceRequest request);
+
+    /// <summary>
+    /// 获取额外信息
+    /// </summary>
+    /// <param name="userNo"></param>
+    /// <returns></returns>
+    Task<GainfoOutSourceExternalInfoResponse> GetExternalInfoAsync(string userNo);
 }
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs
index ec027ec7..7f3249aa 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs
@@ -1,4 +1,5 @@
 using Dlhis.Basic.Organization.Request;
+using Dlhis.Basic.Organization.Response;
 using Dlhis.Entity.Basic.Entity;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
 using Kurisu.AspNetCore.Utils;
@@ -13,7 +14,7 @@ public class GainfoOutsourceService : IGainfoOutsourceService
     private readonly IDbContext _dbContext;
     private readonly RedisCache _redisCache;
 
-    public GainfoOutsourceService(IDbContext dbContext, RedisCache redisCache )
+    public GainfoOutsourceService(IDbContext dbContext, RedisCache redisCache)
     {
         _dbContext = dbContext;
         _redisCache = redisCache;
@@ -55,6 +56,23 @@ public class GainfoOutsourceService : IGainfoOutsourceService
     }
 
 
+    public async Task<GainfoOutSourceExternalInfoResponse> GetExternalInfoAsync(string userNo)
+    {
+        return await _dbContext.Queryable<OutsourceEntity>()
+            .LeftJoin<GainfoEntity>((a, b) => a.Code == b.Code)
+            .LeftJoin<GainfoEntity>((a, b, c) => a.SapCode == c.Code)
+            .Where((a, b, c) => b.No == userNo)
+            .Select((a, b, c) => new GainfoOutSourceExternalInfoResponse
+            {
+                Supplier = a.Supplier,
+                SapCode = a.SapCode,
+                SapPhone = a.SapPhone,
+                Name = c.Name
+            })
+            .SingleAsync();
+    }
+
+
     //********************************************************************** help methods ***********************************************************************************
 
     private async Task<string> GetOutSourceCodeAsync()