From cec8d92bdca1da0b2eafe6eb3130f4bf6f03028b Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期三, 12 三月 2025 10:21:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Service/HStation.Service.Xhs.Core/04-dal/02-postgresql/XhsProject.cs | 140 ++++++++++++++--------------------------------
1 files changed, 44 insertions(+), 96 deletions(-)
diff --git a/Service/HStation.Service.Xhs.Core/04-dal/02-postgresql/XhsProject.cs b/Service/HStation.Service.Xhs.Core/04-dal/02-postgresql/XhsProject.cs
index ec763f5..9fa3fdc 100644
--- a/Service/HStation.Service.Xhs.Core/04-dal/02-postgresql/XhsProject.cs
+++ b/Service/HStation.Service.Xhs.Core/04-dal/02-postgresql/XhsProject.cs
@@ -18,9 +18,9 @@
/// <summary>
/// 鎻掑叆鎷撳睍
/// </summary>
- public long InsertEx(Entity.XhsProject project, Entity.XhsProjectSite site)
+ public long InsertEx(Entity.XhsProject entityProject, List<Entity.XhsProjectSite> entityProjectSiteList)
{
- if (project == null)
+ if (entityProject == null)
{
return default;
}
@@ -29,10 +29,10 @@
try
{
db.BeginTran();
- if (project.ID < 1)
+ if (entityProject.ID < 1)
{
- project.ID = db.Insertable(project).ExecuteReturnSnowflakeId();
- if (project.ID < 1)
+ entityProject.ID = db.Insertable(entityProject).ExecuteReturnSnowflakeId();
+ if (entityProject.ID < 1)
{
db.RollbackTran();
return default;
@@ -40,7 +40,7 @@
}
else
{
- var bol = db.Insertable(project).ExecuteCommand() > 0;
+ var bol = db.Insertable(entityProject).ExecuteCommand() > 0;
if (!bol)
{
db.RollbackTran();
@@ -48,30 +48,33 @@
}
}
- if (site != null)
+ if (entityProjectSiteList != null && entityProjectSiteList.Count > 0)
{
- site.ProjectID = project.ID;
- if (site.ID < 1)
+ foreach (var entityProjectSite in entityProjectSiteList)
{
- site.ID = db.Insertable(site).ExecuteReturnSnowflakeId();
- if (site.ID < 1)
+ entityProjectSite.ProjectID = entityProject.ID;
+ if (entityProjectSite.ID < 1)
{
- db.RollbackTran();
- return default;
+ entityProjectSite.ID = db.Insertable(entityProjectSite).ExecuteReturnSnowflakeId();
+ if (entityProjectSite.ID < 1)
+ {
+ db.RollbackTran();
+ return default;
+ }
}
- }
- else
- {
- var bol = db.Insertable(site).ExecuteCommand() >= 0;
- if (!bol)
+ else
{
- db.RollbackTran();
- return default;
+ var bol = db.Insertable(entityProjectSite).ExecuteCommand() >= 0;
+ if (!bol)
+ {
+ db.RollbackTran();
+ return default;
+ }
}
}
}
-
- return project.ID;
+ db.CommitTran();
+ return entityProject.ID;
}
catch
{
@@ -84,13 +87,13 @@
/// <summary>
/// 缂栬緫鎷撳睍
/// </summary>
- public bool UpdateEx(Entity.XhsProject project, Entity.XhsProjectSite site)
+ public bool UpdateEx(Entity.XhsProject entityProject, List<Entity.XhsProjectSite> entityProjectSiteList)
{
- if (project == null)
+ if (entityProject == null)
{
return false;
}
- if (project.ID < 1)
+ if (entityProject.ID < 1)
{
return false;
}
@@ -99,86 +102,30 @@
try
{
db.BeginTran();
- var bol = db.Updateable(project).ExecuteCommandHasChange();
+ var bol = db.Updateable(entityProject).ExecuteCommandHasChange();
if (!bol)
{
db.RollbackTran();
return false;
}
- if (site != null)
+ if (entityProjectSiteList != null && entityProjectSiteList.Count > 0)
{
- site.ProjectID = project.ID;
- if (site.ID < 1)
+ foreach (var entityProjectSite in entityProjectSiteList)
{
- db.RollbackTran();
- return false;
- }
- bol = db.Updateable(site).ExecuteCommandHasChange();
- if (!bol)
- {
- db.RollbackTran();
- return false;
+ entityProjectSite.ProjectID = entityProject.ID;
+ if (entityProjectSite.ID < 1)
+ {
+ db.RollbackTran();
+ return false;
+ }
+ bol = db.Updateable(entityProjectSite).ExecuteCommandHasChange();
+ if (!bol)
+ {
+ db.RollbackTran();
+ return false;
+ }
}
}
- return true;
- }
- catch
- {
- db.RollbackTran();
- throw;
- }
- }
- }
-
- /// <summary>
- /// 鏇存柊寮�濮嬫椂闂�
- /// </summary>
- public virtual bool UpdateStartTime(long ID, DateTime StartTime)
- {
- using (SqlSugarClient db = new(ConnectionConfig))
- {
- return db.Updateable<Entity.XhsProject>()
- .SetColumns(x => x.StartTime == StartTime)
- .Where(x => x.ID == ID)
- .ExecuteCommand() > 0;
- }
- }
-
- /// <summary>
- /// 鏇存柊缁撴潫鏃堕棿
- /// </summary>
- public virtual bool UpdateEndTime(long ID, DateTime EndTime)
- {
- using (SqlSugarClient db = new(ConnectionConfig))
- {
- return db.Updateable<Entity.XhsProject>()
- .SetColumns(x => x.EndTime == EndTime)
- .Where(x => x.ID == ID)
- .ExecuteCommand() > 0;
- }
- }
-
- /// <summary>
- /// 閫氳繃 ID 鍒犻櫎 锛堟嫇灞曪級
- /// </summary>
- public bool DeleteExByID(long ID)
- {
- if (ID < 1)
- {
- return false;
- }
- using (var db = new SqlSugarClient(ConnectionConfig))
- {
- try
- {
- db.BeginTran();
- var bol = db.Deleteable<Entity.XhsProject>().Where(x => x.ID == ID).ExecuteCommandHasChange();
- if (!bol)
- {
- db.RollbackTran();
- return false;
- }
- db.Deleteable<Entity.XhsProjectSite>().Where(x => x.ProjectID == ID).ExecuteCommandHasChange();
db.CommitTran();
return true;
}
@@ -191,5 +138,6 @@
}
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3