diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index 0a44bcf6..d6084f62 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -216,7 +216,7 @@ public class OrderService : IOrderService var balanceRecords = await _dbContext.Queryable() .Where(x => x.UserId == order.UserId) - .Where(x => x.CreateTime <= beginOfDay && x.CreateTime <= endOfDay) //今天消费记录 + .Where(x => x.CreateTime >= beginOfDay && x.CreateTime <= endOfDay) //今天消费记录 .ToListAsync(); var dayMarketCostMax = GetSetting(settings, CanteenSettingItemEnumType.DayMarketCostMax); diff --git a/Src/Dlhis.ScheduledTask/Job/SyncPersonJob.cs b/Src/Dlhis.ScheduledTask/Job/SyncPersonJob.cs index c7e27c9b..4ee9a31a 100644 --- a/Src/Dlhis.ScheduledTask/Job/SyncPersonJob.cs +++ b/Src/Dlhis.ScheduledTask/Job/SyncPersonJob.cs @@ -145,47 +145,55 @@ namespace Dlhis.ScheduledTask.Job var gainfo = await _dbContext.Queryable().Where(x => x.IdNo == item.idno).FirstAsync(); if (gainfo != null) { - gainfo.SapNo = item.PERNR; + gainfo.No = item.guestno; + gainfo.SapNo = item.ano; gainfo.Type = item.@class; gainfo.Name = item.gname; gainfo.Code = item.ename; - gainfo.Position = item.web; - gainfo.Phone = item.phone; + gainfo.CountryNo = item.country; + gainfo.IdClass = item.idcls; + gainfo.IdNo = item.idno; + gainfo.Native = item.native; + gainfo.Gender = item.sex == "F" ? GenderEnumType.Female : GenderEnumType.Male; + gainfo.Birthday = (DateTime)item.birthday; + gainfo.Address = item.address; gainfo.DepartmentNo = item.appellation; - gainfo.Employed = item.isowner; - gainfo.Remark = item.remark; + gainfo.Nation = item.nation; + gainfo.Phone = item.phone; gainfo.Degree = item.email; + gainfo.Position = item.web; + gainfo.Remark = item.remark; gainfo.Werks = item.WERKS; + gainfo.Employed = item.isowner; await _dbContext.UpdateAsync(gainfo); } else { var info = new GainfoEntity { - SapNo = item.ano, No = item.guestno, + SapNo = item.ano, Type = item.@class, Name = item.gname, Code = item.ename, CountryNo = item.country, IdClass = item.idcls, + IdNo = item.idno, Native = item.native, - Gender = item.sex =="女性"? GenderEnumType.Female: GenderEnumType.Male, + Gender = item.sex =="F"? GenderEnumType.Female: GenderEnumType.Male, Birthday = (DateTime)item.birthday, Address = item.address, + //Marital 已婚未婚 //Occuption = item.occuption, DepartmentNo = item.appellation, Nation =item.nation, Phone = item.phone, - Position = item.web, - //Log_id = item.log_id, - //Log_shift = item.log_shift, - //tLog_date = item.log_date, - //Log_ip = item.log_ip, - Employed = item.isowner, - Remark = item.remark, Degree = item.email, - Werks = item.WERKS + Position = item.web, + //CarNo + Remark = item.remark, + Werks = item.WERKS, + Employed = item.isowner, }; await _dbContext.InsertAsync(info); }