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/02-postgresql/01-PumpMainManage/PumpMain.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/01-PumpMainManage/PumpMain.cs b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/01-PumpMainManage/PumpMain.cs
index 32b4625..de7a35b 100644
--- a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/01-PumpMainManage/PumpMain.cs
+++ b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/01-PumpMainManage/PumpMain.cs
@@ -5,7 +5,7 @@
/// <summary>
///
/// </summary>
- public partial class PumpMain : BaseDAL_Paras_Flags_TagName_Sorter<Entity.PumpMain>, IPumpMain
+ public partial class AssetsPumpMain : BaseDAL_Paras_Flags_TagName_Sorter<Entity.AssetsPumpMain>, IAssetsPumpMain
{
/// <summary>
///
@@ -27,7 +27,7 @@
try
{
db.BeginTran();
- var main = db.Queryable<Entity.PumpMain>().ToList().Find(x => x.ID == ID);
+ var main = db.Queryable<Entity.AssetsPumpMain>().ToList().Find(x => x.ID == ID);
var result = db.Deleteable(main).ExecuteCommand() > 0;
if (!result)
{
@@ -36,7 +36,7 @@
}
else
{
- var map = db.Queryable<Entity.PumpGroupAndMainMap>().ToList().Find(x => x.PumpMainID == ID);
+ var map = db.Queryable<Entity.AssetsPumpGroupAndMainMap>().ToList().Find(x => x.PumpMainID == ID);
if (map != null)
{
var mapresult = db.Deleteable(map).ExecuteCommand() > 0;
@@ -59,9 +59,9 @@
}
//鎻掑叆鎷撳睍
- public long InsertsEx(Entity.PumpMain pumpMain, Entity.PumpGroupAndMainMap pumpGroupAndMainMap)
+ public long InsertsEx(Entity.AssetsPumpMain AssetsPumpMain, Entity.AssetsPumpGroupAndMainMap AssetsPumpGroupAndMainMap)
{
- if (pumpMain == null)
+ if (AssetsPumpMain == null)
{
return default;
}
@@ -70,7 +70,7 @@
try
{
db.BeginTran();
- var result = db.Insertable(pumpMain).ExecuteReturnSnowflakeId();
+ var result = db.Insertable(AssetsPumpMain).ExecuteReturnSnowflakeId();
if (result < 0)
{
db.RollbackTran();
@@ -78,10 +78,10 @@
}
else
{
- if (pumpGroupAndMainMap != null)
+ if (AssetsPumpGroupAndMainMap != null)
{
- pumpGroupAndMainMap.PumpMainID = result;
- var mapresult = db.Insertable(pumpGroupAndMainMap).ExecuteReturnSnowflakeId();
+ AssetsPumpGroupAndMainMap.PumpMainID = result;
+ var mapresult = db.Insertable(AssetsPumpGroupAndMainMap).ExecuteReturnSnowflakeId();
if (mapresult < 0)
{
db.RollbackTran();
--
Gitblit v1.9.3