From 613d1f72992fc50ff85c59f600befb9f4ba4d3f7 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 17 Jul 2024 18:27:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=8D=A1=E7=B1=BB=E5=9E=8B=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs |  4 ++
 .../Implements/GainfoUpdateService.cs         | 55 ++++++++++---------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
index baf9ed79..70bff5e0 100644
--- a/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
@@ -192,6 +192,10 @@ public class GainfoEntity : SugarBaseEntity
     /// </summary>
     [SugarColumn(ColumnDescription = "身份认证用户Id", IsNullable = true)]
     public int IdentityUserId { get; set; }
+
+
+    [SugarColumn(ColumnDescription = "卡类型", IsNullable = true)]
+    public string CardType { get; set; }
 }
 
 /// <summary>
diff --git a/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs b/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs
index c993cfbb..3fd026eb 100644
--- a/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs
+++ b/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs
@@ -266,6 +266,7 @@ public class GainfoUpdateService : IGainfoUpdateService
             CostId = item.KOSTL,
             EntryDate = item.createdate,
             ResignationDate = item.ZLZRQ,
+            CardType = item.ZZ_KLX,
             Workplace = _tenants.FirstOrDefault(x => x.Name == item.ZZ_GZDJDNM)?.Code ?? item.ZZ_GZDJDNM,
             Factory = _tenants.FirstOrDefault(x => x.Name == item.ZZ_GZDCQNM)?.Code ?? item.ZZ_GZDCQNM,
         };
@@ -324,7 +325,8 @@ public class GainfoUpdateService : IGainfoUpdateService
                     EntryDate = item.createdate,
                     ResignationDate = item.ZLZRQ,
                     Workplace = workplace,
-                    Factory = factory
+                    Factory = factory,
+                    CardType = item.ZZ_KLX
                 }).Where(x => x.Code == item.ename).ExecuteCommandAsync();
                 await _identityUserSyncService.SyncAccountAsync(gainfo.Code, gainfo.Name, gainfo.IdNo, factory);
             }
@@ -399,32 +401,31 @@ public class GainfoUpdateService : IGainfoUpdateService
         var gainfos = await _dbContext.Queryable<GainfoSapEntity>().ToListAsync();
 
         return gainfos.Select(x => new SapPersonItem
-            {
-                NAME = x.gname,
-                ZWORKCODE = x.ename,
-                ZZ_SFZH = x.idno,
-                GBDAT = x.birthday,
-                ZZ_KLX = x.ZZ_KLX,
-                ZXUELI = x.email,
-                ORGEH = x.appellation,
-                ZMOBILE = x.phone,
-                ZSTATUS = x.ZSTATUS,
-                ZRZRQ = x.createdate,
-                PERNR = x.PERNR,
-                WERKS = x.WERKS,
-                KOSTL = x.KOSTL,
-                ZZ_ZD = x.ZZ_ZD,
-                Z_ZJ = x.Z_ZJ,
-                STELL = x.STELL,
-                STELL_NM = x.STELL_NM,
-                ZLZRQ = x.ZLZRQ,
-                MASSN = x.MASSN,
-                MNTXT = x.MNTXT,
-                ZZ_COUNNM = x.ZZ_COUNNM,
-                ZZ_GZDJDNM = x.ZZ_GZDJDNM,
-                ZZ_GZDCQNM = x.ZZ_GZDCQNM
-            })
-            .ToList();
+        {
+            NAME = x.gname,
+            ZWORKCODE = x.ename,
+            ZZ_SFZH = x.idno,
+            GBDAT = x.birthday,
+            ZZ_KLX = x.ZZ_KLX,
+            ZXUELI = x.email,
+            ORGEH = x.appellation,
+            ZMOBILE = x.phone,
+            ZSTATUS = x.ZSTATUS,
+            ZRZRQ = x.createdate,
+            PERNR = x.PERNR,
+            WERKS = x.WERKS,
+            KOSTL = x.KOSTL,
+            ZZ_ZD = x.ZZ_ZD,
+            Z_ZJ = x.Z_ZJ,
+            STELL = x.STELL,
+            STELL_NM = x.STELL_NM,
+            ZLZRQ = x.ZLZRQ,
+            MASSN = x.MASSN,
+            MNTXT = x.MNTXT,
+            ZZ_COUNNM = x.ZZ_COUNNM,
+            ZZ_GZDJDNM = x.ZZ_GZDJDNM,
+            ZZ_GZDCQNM = x.ZZ_GZDCQNM
+        }).ToList();
     }