From c9d607d723dea24758d3b25bd2c1ff88ce74229a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 10 五月 2023 07:44:35 +0800
Subject: [PATCH] nothing
---
VueWebApi/DLL/DAL/ReportManagerDAL.cs | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ReportManagerDAL.cs b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
index bc93b07..64a99cf 100644
--- a/VueWebApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
@@ -1406,7 +1406,7 @@
}
if (checkuser != "" && checkuser != null)
{
- search += "and U.usercode like '%'+@checkuser+'%' ";
+ search += "and U.username like '%'+@checkuser+'%' ";
dynamicParams.Add("@checkuser", checkuser);
}
if (opencheckdate != "" && opencheckdate != null)
@@ -1415,22 +1415,16 @@
dynamicParams.Add("@opencheckdate", opencheckdate + " 00:00:00");
dynamicParams.Add("@closecheckdate", closecheckdate + " 23:59:59");
}
- if (search == "")
- {
- search = "and 1=1 ";
- }
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.check_type,A.check_typename,A.sampmethod,M.partcode,M.partname,M.partspec,R.hbatchno,
+ var sql = @"select A.id,A.check_type,A.check_typename,A.sampmethod,M.partcode,M.partname,M.partspec,R.hbatchno,
A.hbarcode,A.customer_code,C.name as customer_name,U.usercode,U.username,A.lm_date,A.check_result
from TStepCheckRecord A
- inner join TStepCheckRecordSub B on A.id=B.m_id
left join TMateriel_Info M on A.partcode=M.partcode
left join T_BarCodeBill R on A.hbarcode=R.hbarcode
left join TCustomer C on A.customer_code=C.code
left join TUser U on A.check_user=U.usercode
- where " + search;
+ where A.check_type in('InCheck','OutCheck') " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
--
Gitblit v1.9.3