From 36f146461d053c1ef69c6cf3104cda05b565bedf Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期六, 09 八月 2025 11:27:10 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~sjz/YC
---
MES.Service/service/QC/SJService.cs | 4 ++--
MES.Service/Dto/service/SJPageResult.cs | 15 +++++++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/MES.Service/Dto/service/SJPageResult.cs b/MES.Service/Dto/service/SJPageResult.cs
index 8ca5e09..13a94fb 100644
--- a/MES.Service/Dto/service/SJPageResult.cs
+++ b/MES.Service/Dto/service/SJPageResult.cs
@@ -15,9 +15,24 @@
[SugarColumn(ColumnName = "STATUS_DATE")] //鐢ㄤ簬SqlSugar
public DateTime? StatusDate { get; set; }
+ [SugarColumn(ColumnName = "FNAME")]
public string? FName { get; set; }
+
+ [SugarColumn(ColumnName = "RESULT")]
public string? Result { get; set; }
+ [SugarColumn(ColumnName = "FSUBMIT")]
+ public string? FSubmit { get; set; }
+
+ [SugarColumn(ColumnName = "FSUBMIT_BY")]
+ public string? FSubmitBy { get; set; }
+
+ [SugarColumn(ColumnName = "FSUBMIT_DATE")]
+ public DateTime? FSubmitDate { get; set; }
+
+ [SugarColumn(ColumnName = "MOID_NUM")]
+ public string? MoidNum { get; set; }
+
[SugarColumn(IsIgnore = true)]
public string? SearchValue { get; set; }
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index 58c7532..6b56ca5 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -55,11 +55,11 @@
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
"鏈畬鎴�".Equals(queryObj.Result),
- a => a.Result == queryObj.Result)
+ a => a.FSubmit == null)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
- a => a.Result != "鏈畬鎴�")
+ a => a.FSubmit != null)
.OrderBy(a => a.CreateTime, OrderByType.Desc);
var totalCount = data.Count();
var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit);
--
Gitblit v1.9.3