From d06e5f065b7d1d2ccb8812d6aeb768b825a82d1e Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 13 八月 2024 09:37:10 +0800
Subject: [PATCH] 计算修改
---
Service/HStation.Service.Organize.Core/04-dal/02-postgresql/EmployeeMain.cs | 74 ++++++++++---------------------------
1 files changed, 20 insertions(+), 54 deletions(-)
diff --git a/Service/HStation.Service.Organize.Core/04-dal/02-postgresql/EmployeeMain.cs b/Service/HStation.Service.Organize.Core/04-dal/02-postgresql/EmployeeMain.cs
index 3143ba4..0ddc330 100644
--- a/Service/HStation.Service.Organize.Core/04-dal/02-postgresql/EmployeeMain.cs
+++ b/Service/HStation.Service.Organize.Core/04-dal/02-postgresql/EmployeeMain.cs
@@ -15,10 +15,10 @@
get { return Organize.ConfigHelper.PostgreSqlConnectionConfig; }
}
- //鎻掑叆鎷撳睍(鍖呭惈鐧诲綍鐢ㄦ埛)
- public long InsertLoginUserEx(Entity.EmployeeMain employeeMain, Entity.UserLoginMap userLoginMap, Entity.LoginUserMain loginUserMain)
+ //鎻掑叆鎷撳睍
+ public long InsertEx(Entity.EmployeeMain employeeMain, Entity.UserLoginAccount userLogin, Entity.UserLoginMap loginmap)
{
- if (employeeMain == null || userLoginMap == null || loginUserMain == null)
+ if (employeeMain == null)
{
return default;
}
@@ -27,6 +27,7 @@
try
{
db.BeginTran();
+ employeeMain.AddTime = DateTime.Now.ToString();
var result = db.Insertable(employeeMain).ExecuteReturnSnowflakeId();
if (result < 0)
{
@@ -35,62 +36,27 @@
}
else
{
- var loginid = db.Insertable(loginUserMain).ExecuteReturnSnowflakeId();
- if (loginid < 0)
+ if (userLogin != null)
{
- db.RollbackTran();
- return default;
- }
- else
- {
- userLoginMap.ObjectID = result;
- userLoginMap.LoginID = loginid;
- var mainandpartmap = db.Insertable(userLoginMap).ExecuteReturnSnowflakeId();
- if (mainandpartmap < 0)
+ userLogin.CreateTime = DateTime.Now.ToString();
+ var logjinresult = db.Insertable(userLogin).ExecuteReturnSnowflakeId();
+ if (logjinresult < 0)
{
db.RollbackTran();
return default;
}
- }
- }
-
- db.CommitTran();
- return result;
- }
- catch (Exception ex)
- {
- db.RollbackTran();
- throw;
- }
- }
- }
-
- //鎻掑叆鎷撳睍(涓嶅寘鍚櫥褰曠敤鎴�)
- public long InsertEx(Entity.EmployeeMain employeeMain, Entity.UserLoginMap userLoginMap)
- {
- if (employeeMain == null || userLoginMap == null)
- {
- return default;
- }
- using (var db = new SqlSugarClient(ConnectionConfig))
- {
- try
- {
- db.BeginTran();
- var result = db.Insertable(employeeMain).ExecuteReturnSnowflakeId();
- if (result < 0)
- {
- db.RollbackTran();
- return default;
- }
- else
- {
- userLoginMap.ObjectID = result;
- var mainandpartmap = db.Insertable(userLoginMap).ExecuteReturnSnowflakeId();
- if (mainandpartmap < 0)
- {
- db.RollbackTran();
- return default;
+ else
+ {
+ loginmap.LoginID = logjinresult;
+ loginmap.ObjectID = result;
+ loginmap.ObjectType = 0;
+ var mapresult = db.Insertable(loginmap).ExecuteReturnSnowflakeId();
+ if (mapresult < 0)
+ {
+ db.RollbackTran();
+ return default;
+ }
+ }
}
}
db.CommitTran();
--
Gitblit v1.9.3