From 05d57af48f51d2ac8292bc3faaa01ca753763790 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 14 十月 2024 14:52:19 +0800
Subject: [PATCH] 增加泵型号查看界面
---
Service/HStation.Service.Xhs.Core/04-dal/02-postgresql/XhsProject.cs | 181 +++++++++++++++++----------------------------
1 files changed, 69 insertions(+), 112 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 fd2217b..9266685 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
@@ -5,7 +5,7 @@
/// <summary>
///
/// </summary>
- public partial class XhsProject : BaseDAL_Paras_Flags_TagName_Sorter_UseStatus<Entity.XhsProject>, IXhsProject
+ public partial class XhsProject : BaseDAL_Paras_Flags_TagName_TreeSorter<Entity.XhsProject>, IXhsProject
{
/// <summary>
///
@@ -18,9 +18,9 @@
/// <summary>
/// 鎻掑叆鎷撳睍
/// </summary>
- public long InsertEx(Entity.XhsProject project, Entity.XhsProjectItem Item, Entity.XhsProjectItemModel Model, Entity.XhsProjectItemModelMap Map)
+ public long InsertEx(Entity.XhsProject entityProject, List<Entity.XhsProjectSite> entityProjectSiteList)
{
- if (project == null || Item == null || Model == null || Map == null)
+ if (entityProject == null)
{
return default;
}
@@ -29,70 +29,43 @@
try
{
db.BeginTran();
- var prjlist = db.Queryable<Entity.XhsProject>().ToList();
- if (prjlist.Count > 0)
+ if (entityProject.ID < 1)
{
- project.SortCode = prjlist.Max(x => x.SortCode) + 1;
- }
- else
- {
- project.SortCode = 0;
- }
- project.UseStatus = 1;
- var nowday = prjlist.Where(x => x.CreateTime.Date == DateTime.Now.Date).ToList();
- project.PrjNumber = "Prj" + DateTime.Now.ToString("yyyyMMdd") + (nowday.Count + 1).ToString("D4");
- var result = db.Insertable(project).ExecuteReturnSnowflakeId();
- if (result < 0)
- {
- db.RollbackTran();
- return default;
- }
- else
- {
- Item.ProjectID = result;
- Item.UseStatus = 1;
- var itemlist = db.Queryable<Entity.XhsProjectItem>().ToList();
- if (itemlist.Count > 0)
- {
- Item.SortCode = itemlist.Max(x => x.SortCode) + 1;
- }
- else
- {
- Item.SortCode = 0;
- }
- var itemresult = db.Insertable(Item).ExecuteReturnSnowflakeId();
- if (itemresult < 0)
+ entityProject.ID = db.Insertable(entityProject).ExecuteReturnSnowflakeId();
+ if (entityProject.ID < 1)
{
db.RollbackTran();
return default;
}
- else
+ }
+ else
+ {
+ var bol = db.Insertable(entityProject).ExecuteCommand() > 0;
+ if (!bol)
{
- Model.ProjectID = result;
- Model.UseStatus = 1;
- var modellist = db.Queryable<Entity.XhsProjectItemModel>().ToList();
- if (modellist.Count > 0)
+ db.RollbackTran();
+ return default;
+ }
+ }
+
+ if (entityProjectSiteList != null && entityProjectSiteList.Count > 0)
+ {
+ foreach (var entityProjectSite in entityProjectSiteList)
+ {
+ entityProjectSite.ProjectID = entityProject.ID;
+ if (entityProjectSite.ID < 1)
{
- Model.SortCode = modellist.Max(x => x.SortCode) + 1;
+ entityProjectSite.ID = db.Insertable(entityProjectSite).ExecuteReturnSnowflakeId();
+ if (entityProjectSite.ID < 1)
+ {
+ db.RollbackTran();
+ return default;
+ }
}
else
{
- Model.SortCode = 0;
- }
- var Modelresult = db.Insertable(Model).ExecuteReturnSnowflakeId();
- if (Modelresult < 0)
- {
- db.RollbackTran();
- return default;
- }
- else
- {
- Map.ProjectID = result;
- Map.ItemID = itemresult;
- Map.ModelID = Modelresult;
- Map.UseStatus = 1;
- var Mapresult = db.Insertable(Map).ExecuteReturnSnowflakeId();
- if (Mapresult < 0)
+ var bol = db.Insertable(entityProjectSite).ExecuteCommand() >= 0;
+ if (!bol)
{
db.RollbackTran();
return default;
@@ -101,9 +74,9 @@
}
}
db.CommitTran();
- return result;
+ return entityProject.ID;
}
- catch (Exception ex)
+ catch
{
db.RollbackTran();
throw;
@@ -114,104 +87,88 @@
/// <summary>
/// 缂栬緫鎷撳睍
/// </summary>
- public bool UpdateEx(Entity.XhsProject project, Entity.XhsProjectItem Item)
+ public bool UpdateEx(Entity.XhsProject entityProject, List<Entity.XhsProjectSite> entityProjectSiteList)
{
- if (project == null || Item == null)
+ if (entityProject == null)
{
- return default;
+ return false;
+ }
+ if (entityProject.ID < 1)
+ {
+ return false;
}
using (var db = new SqlSugarClient(ConnectionConfig))
{
try
{
db.BeginTran();
- var result = db.Updateable(project).ExecuteCommand() > 0;
- if (!result)
+ var bol = db.Updateable(entityProject).ExecuteCommandHasChange();
+ if (!bol)
{
db.RollbackTran();
- return default;
+ return false;
}
- else
+ if (entityProjectSiteList != null && entityProjectSiteList.Count > 0)
{
- var itemresult = db.Updateable(Item).ExecuteCommand() > 0;
- if (!itemresult)
+ foreach (var entityProjectSite in entityProjectSiteList)
{
- db.RollbackTran();
- return default;
+ entityProjectSite.ProjectID = entityProject.ID;
+ if (entityProjectSite.ID < 1)
+ {
+ db.RollbackTran();
+ return false;
+ }
+ bol = db.Updateable(entityProjectSite).ExecuteCommandHasChange();
+ if (!bol)
+ {
+ db.RollbackTran();
+ return false;
+ }
}
}
db.CommitTran();
return true;
}
- catch (Exception ex)
+ catch
{
db.RollbackTran();
- return default;
throw;
}
}
}
/// <summary>
- /// 鍒犻櫎鎷撳睍
+ /// 閫氳繃 ID 鍒犻櫎 锛堟嫇灞曪級
/// </summary>
- public bool DeleteEx(long ID)
+ public bool DeleteExByID(long ID)
{
- if (ID < 0)
+ if (ID < 1)
{
- return default;
+ return false;
}
using (var db = new SqlSugarClient(ConnectionConfig))
{
try
{
db.BeginTran();
- var project = db.Queryable<Entity.XhsProject>().ToList().Where(x => x.ID == ID).First();
- var result = db.Deleteable(project).Where(x => x.ID == project.ID).ExecuteCommand() > 0;
- if (!result)
+ var bol = db.Deleteable<Entity.XhsProject>().Where(x => x.ID == ID).ExecuteCommandHasChange();
+ if (!bol)
{
db.RollbackTran();
- return default;
+ return false;
}
- else
- {
- var Item = db.Queryable<Entity.XhsProjectItem>().ToList();
- var itemresult = db.Deleteable(Item).Where(x => x.ProjectID == project.ID).ExecuteCommand() > 0;
- if (!itemresult)
- {
- db.RollbackTran();
- return default;
- }
- else
- {
- var Model = db.Queryable<Entity.XhsProjectItemModel>().ToList();
- var Modelresult = db.Deleteable(Model).Where(x => x.ProjectID == project.ID).ExecuteCommand() > 0;
- if (!Modelresult)
- {
- db.RollbackTran();
- return default;
- }
- else
- {
- var Map = db.Queryable<Entity.XhsProjectItemModelMap>().ToList();
- var Mapresult = db.Deleteable(Map).Where(x => x.ProjectID == project.ID).ExecuteCommand() > 0;
- if (!Mapresult)
- {
- db.RollbackTran();
- return default;
- }
- }
- }
- }
+ db.Deleteable<Entity.XhsProjectSite>().Where(x => x.ProjectID == ID).ExecuteCommandHasChange();
db.CommitTran();
- return result;
+ return true;
}
- catch (Exception ex)
+ catch
{
db.RollbackTran();
throw;
}
}
}
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3