From 2dea4c39796c8353164c4ddaf9cbc5678086c273 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 18 三月 2025 08:22:20 +0800
Subject: [PATCH] 1.List查询功能 2.sql条件优化
---
service/QC/LljService.cs | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/service/QC/LljService.cs b/service/QC/LljService.cs
index b4f51a4..64015c2 100644
--- a/service/QC/LljService.cs
+++ b/service/QC/LljService.cs
@@ -23,17 +23,25 @@
var totalCount = 0;
var pageList = Db.Queryable<LLJView>()
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- "鏈畬鎴�".Equals(queryObj.result),
- a => (a.STATUS ?? "") != "宸叉彁浜�")
- //a => (a.FcheckResu ?? "") == ""|| (a.FcheckResu ?? "") == "妫�楠屼腑")
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- !"鏈畬鎴�".Equals(queryObj.result),
- a => (a.STATUS ?? "") == "宸叉彁浜�")
+ //.WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ // "鏈畬鎴�".Equals(queryObj.result),
+ // a => (a.STATUS ?? "") != "宸叉彁浜�")
+ // //a => (a.FcheckResu ?? "") == ""|| (a.FcheckResu ?? "") == "妫�楠屼腑")
+ //.WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ // !"鏈畬鎴�".Equals(queryObj.result),
+ // a => (a.STATUS ?? "") == "宸叉彁浜�")
+
+ .WhereIF(!string.IsNullOrWhiteSpace(queryObj.keyword), a =>
+ a.ItemNo.Contains(queryObj.keyword) ||
+ a.ItemName.Contains(queryObj.keyword) ||
+ a.LotNo.Contains(queryObj.keyword) ||
+ a.ReleaseNo.Contains(queryObj.keyword) ||
+ a.SuppName.Contains(queryObj.keyword)
+ )
.WhereIF(UtilityHelper.CheckGuid(parsedGuid),
- a => a.guid == parsedGuid)
+ a => a.guid == parsedGuid && (a.fsubmit ?? 0) == 0)
.OrderByDescending(a => a.CreateDate)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
--
Gitblit v1.9.3