From 2fbfc7930364dffbb846d018226755ab66f5bcfb Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 25 三月 2024 14:31:10 +0800
Subject: [PATCH] 版本大更新
---
Yw.Service.Repair.Core/04-dal/03-sqlite/01-request/RepairRequestForm.cs | 67 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/Yw.Service.Repair.Core/4-dal/1-request/RepairRequestForm.cs b/Yw.Service.Repair.Core/04-dal/03-sqlite/01-request/RepairRequestForm.cs
similarity index 90%
copy from Yw.Service.Repair.Core/4-dal/1-request/RepairRequestForm.cs
copy to Yw.Service.Repair.Core/04-dal/03-sqlite/01-request/RepairRequestForm.cs
index 530aae1..400a7da 100644
--- a/Yw.Service.Repair.Core/4-dal/1-request/RepairRequestForm.cs
+++ b/Yw.Service.Repair.Core/04-dal/03-sqlite/01-request/RepairRequestForm.cs
@@ -1,9 +1,9 @@
-锘縩amespace Yw.DAL
+锘縩amespace Yw.DAL.SQLite
{
/// <summary>
/// RepairRequestForm
/// </summary>
- public partial class RepairRequestForm : BaseTraceDAL<Entity.RepairRequestForm>
+ public partial class RepairRequestForm : BaseTraceDAL<Entity.RepairRequestForm>, IRepairRequestForm
{
/// <summary>
///
@@ -12,7 +12,7 @@
{
get
{
- return ConfigHelper.DefaultConnectionConfig;
+ return ConfigHelper.SQLiteConnectionConfig;
}
}
@@ -122,15 +122,15 @@
/// <summary>
/// 鏇存柊 FormStatus
/// </summary>
- public bool UpdateFormStatus(long ID, int FormStatus, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
+ public bool UpdateFormStatus(long ID, int FormStatus)
{
using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
{
return db.Updateable<Entity.RepairRequestForm>()
.SetColumns(x => x.FormStatus == FormStatus)
- .SetColumns(x => x.UpdateUserID == UpdateUserID)
- .SetColumns(x => x.UpdateTime == UpdateTime)
- .SetColumns(x => x.UpdateUserName == UpdateUserName)
+ .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
+ .SetColumns(x => x.UpdateTime == DateTime.Now)
+ .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
.Where(x => x.ID == ID)
.ExecuteCommandHasChange();
}
@@ -146,7 +146,9 @@
var count = GetCountOfDay(entity.CreateTime) + 1;
entity.FormNo = $"R{entity.CreateTime.ToString("yyyyMMdd")}{count.ToString("000000")}";
}
-
+ entity.CreateUserID = UserRegister.UserID;
+ entity.CreateUserName = UserRegister.UserName;
+ entity.CreateTime = DateTime.Now;
using (var db = new SqlSugarClient(ConnectionConfig))
{
try
@@ -193,6 +195,9 @@
var count = GetCountOfDay(entity.CreateTime) + 1;
entity.FormNo = $"R{entity.CreateTime.ToString("yyyyMMdd")}{count.ToString("000000")}";
}
+ entity.CreateUserID = UserRegister.UserID;
+ entity.CreateUserName = UserRegister.UserName;
+ entity.CreateTime = DateTime.Now;
using (var db = new SqlSugarClient(ConnectionConfig))
{
try
@@ -243,18 +248,19 @@
/// <summary>
/// 椹冲洖
/// </summary>
- public bool Reject(long ID, string Reason, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
+ public bool Reject(long ID, string Reason)
{
using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
{
try
{
+ var dtNow = DateTime.Now;
db.BeginTran();
var bol = db.Updateable<Entity.RepairRequestForm>()
.SetColumns(x => x.FormStatus == (int)eRequestStatus.Rejected)
- .SetColumns(x => x.UpdateUserID == UpdateUserID)
- .SetColumns(x => x.UpdateTime == UpdateTime)
- .SetColumns(x => x.UpdateUserName == UpdateUserName)
+ .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
+ .SetColumns(x => x.UpdateTime == dtNow)
+ .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
.Where(x => x.ID == ID)
.ExecuteCommandHasChange();
if (!bol)
@@ -266,9 +272,9 @@
entity4Log.FormID = ID;
entity4Log.OperateType = (int)eRequestOperation.Reject;
entity4Log.OperateContent = "椹冲洖";
- entity4Log.OperateTime = UpdateTime;
- entity4Log.OperateUserID = UpdateUserID;
- entity4Log.OperateUserName = UpdateUserName;
+ entity4Log.OperateTime = dtNow;
+ entity4Log.OperateUserID = UserRegister.UserID;
+ entity4Log.OperateUserName = UserRegister.UserName;
entity4Log.OperateNote = Reason;
var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
if (logId < 1)
@@ -290,12 +296,13 @@
/// <summary>
/// 鍙楃悊
/// </summary>
- public bool Accept(long ID, string Note, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
+ public bool Accept(long ID, string Note)
{
using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
{
try
{
+ var dtNow = DateTime.Now;
db.BeginTran();
var entity = db.Queryable<Entity.RepairRequestForm>().Where(x => x.ID == ID).First();
if (entity == null)
@@ -313,9 +320,9 @@
var bol = db.Updateable<Entity.RepairRequestForm>()
.SetColumns(x => x.FormStatus == (int)eRequestStatus.Accepted)
- .SetColumns(x => x.UpdateUserID == UpdateUserID)
- .SetColumns(x => x.UpdateTime == UpdateTime)
- .SetColumns(x => x.UpdateUserName == UpdateUserName)
+ .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
+ .SetColumns(x => x.UpdateTime == dtNow)
+ .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
.Where(x => x.ID == ID)
.ExecuteCommandHasChange();
if (!bol)
@@ -332,9 +339,9 @@
entity4Log.FormID = ID;
entity4Log.OperateType = (int)eRequestOperation.Accept;
entity4Log.OperateContent = "鍙楃悊";
- entity4Log.OperateTime = UpdateTime;
- entity4Log.OperateUserID = UpdateUserID;
- entity4Log.OperateUserName = UpdateUserName;
+ entity4Log.OperateTime = dtNow;
+ entity4Log.OperateUserID = UserRegister.UserID;
+ entity4Log.OperateUserName = UserRegister.UserName;
entity4Log.OperateNote = Note;
var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
if (logId < 1)
@@ -348,12 +355,12 @@
#region 鐢熸垚缁翠慨鍗�
var taskCount = db.Queryable<Entity.RepairTaskForm>()
- .Where(x => x.CreateTime >= UpdateTime.Date && x.CreateTime < UpdateTime.Date.AddDays(1)).Count();
+ .Where(x => x.CreateTime >= dtNow.Date && x.CreateTime < dtNow.Date.AddDays(1)).Count();
var entity4Task = new Entity.RepairTaskForm();
entity4Task.EquipmentID = entity.EquipmentID;
entity4Task.RequestID = entity.ID;
- entity4Task.FormNo = $"T{UpdateTime.ToString("yyyyMMdd")}{taskCount.ToString("000000")}";
+ entity4Task.FormNo = $"T{dtNow.ToString("yyyyMMdd")}{taskCount.ToString("000000")}";
entity4Task.FormName = entity.FormName;
entity4Task.FormStatus = (int)eTaskStatus.Accepted;
entity4Task.Faq = entity.Faq;
@@ -361,9 +368,9 @@
entity4Task.Urgency = entity.Urgency;
entity4Task.Address = entity.Address;
entity4Task.Location = entity.Location;
- entity4Task.CreateUserID = UpdateUserID;
- entity4Task.CreateTime = UpdateTime;
- entity4Task.CreateUserName = UpdateUserName;
+ entity4Task.CreateUserID = UserRegister.UserID;
+ entity4Task.CreateTime = dtNow;
+ entity4Task.CreateUserName = UserRegister.UserName;
var taskId = db.Insertable(entity4Task).ExecuteReturnSnowflakeId();
if (taskId < 1)
@@ -379,9 +386,9 @@
entity4TaskLog.FormID = taskId;
entity4TaskLog.OperateType = (int)eTaskOperation.Accept;
entity4TaskLog.OperateContent = "鍙楃悊";
- entity4TaskLog.OperateTime = UpdateTime;
- entity4TaskLog.OperateUserID = UpdateUserID;
- entity4TaskLog.OperateUserName = UpdateUserName;
+ entity4TaskLog.OperateTime = dtNow;
+ entity4TaskLog.OperateUserID = UserRegister.UserID;
+ entity4TaskLog.OperateUserName = UserRegister.UserName;
entity4TaskLog.OperateNote = Note;
var taskLogId = db.Insertable(entity4TaskLog).ExecuteReturnSnowflakeId();
--
Gitblit v1.9.3