From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Service/HStation.Service.Assets.Core/04-dal/03-sqlite/01-PumpMainManage/PumpSeries.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/01-PumpMainManage/PumpSeries.cs b/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/01-PumpMainManage/PumpSeries.cs
index b15e878..42bbd0f 100644
--- a/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/01-PumpMainManage/PumpSeries.cs
+++ b/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/01-PumpMainManage/PumpSeries.cs
@@ -5,7 +5,7 @@
/// <summary>
///
/// </summary>
- public partial class PumpSeries : BaseDAL_Paras_Flags_TagName_Sorter_UseStatus<Entity.PumpSeries>, IPumpSeries
+ public partial class AssetsPumpSeries : BaseDAL_Paras_Flags_TagName_Sorter_UseStatus<Entity.AssetsPumpSeries>, IAssetsPumpSeries
{
/// <summary>
///
@@ -27,7 +27,7 @@
try
{
db.BeginTran();
- var project = db.Queryable<Entity.PumpSeries>().ToList().Find(x => x.ID == ID);
+ var project = db.Queryable<Entity.AssetsPumpSeries>().ToList().Find(x => x.ID == ID);
var result = db.Deleteable(project).ExecuteCommand() > 0;
if (!result)
{
@@ -36,7 +36,7 @@
}
else
{
- var group = db.Queryable<Entity.PumpGroup>().ToList().Find(x => x.PumpSeriesID == project.ID);
+ var group = db.Queryable<Entity.AssetsPumpGroup>().ToList().Find(x => x.PumpSeriesID == project.ID);
if (group != null)
{
var groupresult = db.Deleteable(group).ExecuteCommand() > 0;
@@ -47,10 +47,10 @@
}
else
{
- var map = db.Queryable<Entity.PumpGroupAndMainMap>()
+ var map = db.Queryable<Entity.AssetsPumpGroupAndMainMap>()
.Where(x => x.PumpGroupID == group.ID)
.ToList();
- var listid = db.Queryable<Entity.PumpGroupAndMainMap>()
+ var listid = db.Queryable<Entity.AssetsPumpGroupAndMainMap>()
.Where(x => x.PumpGroupID == group.ID)
.Select(x => x.PumpMainID)
.ToList();
@@ -64,7 +64,7 @@
}
else
{
- var main = db.Queryable<Entity.PumpMain>().ToList();
+ var main = db.Queryable<Entity.AssetsPumpMain>().ToList();
foreach (var item in main)
{
if (item.PumpSeriesID == project.ID)
@@ -72,7 +72,7 @@
listid.Add(item.ID);
}
}
- var mainresult = db.Deleteable<Entity.PumpMain>()
+ var mainresult = db.Deleteable<Entity.AssetsPumpMain>()
.In(x => x.ID, listid)
.ExecuteCommand() > 0;
if (!mainresult)
@@ -87,7 +87,7 @@
else
{
var listid = new List<long>();
- var main = db.Queryable<Entity.PumpMain>().ToList();
+ var main = db.Queryable<Entity.AssetsPumpMain>().ToList();
foreach (var item in main)
{
if (item.PumpSeriesID == project.ID)
@@ -97,7 +97,7 @@
}
if (listid.Count > 0)
{
- var mainresult = db.Deleteable<Entity.PumpMain>()
+ var mainresult = db.Deleteable<Entity.AssetsPumpMain>()
.In(x => x.ID, listid)
.ExecuteCommand() > 0;
if (!mainresult)
--
Gitblit v1.9.3