yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 逻辑if处理

Browse Source
This commit is contained in:
liguoyang
2024-04-07 15:13:44 +08:00
parent babf8a838b
commit f4421c52f4
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Dlhis.ScheduledTask/BaseJob.cs
View File

@@ -30,7 +30,7 @@ public abstract class BaseJob : IJob
sqlSugarOptionsService.IgnoreTenant = true;
var name = this.GetType().GetCustomAttribute<RecurringJobAttribute>()!.Name;
Logger.LogDebug("[{name}]开始执行...", name);
Logger.LogInformation("[{name}]开始执行...", name);
try
{
@@ -42,7 +42,7 @@ public abstract class BaseJob : IJob
}
finally
{
Logger.LogDebug("[{name}]执行结束...", name);
Logger.LogInformation("[{name}]执行结束...", name);
DbContext.Client.QueryFilter.Restore();
sqlSugarOptionsService.IgnoreTenant = false;
}

23
Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs
View File

@@ -48,14 +48,11 @@ public class MealSupplementHandlerJob : BaseJob
if (gainfo == null)
{
gainfo = await DbContext.Queryable<GainfoEntity>().AS("GainfoLeave").Where(x => x.Code == item.Code).SingleAsync();
if (gainfo != null)
if (gainfo != null && gainfo.ResignationDate < item.Date)
{
try
{
//离职数据
if (gainfo.ResignationDate < item.Date)
{
var r = await _jinkoJIPService.SyncMealSupplementRecordsAsync(new List<SyncMealSupplementRecordRequest>
var r = await _jinkoJIPService.SyncMealSupplementRecordsAsync(new List<SyncMealSupplementRecordRequest>
{
new()
{
@@ -65,14 +62,14 @@ public class MealSupplementHandlerJob : BaseJob
}
});
await DbContext.Updateable<MealSupplementRecordEntity>()
.SetColumns(x => x.Result == r)
.SetColumns(x => x.Status == MealSupplementStatusEnumtype.Success)
.SetColumns(x => x.Sync == true)
.SetColumns(x => x.ModifiedTime == DateTime.Now)
.Where(x => x.UniqueId == item.UniqueId)
.ExecuteCommandAsync();
}
await DbContext.Updateable<MealSupplementRecordEntity>()
.SetColumns(x => x.Result == r)
.SetColumns(x => x.Status == MealSupplementStatusEnumtype.Success)
.SetColumns(x => x.Sync == true)
.SetColumns(x => x.ModifiedTime == DateTime.Now)
.Where(x => x.UniqueId == item.UniqueId)
.ExecuteCommandAsync();
}
catch
{