From bce8a2bab3d881aed3ad2c73cd1500ee52e3d709 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 21 Feb 2024 19:04:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=B0=83=E6=95=B4=E4=B8=BA=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SyncSapInfo/Job/SyncPersonJob.cs          | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPersonJob.cs b/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPersonJob.cs
index 63d80bf8..ff764c47 100644
--- a/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPersonJob.cs
+++ b/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPersonJob.cs
@@ -30,27 +30,27 @@ public class SyncPersonJob
         _logger.LogInformation("获取SAP人员数量为:{count}", persons.Count);
         if (persons.Count > 0)
         {
-            await Scoped.Temp.Value.CreateAsync(async sp =>
+            Scoped.Temp.Value.Create(sp =>
             {
                 var dbContext = sp.GetService<IDbContext>();
-                _positions = await dbContext.Queryable<PositionEntity>().ToListAsync();
-                var modifiedPersons = await GetModifiedPersonAsync(dbContext, persons.OrderByDescending(x => x.ZSTATUS).ThenBy(x => x.ZRZRQ).ToList());
+                _positions = dbContext.Queryable<PositionEntity>().ToList();
+                var modifiedPersons = GetModifiedPerson(dbContext, persons.OrderByDescending(x => x.ZSTATUS).ThenBy(x => x.ZRZRQ).ToList());
                 _logger.LogInformation("SAP人员差异数量为:{count}", modifiedPersons.Count);
                 if (modifiedPersons.Count > 0)
                 {
-                    var failedRecords = await SavePerson(modifiedPersons);
+                    var failedRecords = SavePerson(modifiedPersons);
                 }
             });
         }
     }
 
-    private async Task<int> SavePerson(List<SapPersonItem> persons)
+    private int SavePerson(List<SapPersonItem> persons)
     {
         var failure = 0;
         var workCodes = persons.Select(x => x.ZWORKCODE).ToList();
         var chunks = workCodes.Chunk(4000).ToList();
 
-        await Scoped.Temp.Value.CreateAsync(async sp =>
+        Scoped.Temp.Value.Create(sp =>
         {
             var dbContext = sp.GetService<IDbContext>();
 
@@ -58,10 +58,10 @@ public class SyncPersonJob
             {
                 _logger.LogInformation("SAP分批处理Chunk数量:{count}", searchCodes.Count());
 
-                var existsWorkCodes = await dbContext.Queryable<GainfoSapEntity>()
-                                        .Where(x => searchCodes.Contains(x.ename))
-                                        .Select(x => x.ename)
-                                        .ToListAsync();
+                var existsWorkCodes = dbContext.Queryable<GainfoSapEntity>()
+                                         .Where(x => searchCodes.Contains(x.ename))
+                                         .Select(x => x.ename)
+                                         .ToList();
 
                 var originUpdates = persons.Where(x => existsWorkCodes.Contains(x.ZWORKCODE)).ToList();
                 var existsUpdateWorkCodes = originUpdates.Select(x => x.ZWORKCODE).ToList();
@@ -80,7 +80,7 @@ public class SyncPersonJob
                     i++;
                     try
                     {
-                        await InsertPerson(dbContext, item);
+                        InsertPerson(dbContext, item);
                         _logger.LogInformation("执行新增成功 工号:{code},姓名:{name}", item.ename, item.gname);
                     }
                     catch (Exception ex)
@@ -96,7 +96,7 @@ public class SyncPersonJob
                     i++;
                     try
                     {
-                        await UpdatePerson(dbContext, item);
+                        UpdatePerson(dbContext, item);
                         _logger.LogInformation("执行更新成功 工号:{code},姓名:{name}", item.ename, item.gname);
                     }
                     catch (Exception ex)
@@ -112,7 +112,7 @@ public class SyncPersonJob
         return 0;
     }
 
-    private async Task InsertPerson(IDbContext db, GainfoSapEntity item)
+    private void InsertPerson(IDbContext db, GainfoSapEntity item)
     {
         var info = new GainfoEntity
         {
@@ -141,12 +141,12 @@ public class SyncPersonJob
             Employed = item.isowner,
         };
 
-        await db.InsertAsync(info);
+        db.Client.Insertable(info).ExecuteCommand();
     }
-    private async Task UpdatePerson(IDbContext db, GainfoSapEntity item)
+    private void UpdatePerson(IDbContext db, GainfoSapEntity item)
     {
-        var gainfo = await db.Queryable<GainfoEntity>().Where(x => x.IdNo == item.idno).FirstAsync();
-        await db.Updateable<GainfoEntity>().SetColumns(g => new GainfoEntity
+        var gainfo = db.Queryable<GainfoEntity>().Where(x => x.IdNo == item.idno).First();
+        db.Updateable<GainfoEntity>().SetColumns(g => new GainfoEntity
         {
             SapNo = item.PERNR,
             Name = item.gname,
@@ -160,12 +160,12 @@ public class SyncPersonJob
             Werks = item.WERKS
         })
         .Where(x => x.Code == item.ename)
-        .ExecuteCommandAsync();
+        .ExecuteCommand();
     }
 
-    private async Task<List<SapPersonItem>> GetModifiedPersonAsync(IDbContext db, List<SapPersonItem> sapList)
+    private List<SapPersonItem> GetModifiedPerson(IDbContext db, List<SapPersonItem> sapList)
     {
-        var last = await LoadDataAsync(db);
+        var last = LoadData(db);
         if (last.Count <= 0)
         {
             return sapList;
@@ -176,9 +176,9 @@ public class SyncPersonJob
     }
 
 
-    private async Task<List<SapPersonItem>> LoadDataAsync(IDbContext db)
+    private List<SapPersonItem> LoadData(IDbContext db)
     {
-        var gainfo = await db.Queryable<GainfoSapEntity>().ToListAsync();
+        var gainfo = db.Queryable<GainfoSapEntity>().ToList();
 
         return gainfo.Select(x => new SapPersonItem
         {