上传消费数据失败 加日志
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -212,3 +212,6 @@ ServiceFabricBackup/
|
||||
*.ldf
|
||||
*.ndf
|
||||
|
||||
/Src/Dlhis.Basic/App/App
|
||||
/Src/Dlhis.Basic/App
|
||||
/Src/Dlhis.Sys/App
|
||||
|
||||
@@ -14,9 +14,13 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="App\**" />
|
||||
<Compile Remove="log\**" />
|
||||
<Content Remove="App\**" />
|
||||
<Content Remove="log\**" />
|
||||
<EmbeddedResource Remove="App\**" />
|
||||
<EmbeddedResource Remove="log\**" />
|
||||
<None Remove="App\**" />
|
||||
<None Remove="log\**" />
|
||||
<Content Update="appsettings.Development.json">
|
||||
<DependentUpon>appsettings.json</DependentUpon>
|
||||
|
||||
@@ -10,9 +10,13 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="App\**" />
|
||||
<Compile Remove="log\**" />
|
||||
<Content Remove="App\**" />
|
||||
<Content Remove="log\**" />
|
||||
<EmbeddedResource Remove="App\**" />
|
||||
<EmbeddedResource Remove="log\**" />
|
||||
<None Remove="App\**" />
|
||||
<None Remove="log\**" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ using Dlhis.Entity.Canteen.Enums;
|
||||
using Dlhis.Jip.Api;
|
||||
using Dlhis.Jip.Api.Requests;
|
||||
using Dlhis.ScheduledTask.Attributes;
|
||||
using Newtonsoft.Json;
|
||||
using SqlSugar;
|
||||
|
||||
namespace Dlhis.ScheduledTask.Jobs;
|
||||
@@ -78,49 +79,56 @@ public class CostUploadJob : BaseJob
|
||||
|
||||
}).ToList()
|
||||
};
|
||||
var response = await jipApi.UploadCostAsync(request);
|
||||
var handleData = response.Data.Where(x => x.Success == "S").ToList();
|
||||
Logger.LogInformation("CostUploadJob消费上传成功人员:{count}", handleData.Count);
|
||||
if (!handleData.Any())
|
||||
try
|
||||
{
|
||||
continue;
|
||||
}
|
||||
var workCodes = handleData.Select(x => x.WorkCode).ToList();
|
||||
|
||||
var records = await DbContext.Queryable<UserBalanceUploadRecordEntity>()
|
||||
.Where(x => workCodes.Contains(x.UserCode))
|
||||
.Where(x => x.Year == s.Year && x.Month == s.Month)
|
||||
.ToListAsync();
|
||||
|
||||
var updatedRecords = new List<UserBalanceUploadRecordEntity>();
|
||||
var newRecords = new List<UserBalanceUploadRecordEntity>();
|
||||
foreach (var item in handleData)
|
||||
{
|
||||
var record = records.FirstOrDefault(x => x.UserCode == item.WorkCode);
|
||||
if (record != null)
|
||||
var response = await jipApi.UploadCostAsync(request);
|
||||
var handleData = response.Data.Where(x => x.Success == "S").ToList();
|
||||
Logger.LogInformation("CostUploadJob消费上传成功人员:{count}", handleData.Count);
|
||||
if (!handleData.Any())
|
||||
{
|
||||
record.Cost = dict[item.WorkCode];
|
||||
updatedRecords.Add(record);
|
||||
continue;
|
||||
}
|
||||
else
|
||||
var workCodes = handleData.Select(x => x.WorkCode).ToList();
|
||||
|
||||
var records = await DbContext.Queryable<UserBalanceUploadRecordEntity>()
|
||||
.Where(x => workCodes.Contains(x.UserCode))
|
||||
.Where(x => x.Year == s.Year && x.Month == s.Month)
|
||||
.ToListAsync();
|
||||
|
||||
var updatedRecords = new List<UserBalanceUploadRecordEntity>();
|
||||
var newRecords = new List<UserBalanceUploadRecordEntity>();
|
||||
foreach (var item in handleData)
|
||||
{
|
||||
newRecords.Add(new UserBalanceUploadRecordEntity
|
||||
var record = records.FirstOrDefault(x => x.UserCode == item.WorkCode);
|
||||
if (record != null)
|
||||
{
|
||||
UserCode = item.WorkCode,
|
||||
Year = s.Year,
|
||||
Month = s.Month,
|
||||
Cost = dict[item.WorkCode]
|
||||
});
|
||||
record.Cost = dict[item.WorkCode];
|
||||
updatedRecords.Add(record);
|
||||
}
|
||||
else
|
||||
{
|
||||
newRecords.Add(new UserBalanceUploadRecordEntity
|
||||
{
|
||||
UserCode = item.WorkCode,
|
||||
Year = s.Year,
|
||||
Month = s.Month,
|
||||
Cost = dict[item.WorkCode]
|
||||
});
|
||||
}
|
||||
}
|
||||
if (updatedRecords.Any())
|
||||
{
|
||||
await DbContext.UpdateAsync(updatedRecords);
|
||||
}
|
||||
|
||||
if (newRecords.Any())
|
||||
{
|
||||
await DbContext.InsertAsync(newRecords);
|
||||
}
|
||||
}
|
||||
if (updatedRecords.Any())
|
||||
catch (Exception ex)
|
||||
{
|
||||
await DbContext.UpdateAsync(updatedRecords);
|
||||
}
|
||||
|
||||
if (newRecords.Any())
|
||||
{
|
||||
await DbContext.InsertAsync(newRecords);
|
||||
Logger.LogError(ex, "BirthdayCostUploadJob上传消费数据失败-{userCode}:{error}", JsonConvert.SerializeObject(request), ex.Message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,9 +10,13 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="App\**" />
|
||||
<Compile Remove="log\**" />
|
||||
<Content Remove="App\**" />
|
||||
<Content Remove="log\**" />
|
||||
<EmbeddedResource Remove="App\**" />
|
||||
<EmbeddedResource Remove="log\**" />
|
||||
<None Remove="App\**" />
|
||||
<None Remove="log\**" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user