|
@@ -330,10 +330,14 @@ namespace SAGA.MBI.DataArrange
|
|
new CommonEqualComparer<MISpace>((a, b) => { return a.BimID == b.BimID; }));
|
|
new CommonEqualComparer<MISpace>((a, b) => { return a.BimID == b.BimID; }));
|
|
context.MSpaces.AddRange(spaces);
|
|
context.MSpaces.AddRange(spaces);
|
|
//处理设备所在空间
|
|
//处理设备所在空间
|
|
- context.RltEquipInSpaces.AddRange(newContext.RltEquipInSpaces.Where(t => context.MEquipments.Select(tt => tt.BimID).Contains((t)?.MEquipment.BimID)));
|
|
|
|
- context.RltEquipInSpaces.AddRange(newContext.RltEquipInSpaces.Where(t => context.MEquipmentParts.Select(tt => tt.BimID).Contains((t)?.MEquipment.BimID)));
|
|
|
|
- context.RltEquipInSpaces.AddRange(newContext.RltEquipInSpaces.Where(t => context.MSpaces.Select(tt => tt.BimID).Contains((t)?.MSpace.BimID)));
|
|
|
|
- context.RltBeaconinElementSps.AddRange(newContext.RltBeaconinElementSps.Where(t => context.MBeacons.Select(tt => tt.BimID).Contains((t)?.MBeacon.BimID)));
|
|
|
|
|
|
+ var bimids = context.MEquipments.Select(tt => tt.BimID).ToList();
|
|
|
|
+ context.RltEquipInSpaces.AddRange(newContext.RltEquipInSpaces.Where(t => bimids.Contains((t).MEquipment.BimID)));
|
|
|
|
+ bimids = context.MEquipmentParts.Select(tt => tt.BimID).ToList();
|
|
|
|
+ context.RltEquipInSpaces.AddRange(newContext.RltEquipInSpaces.Where(t => bimids.Contains((t).MEquipment.BimID)));
|
|
|
|
+ bimids = context.MSpaces.Select(tt => tt.BimID).ToList();
|
|
|
|
+ context.RltEquipInSpaces.AddRange(newContext.RltEquipInSpaces.Where(t => bimids.Contains((t).MSpace.BimID)));
|
|
|
|
+ bimids = context.MBeacons.Select(tt => tt.BimID).ToList();
|
|
|
|
+ context.RltBeaconinElementSps.AddRange(newContext.RltBeaconinElementSps.Where(t => bimids.Contains((t).MBeacon.BimID)));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -433,7 +437,7 @@ namespace SAGA.MBI.DataArrange
|
|
win.ShowDialog();
|
|
win.ShowDialog();
|
|
}
|
|
}
|
|
GenerateLog(bedelContext, beaddContext, bemodifyContext);
|
|
GenerateLog(bedelContext, beaddContext, bemodifyContext);
|
|
- //Traceloger.Log("执行删除数据操作");
|
|
|
|
|
|
+ Traceloger.Log("执行删除数据操作");
|
|
////删除
|
|
////删除
|
|
//bedelContext.Del();
|
|
//bedelContext.Del();
|
|
//Traceloger.Log("执行上传新数据操作");
|
|
//Traceloger.Log("执行上传新数据操作");
|