whm
/
BookingHeChuan
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Browse Source
optimize
jianghaiqing 2 years ago
parent 3c1fa1e213 ec2bbc60a4
commit 7d6d04ad59
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File

7
Myshipping.Application/Service/DataSync/DataSyncService.cs
Unescape Escape View File

@ -2208,11 +2208,11 @@ namespace Myshipping.Application
foreach (var item in dto) foreach (var item in dto)
{ {
var model = _vesselinfo.Where(x => x.Vessel == item.Vessel && x.Voyno == item.Voyno && x.CARRIERID == item.CARRIERID && x.TenantId == UserManager.TENANT_ID).First(); var model = _vesselinfo.AsQueryable().Filter(null, true).Where(x => x.Vessel == item.Vessel && x.Voyno == item.Voyno && x.CARRIERID == item.CARRIERID && x.TenantId == UserManager.TENANT_ID).First();
model.ETA = item.ETA; model.ETA = item.ETA;
model.ETD = item.ETD; model.ETD = item.ETD;
await _vesselinfo.AsUpdateable(model).IgnoreColumns().ExecuteCommandAsync(); await _vesselinfo.AsUpdateable(model).IgnoreColumns().ExecuteCommandAsync();
var order = await _rep.AsQueryable().Where(x => x.VESSEL == item.Vessel && x.VOYNO == item.Voyno && x.CARRIERID == item.CARRIERID && x.TenantId == UserManager.TENANT_ID).ToListAsync(); var order = await _rep.AsQueryable().Filter(null, true).Where(x => x.VESSEL == item.Vessel && x.VOYNO == item.Voyno && x.CARRIERID == item.CARRIERID && x.TenantId == UserManager.TENANT_ID).ToListAsync();
if (order != null) if (order != null)
{ {
foreach (var it in order) foreach (var it in order)
@ -2288,13 +2288,14 @@ namespace Myshipping.Application
public async Task<dynamic> GetSyncVesselDate() public async Task<dynamic> GetSyncVesselDate()
{ {
var list = await _vesselinfo.AsQueryable().Where(x => x.ETD != null && x.ATD != null && x.TenantId == UserManager.TENANT_ID&&(x.Voyno!=null&&x.Voyno!="")).Select(x => new var list = await _vesselinfo.AsQueryable().Filter(null, true).Where(x =>( x.ETD == null || x.ATD == null )&& x.TenantId == UserManager.TENANT_ID&&(x.Voyno!=null&&x.Voyno!="")).Select(x => new
{ {
Vessel = x.Vessel, Vessel = x.Vessel,
Voyno = x.Voyno, Voyno = x.Voyno,
CARRIER = x.CARRIER, CARRIER = x.CARRIER,
CARRIERID = x.CARRIERID CARRIERID = x.CARRIERID
}).Distinct().ToListAsync(); }).Distinct().ToListAsync();
return list; return list;
} }

Write Preview
Loading…
Cancel
Save