yuxingheng/009_DI-Elec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec

Browse Source
This commit is contained in:
xingheng 2025-09-28 10:43:52 +08:00
commit 3ac7c7822a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Learun.Application.Web/AppApi/PlotLayoutApiController.cs
View File

@ -71,7 +71,7 @@ namespace Learun.Application.Web.AppApi
#endregion
var pointsOnDwg = SqlSugarHelper.Db.Queryable<ec_enginedata_pixelEntity>().AS(pixelTbName).
Where(x => x.DrawingFileID == drawingId).ToList();
Where(x => x.DrawingFileID == drawingId && x.DeleteFlg==0).ToList();
var pointTags = SqlSugarHelper.Db.Queryable<ec_enginedataEntity>().AS(tagTbName).
Where(x => pointsOnDwg.Select(y => y.EngineDataID).Distinct().Contains(x.EngineDataID)
&& x.ObjectTypeID == pointType.ObjectTypeID).ToList();
@ -162,12 +162,12 @@ namespace Learun.Application.Web.AppApi
}
// 找出area和deck列组合重复的行
var duplicateGroups = res
.GroupBy(r => new { r.area, r.deck })
.GroupBy(r => new { r.area, r.deck, r.RoomNo })
.Where(g => g.Count() > 1)
.ToList();
if (duplicateGroups.Any())
{
return Fail("该图纸上有区域和甲板信息重复的基点存在。");
return Fail("该图纸上有甲板、房间号信息重复的基点存在。");
}
//这里要考虑下拉列表 带 ||的问题