From b98df034707a61fd2857dbccd5a232605076ca59 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期四, 20 十一月 2025 10:26:08 +0800
Subject: [PATCH] 标准版初始化
---
WebApi/GS.QC/Service/MesQaMjManager.cs | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/WebApi/GS.QC/Service/MesQaMjManager.cs b/WebApi/GS.QC/Service/MesQaMjManager.cs
index 2de656b..98ee4df 100644
--- a/WebApi/GS.QC/Service/MesQaMjManager.cs
+++ b/WebApi/GS.QC/Service/MesQaMjManager.cs
@@ -46,21 +46,28 @@
var _sbBy =
new StringBuilder(query.sortName + " " + query.sortOrder);
var totalCount = 0;
- var itemsList = Db.Queryable<MesQaMj, MesItems, SysOrganization, MesSupplier>(
- (a, b, org, d) => new JoinQueryInfos(
+ var itemsList = Db.Queryable<MesQaMj, MesItems, SysOrganization, MesSupplier, SysUser, SysUser, SysUser>(
+ (a, b, org, d, u1, u2, u3) => new JoinQueryInfos(
JoinType.Inner, a.ItemId == b.Id,
JoinType.Inner, b.FSubsidiary == org.Fid,
- JoinType.Left, a.SuppId == d.Id.ToString()
+ JoinType.Left, a.SuppId == d.Id.ToString(),
+ JoinType.Left, a.CheckUser == u1.Account,
+ JoinType.Left, a.CreateBy == u2.Account,
+ JoinType.Left, a.LastupdateBy == u3.Account
))
.Where(_sbWhere.ToString())
.OrderBy(_sbBy.ToString())
- .Select((a, b, org, d) => new MesQaMj
+ .Select((a, b, org, d, u1, u2, u3) => new MesQaMj
{
FSubsidiary = "(" + org.FNumber + ") " + org.Name,
Guid = a.Guid.SelectAll(),
gysName = d.SuppName,
itemName = b.ItemName,
- suppNo = d.SuppNo
+ suppNo = d.SuppNo,
+ // 鏂板锛氬鏍镐汉銆佸垱寤轰汉銆佹渶鍚庢洿鏂颁汉濮撳悕
+ CheckUserName = u1.UserName,
+ CreateByName = u2.UserName,
+ LastupdateByName = u3.UserName
})
.ToPageList(query.currentPage, query.everyPageSize,
ref totalCount);
@@ -103,6 +110,25 @@
{
LogHelper.Debug(ToString(), "GetModel error锛�" + ex.Message);
}
+
+ // 鏂板锛氳仈鏌ysUser鑾峰彇CheckUser鍜孡astupdateBy鐨勫鍚�
+ if (!string.IsNullOrEmpty(m.CheckUser))
+ {
+ var checkUserName = Db.Queryable<SysUser>()
+ .Where(u => u.Account == m.CheckUser)
+ .Select(u => u.UserName)
+ .First();
+ m.CheckUser = checkUserName ?? m.CheckUser;
+ }
+ if (!string.IsNullOrEmpty(m.LastupdateBy))
+ {
+ var lastupdateByName = Db.Queryable<SysUser>()
+ .Where(u => u.Account == m.LastupdateBy)
+ .Select(u => u.UserName)
+ .First();
+ m.LastupdateBy = lastupdateByName ?? m.LastupdateBy;
+ }
+
if (m != null)
return ReturnDto<MesQaMj>.QuickReturn(m,
ReturnCode.Success, "璇诲彇鎴愬姛锛�");
--
Gitblit v1.9.3