循环水项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
lixiaojun
2024-10-12 f2333318a31e92f6cbc3a572d8eb9fae9da0f892 
 Service/HStation.Service.Assets.Core/04-dal/02-postgresql/01-PumpMainManage/PumpGroup.cs


@@ -5,7 +5,7 @@


    /// <summary>


    ///


    /// </summary>


    public partial class PumpGroup : BaseDAL_Paras_Flags_TagName_Sorter<Entity.PumpGroup>, IPumpGroup


    public partial class AssetsPumpGroup : BaseDAL_Paras_Flags_TagName_Sorter<Entity.AssetsPumpGroup>, IAssetsPumpGroup


    {


        /// <summary>


        ///


@@ -27,7 +27,7 @@


                try


                {


                    db.BeginTran();


                    var group = db.Queryable<Entity.PumpGroup>().ToList().Find(x => x.ID == ID);


                    var group = db.Queryable<Entity.AssetsPumpGroup>().ToList().Find(x => x.ID == ID);


                    var groupresult = db.Deleteable(group).ExecuteCommand() > 0;


                    if (!groupresult)


                    {


@@ -36,11 +36,11 @@


                    }


                    else


                    {


                        var idlist = db.Queryable<Entity.PumpGroupAndMainMap>()


                        var idlist = db.Queryable<Entity.AssetsPumpGroupAndMainMap>()


                        .Where(x => x.PumpGroupID == group.ID)


                        .Select(x => x.PumpMainID) // 假设 PumpGroupID 是与 PumpMain 关联的外键


                        .Select(x => x.PumpMainID) // 假设 PumpGroupID 是与 AssetsPumpMain 关联的外键


                        .ToList();


                        var main = db.Queryable<Entity.PumpGroupAndMainMap>()


                        var main = db.Queryable<Entity.AssetsPumpGroupAndMainMap>()


                       .Where(x => x.PumpGroupID == group.ID)


                        .ToList();


                        if (main.Count > 0)


@@ -53,8 +53,8 @@


                            }


                            else


                            {


                                var Map = db.Queryable<Entity.PumpMain>().ToList();


                                var Mapresult = db.Deleteable<Entity.PumpMain>()


                                var Map = db.Queryable<Entity.AssetsPumpMain>().ToList();


                                var Mapresult = db.Deleteable<Entity.AssetsPumpMain>()


                                .In(x => x.ID, idlist)


                                .ExecuteCommand() > 0;


                                if (!Mapresult)