From a302d7d16e6bed80511cb49813d16829eb933560 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 18 十一月 2024 09:34:12 +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-PumpMain/PumpMain.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/01-PumpMain/PumpMain.cs b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/01-PumpMain/PumpMain.cs
index de7a35b..6c6c5ba 100644
--- a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/01-PumpMain/PumpMain.cs
+++ b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/01-PumpMain/PumpMain.cs
@@ -36,7 +36,7 @@
}
else
{
- var map = db.Queryable<Entity.AssetsPumpGroupAndMainMap>().ToList().Find(x => x.PumpMainID == ID);
+ var map = db.Queryable<Entity.AssetsPumpGroupAndMainMapping>().ToList().Find(x => x.MainID == ID);
if (map != null)
{
var mapresult = db.Deleteable(map).ExecuteCommand() > 0;
@@ -59,7 +59,7 @@
}
//鎻掑叆鎷撳睍
- public long InsertsEx(Entity.AssetsPumpMain AssetsPumpMain, Entity.AssetsPumpGroupAndMainMap AssetsPumpGroupAndMainMap)
+ public long InsertsEx(Entity.AssetsPumpMain AssetsPumpMain, Entity.AssetsPumpGroupAndMainMapping AssetsPumpGroupAndMainMap)
{
if (AssetsPumpMain == null)
{
@@ -80,7 +80,7 @@
{
if (AssetsPumpGroupAndMainMap != null)
{
- AssetsPumpGroupAndMainMap.PumpMainID = result;
+ AssetsPumpGroupAndMainMap.MainID = result;
var mapresult = db.Insertable(AssetsPumpGroupAndMainMap).ExecuteReturnSnowflakeId();
if (mapresult < 0)
{
--
Gitblit v1.9.3