From 0c1a03e880bbf795b771a9c8ee4b7b271c262b58 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期五, 12 九月 2025 14:23:56 +0800
Subject: [PATCH] 切换验收数据库
---
MES.Service/service/BasicData/MesStaffManager.cs | 48 ++++++++++++++++++------------------------------
1 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index e54dd91..ac077c6 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -328,7 +328,7 @@
}
*/
- namespace MES.Service.service.BasicData;
+namespace MES.Service.service.BasicData;
using MES.Service.DB;
using MES.Service.Dto.webApi;
@@ -353,12 +353,17 @@
{
switch (unit.Type)
{
- case "0": return UpdateStaffStatus(db, entity.Id, "A") ? 1 : 0;
- case "1": return UpdateStaffStatus(db, entity.Id, "B") ? 1 : 0;
+ case "0":
+ return UpdateStaffStatus(db, entity.Id, "A") ? 1 : 0;
+ case "1":
+ return UpdateStaffStatus(db, entity.Id, "B") ? 1 : 0;
case "2":
- case "4": return InsertOrUpdateStaff(db, new List<SysUser> { sysUser }, new List<MesStaff> { entity }, mesStaffPositionLink) ? 1 : 0;
- case "3": return DeleteStaff(db, new List<SysUser> { sysUser }, new List<MesStaff> { entity }) ? 1 : 0;
- default: throw new ArgumentException($"涓嶆敮鎸佺殑绫诲瀷: {unit.Type}");
+ case "4":
+ return InsertOrUpdateStaff(db, new List<SysUser> { sysUser }, new List<MesStaff> { entity }, mesStaffPositionLink) ? 1 : 0;
+ case "3":
+ return DeleteStaff(db, new List<SysUser> { sysUser }, new List<MesStaff> { entity }) ? 1 : 0;
+ default:
+ throw new ArgumentException($"涓嶆敮鎸佺殑绫诲瀷: {unit.Type}");
}
}) > 0;
}
@@ -429,9 +434,7 @@
try
{
// 1. 鎵归噺鎻掑叆 SysUser锛堜粎鏂板锛�
- var newSysUsers = sysUsers
- .Where(u => !db.Queryable<SysUser>().Any(e => e.Sid == u.Sid))
- .ToList();
+ var newSysUsers = sysUsers.Where(u => !db.Queryable<SysUser>().Any(e => e.Sid == u.Sid)).ToList();
if (newSysUsers.Any())
{
@@ -505,10 +508,7 @@
}
var ids = staffList.Select(s => s.Id).ToList();
- var updateCount = db.Updateable<MesStaff>()
- .SetColumns(s => s.FforbidStatus == status)
- .Where(s => ids.Contains(s.Id))
- .ExecuteCommand();
+ var updateCount = db.Updateable<MesStaff>().SetColumns(s => s.FforbidStatus == status).Where(s => ids.Contains(s.Id)).ExecuteCommand();
if (updateCount <= 0)
{
@@ -539,9 +539,7 @@
var staffDeleteCount = db.Deleteable<MesStaff>().Where(s => staffIds.Contains(s.Id)).ExecuteCommand();
// 3. 鍒犻櫎宀椾綅鍏宠仈 锛氫娇鐢ˋny鏂规硶锛堟帹鑽愶級
- db.Deleteable<MesStaffPositionLink>()
- .Where(p => staffIds.Any(id => id == p.StaffId))
- .ExecuteCommand();
+ db.Deleteable<MesStaffPositionLink>().Where(p => staffIds.Any(id => id == p.StaffId)).ExecuteCommand();
Console.WriteLine($"鎴愬姛鍒犻櫎 {userDeleteCount} 涓猄ysUser鍜� {staffDeleteCount} 涓狹esStaff");
return userDeleteCount > 0 && staffDeleteCount > 0;
@@ -557,10 +555,7 @@
// 鏇存柊鍛樺伐鐘舵��
private bool UpdateStaffStatus(SqlSugarScope db, decimal staffId, string status)
{
- var result = db.Updateable<MesStaff>()
- .SetColumns(s => s.FforbidStatus == status)
- .Where(s => s.Id == staffId)
- .ExecuteCommand();
+ var result = db.Updateable<MesStaff>().SetColumns(s => s.FforbidStatus == status).Where(s => s.Id == staffId).ExecuteCommand();
if (result <= 0)
{
@@ -657,18 +652,11 @@
new MesStaffPositionLink
{
StaffId = Convert.ToDecimal(staff.Id),
- PositionId = string.IsNullOrEmpty(staffDetail.fPostId?.ToString())
- ? null
- : Convert.ToDecimal(staffDetail.fPostId),
- FPostDeptId = string.IsNullOrEmpty(staffDetail.fPostDeptid?.ToString())
- ? null
- : Convert.ToDecimal(staffDetail.fPostDeptid),
- FStaffStartDate = string.IsNullOrEmpty(staffDetail.fStaffStartDate?.ToString())
- ? null
- : DateTime.ParseExact(staffDetail.fStaffStartDate, "yyyy-MM-dd HH:mm:ss", null)
+ PositionId = string.IsNullOrEmpty(staffDetail.fPostId?.ToString()) ? null : Convert.ToDecimal(staffDetail.fPostId),
+ FPostDeptId = string.IsNullOrEmpty(staffDetail.fPostDeptid?.ToString()) ? null : Convert.ToDecimal(staffDetail.fPostDeptid),
+ FStaffStartDate = string.IsNullOrEmpty(staffDetail.fStaffStartDate?.ToString()) ? null : DateTime.ParseExact(staffDetail.fStaffStartDate, "yyyy-MM-dd HH:mm:ss", null)
}).ToList();
}
-
return staffDetails;
}
catch (Exception ex)
--
Gitblit v1.9.3