From aa07a90b7874eb285577465c4f6638e3f25c729c Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 3 Apr 2024 22:59:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=A4=90=E8=A1=A5=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=8D=B4=E5=A4=B1=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Entity/Basic/Entity/WerkEntity.cs   |  6 ------
 .../Implements/GainfoUpdateService.cs         | 19 +++----------------
 .../Jobs/MealSupplementHandlerJob.cs          |  5 +++++
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/Src/Dlhis.Entity/Basic/Entity/WerkEntity.cs b/Src/Dlhis.Entity/Basic/Entity/WerkEntity.cs
index cc462666..6d8890bb 100644
--- a/Src/Dlhis.Entity/Basic/Entity/WerkEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/WerkEntity.cs
@@ -38,12 +38,6 @@ public class WerkEntity : SugarBaseEntity
     [SugarColumn(IsNullable = false, ColumnDescription = "差异数")]
     public int DiffNumber { get; set; }
 
-    /// <summary>
-    /// 权限变更数
-    /// </summary>
-    [SugarColumn(IsNullable = false, ColumnDescription = "权限变更数")]
-    public int PermissionChangeNumber { get; set; }
-
     /// <summary>
     /// 最近同步时间
     /// </summary>
diff --git a/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs b/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs
index 99be42ef..3dfd86b9 100644
--- a/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs
+++ b/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs
@@ -90,13 +90,8 @@ public class GainfoUpdateService : IGainfoUpdateService
                     var d = modifiedPersons.First();
                     _logger.LogInformation("差异信息:{json}", d.ToJson());
                     _logger.LogInformation("差异信息:{json}", (await _dbContext.Queryable<GainfoSapEntity>().Where(x => x.ename == d.ZWORKCODE).FirstAsync())?.ToJson());
-                    var tenantResult = await _tenantApi.GetTenantsInternalAsync();
-                    _tenants = tenantResult.Data;
 
                     await SavePersonAsync(modifiedPersons);
-
-                    werkInfo.PermissionChangeNumber = 0;
-                    await _dbContext.UpdateAsync(werkInfo);
                 }
             }
 
@@ -131,18 +126,7 @@ public class GainfoUpdateService : IGainfoUpdateService
             _logger.LogInformation("SAP人员差异数量为:{count}", modifiedPersons.Count);
             if (modifiedPersons.Count > 0)
             {
-                //var tenantResult = await _tenantApi.GetTenantsInternalAsync();
-                //_tenants = tenantResult.Data;
-
-                //var codes = modifiedPersons.Select(x => x.ZWORKCODE).ToList();
-                //var userNos = await _dbContext.Queryable<GainfoEntity>().Where(x => codes.Contains(x.Code)).Select(x => x.No).ToListAsync();
-                //var dtoResult = await _devicePermissionApi.GetPermissionUsersInfoAsync(userNos);
-                //var dto = dtoResult.Data;
-
                 await SavePersonAsync(modifiedPersons);
-
-                //var rResult = await _devicePermissionApi.RePermissionUsersInfoAsync(dto);
-                //var r = rResult.Data;
             }
         }
 
@@ -152,6 +136,9 @@ public class GainfoUpdateService : IGainfoUpdateService
 
     private async Task SavePersonAsync(List<SapPersonItem> persons)
     {
+        var tenantResult = await _tenantApi.GetTenantsInternalAsync();
+        _tenants = tenantResult.Data;
+
         var workCodes = persons.Select(x => x.ZWORKCODE).ToList();
         var chunks = workCodes.Chunk(4000).ToList();
 
diff --git a/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs b/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs
index b65187fa..01d942c3 100644
--- a/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs
+++ b/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs
@@ -6,6 +6,7 @@ using Dlhis.Entity.Canteen.Entities;
 using Dlhis.Entity.Canteen.Enums;
 using Dlhis.ScheduledTask.Common.Request;
 using Dlhis.ScheduledTask.Common.Services;
+using Hangfire;
 using Kurisu.AspNetCore.Utils;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Scheduled;
@@ -51,6 +52,10 @@ public class MealSupplementHandlerJob : BaseJob
                             .SetColumns(x => x.ModifiedTime == DateTime.Now)
                             .Where(x => x.UniqueId == item.UniqueId)
                             .ExecuteCommandAsync();
+
+                //后台任务获取人员
+                BackgroundJob.Enqueue<IGainfoUpdateService>(x => x.TodoByCodeAsync(item.Code));
+
                 continue;
             }
             else