fix 优化档案查询

Src/Dlhis.Basic/JinkoSapHttpClientPack.cs

@@ -10,7 +10,7 @@ public class JinkoSapHttpClientPack : BaseAppPack
     {
         services.AddHttpClient("jinko:sap", (_, httpClient) =>
         {
-            httpClient.BaseAddress = new Uri($"http://sappipap01.jinkosolar.cn:50100");
+            httpClient.BaseAddress = new Uri("http://sappipap01.jinkosolar.cn:50100");
             httpClient.Timeout = TimeSpan.FromMinutes(10);
 
             const string credentials = "EHS_USER:y3R1hd2h*RICAC";

Src/Dlhis.Basic/Organization/Request/GainfoPageRequest.cs

@@ -22,8 +22,11 @@ public class GainfoPageRequest : PageDto, IValidatableObject
     /// 查询类型 GainfoSearchEnumType
     /// </summary>
     [EnumDataType(typeof(GainfoSearchEnumType))]
-    public GainfoSearchEnumType SearchType { get; set; }
+    public GainfoSearchEnumType? SearchType { get; set; }
-    
+
+    /// <summary>
+    /// 无条件查询所有
+    /// </summary>
     public bool IsSearchAll { get; set; }
 
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
@@ -38,6 +41,11 @@ public class GainfoPageRequest : PageDto, IValidatableObject
         });
 
 
+        if (SearchType == GainfoSearchEnumType.BusinessTrip)
+        {
+            SearchType = null;
+        }
+
         yield break;
     }
 }

Src/Dlhis.Basic/Organization/Response/GainfoOutSourceExternalInfoResponse.cs

@@ -7,9 +7,9 @@ namespace Dlhis.Basic.Organization.Response;
 public class GainfoOutSourceExternalInfoResponse : GainfoOutSourceExternalInfoDto
 {
     /// <summary>
-    /// 姓名
+    /// 对接人姓名
     /// </summary>
-    public string Name { get; set; }
+    public string SapName { get; set; }
 
     /// <summary>
     /// 入职日期

Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs

@@ -106,11 +106,7 @@ public class GainfoFaceService : IGainfoFaceService
             //ignore
         }
 
-        var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.External)
+        var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.Working)
-            .Where(x => x.IdNo == request.UserNo)
-            .SingleAsync();
-
-        gainfo ??= await _gainfoStore.Queryable(GainfoStatusEnumType.Working)
             .Where(x => x.IdNo == request.UserNo)
             .SingleAsync();
 
@@ -272,8 +268,6 @@ public class GainfoFaceService : IGainfoFaceService
         foreach (var request in requests)
         {
             var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.Working).Where(x => x.Code == request.UserNo).FirstAsync();
-            gainfo ??= await _gainfoStore.Queryable(GainfoStatusEnumType.External).Where(x => x.Code == request.UserNo).FirstAsync();
-
             gainfo.ThrowIfNull("人员档案信息不存在");
 
             var face = await _faceDbContext.Queryable<GainfoFaceEntity>().Where(x => x.UserCode == gainfo.Code).SingleAsync();

Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs

@@ -103,7 +103,7 @@ public class GainfoOutsourceService : IGainfoOutsourceService
                 Supplier = a.Supplier,
                 SapCode = a.SapCode,
                 SapPhone = a.SapPhone,
-                Name = c.Name,
+                SapName = c.Name,
                 EntryDate = b.EntryDate,
                 ResignationDate = b.ResignationDate,
                 Factory = b.Factory

Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs

@@ -70,10 +70,6 @@ public class GainfoService : IGainfoService
         var where = LinqExpressionExtensions.False<GainfoEntity>();
         var factories = _currentUser.GetUserClaim("tenants").Split(",").ToList();
 
-        var role = _currentUser.GetRole();
-        var jinkoCode = _currentUser.GetUserClaim("jinko-code") ?? string.Empty;
-        var isAll = role is "admin" or "tenant-admin";
-
         if (request.DepartmentSelections.Any())
         {
             foreach (var item in request.DepartmentSelections)
@@ -91,6 +87,20 @@ public class GainfoService : IGainfoService
             where = where.Or(gainfo => factories.Contains(gainfo.Factory));
         }
 
+        if (request.SearchType.HasValue)
+        {
+            GainfoUserTypeEnumType userTypeEnumType = request.SearchType switch
+            {
+                GainfoSearchEnumType.Internal => GainfoUserTypeEnumType.Normal,
+                GainfoSearchEnumType.Outsource => GainfoUserTypeEnumType.Outsource,
+                GainfoSearchEnumType.BusinessTrip => throw new ArgumentNullException(request.SearchType?.ToString()),
+                GainfoSearchEnumType.External => GainfoUserTypeEnumType.External,
+                null => throw new ArgumentOutOfRangeException(request.SearchType?.ToString()),
+                _ => throw new ArgumentOutOfRangeException(request.SearchType?.ToString())
+            };
+            where = where.And(x => x.Type == userTypeEnumType);
+        }
+
 
         if (request.IsSearchAll)
         {
@@ -122,19 +132,12 @@ public class GainfoService : IGainfoService
                     CardTypeName = type.Display
                 }, true)
             : _gainfoStore.Queryable(request.Status)
-                .WhereIF(request.SearchType != GainfoSearchEnumType.BusinessTrip && request.DepartmentSelections?.Any() == true, where)
                 .LeftJoin<DepartmentEntity>((gainfo, department) => gainfo.DepartmentNo == department.No)
                 .LeftJoin<BasicTypeEntity>((gainfo, department, type) => type.Code == SqlFunc.ToString(gainfo.CardType) && type.Type == "timeperiod")
-                .WhereIF(request.SearchType != GainfoSearchEnumType.BusinessTrip && request.DepartmentSelections?.Any() == false, gainfo => factories.Contains(gainfo.Factory))
+                .WhereIF(request.SearchType.HasValue == false, gainfo => SqlFunc.Subqueryable<BusinessTripEntity>()
-                .WhereIF(request.SearchType == GainfoSearchEnumType.Internal, gainfo => SqlFunc.Subqueryable<OutsourceEntity>().Where(p => p.Code == gainfo.Code).NotAny())
+                    .Where(p => p.Code == gainfo.Code && factories.Contains(p.Destination) && SqlFunc.DateIsSame(p.BeginDate, today))
-                .WhereIF(request.SearchType == GainfoSearchEnumType.Outsource, gainfo =>
+                    .Any())
-                    SqlFunc.Subqueryable<OutsourceEntity>()
+                .WhereIF(request.SearchType.HasValue, where)
-                        .Where(p => p.Code == gainfo.Code)
-                        .WhereIF(!isAll, p => p.SapCode == jinkoCode)
-                        .Any()
-                )
-                .WhereIF(request.SearchType == GainfoSearchEnumType.BusinessTrip, gainfo =>
-                    SqlFunc.Subqueryable<BusinessTripEntity>().Where(p => p.Code == gainfo.Code && factories.Contains(p.Destination) && SqlFunc.DateIsSame(p.BeginDate, today)).Any())
                 .WhereIF(request.Search.IsPresent(), gainfo =>
                     gainfo.Name.Contains(request.Search)
                     || gainfo.Code == request.Search

Src/Dlhis.Basic/Organization/Services/Implements/GainfoStore.cs

@@ -30,11 +30,6 @@ public class GainfoStore : IGainfoStore
             return _dbContext.Queryable<GainfoEntity>();
         }
 
-        if (gainfoStatus == GainfoStatusEnumType.External)
-        {
-            return _dbContext.Queryable<GainfoEntity>().Where(x => x.Type == GainfoUserTypeEnumType.External);
-        }
-
         var tableName = typeof(GainfoEntity).GetCustomAttribute<SugarTable>()!.TableName;
         return _dbContext.Queryable<GainfoEntity>().AS(tableName + gainfoStatus);
     }

Src/Dlhis.Basic/Organization/Services/Implements/GainfoUpdateService.cs

@@ -364,7 +364,7 @@ public class GainfoUpdateService : IGainfoUpdateService
             return sapList;
         }
 
-        var needRemove = sapList.Intersect(last, new SapPersonComparer()).ToList();
+        var needRemove = sapList.Intersect(last, new SapPersonComparer());
         return sapList.Except(needRemove, new SapPersonComparer()).ToList();
     }
 

Src/Dlhis.Entity/Basic/Enums/GainfoSearchEnumType.cs

@@ -21,5 +21,12 @@ public enum GainfoSearchEnumType
     /// 出差人员
     /// </summary>
     [Description("出差人员")]
-    BusinessTrip = 3
+    BusinessTrip = 3,
+
+
+    /// <summary>
+    /// 外部人员
+    /// </summary>
+    [Description("外部人员")]
+    External = 4
 }

Src/Dlhis.Entity/Basic/Enums/GainfoStatusEnumType.cs

@@ -18,11 +18,5 @@ public enum GainfoStatusEnumType
     /// 离职
     /// </summary>
     [Description("离职")]
-    Leave = 2,
+    Leave = 2
-
-    /// <summary>
-    /// 外部
-    /// </summary>
-    [Description("外部")]
-    External = 3
 }