From 78ccddadb87e0d4dd7f74733a031393395db2869 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 29 五月 2024 14:38:39 +0800
Subject: [PATCH] nothing
---
VueWebApi/DLL/DAL/SystemSettingDAL.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/VueWebApi/DLL/DAL/SystemSettingDAL.cs b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
index aafe25f..8bdcfbb 100644
--- a/VueWebApi/DLL/DAL/SystemSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
@@ -365,7 +365,7 @@
{
if (search != "" && search != null)
{
- sech += "and concat(isnull(AA.partcode,''),isnull(AA.partname,''),isnull(AA.partname,''),isnull(AA.eqptype_name,''),isnull(AA.filetype_name,''),isnull(AA.file_name,''),isnull(AA.file_version,''),isnull(AA.username,'')) like '%@search%' ";
+ sech += "and concat(isnull(AA.partcode,''),isnull(AA.partname,''),isnull(AA.partspec,''),isnull(AA.eqptype_name,''),isnull(AA.filetype_name,''),isnull(AA.define_name,''),isnull(AA.file_version,''),isnull(AA.username,'')) like '%'+@search+'%' ";
dynamicParams.Add("@search", search);
}
if (check == "Y")
@@ -374,24 +374,24 @@
dynamicParams.Add("@rn", 1);
}
- if (search == "")
+ if (sech == "")
{
sech = "and 1=1 ";
}
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ sech = sech.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select AA.id,AA.partcode,AA.partname,AA.partspec,AA.eqptype_code,AA.eqptype_name,AA.filetype_code,AA.filetype_name,AA.file_name,AA.file_version,AA.file_path,
+ var sql = @"select AA.id,AA.partcode,AA.partname,AA.partspec,AA.eqptype_code,AA.eqptype_name,AA.filetype_code,AA.filetype_name,AA.file_name,AA.define_name,AA.file_version,AA.file_path,
AA.username,AA.lm_date,AA.rn from(
select top 100 A.id,M.partcode,M.partname,M.partspec,A.eqptype_code,T.name as eqptype_name,A.filetype_code,
(case when A.filetype_code='P001' then '浣滀笟鎸囧涔�' when A.filetype_code='P002' then '妫�楠屾寚瀵间功' when A.filetype_code='P003' then '鍥剧焊' end) as filetype_name,
- A.file_name,A.file_version,A.file_path,U.username,A.lm_date,
+ A.file_name,A.define_name,A.file_version,A.file_path,U.username,A.lm_date,
row_number() over(partition by A.materiel_code,A.filetype_code order by replace(A.file_version,'V','') desc) rn
from TK_Sop_Matfile A
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TEqpType T on A.eqptype_code=T.code
left join TUser U on A.lm_user=U.usercode
- ) as AA where " + sech + " order by AA.lm_date";
+ ) as AA where " + sech + "";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -451,7 +451,7 @@
{
mes.code = "200";
mes.Message = "鑾峰彇鐗堟湰鍙锋垚鍔�!";
- mes.data = "V" + data.Rows[0]["version"].ToString();
+ mes.data = "V" + data.Rows[0]["file_version"].ToString();
}
else
{
@@ -480,7 +480,7 @@
{
//鍐欏叆SOP鏂囦欢琛�
sql = @"insert into TK_Sop_Matfile(materiel_code,eqptype_code,filetype_code,file_name,define_name,file_version,file_path,lm_user,lm_date)
- values(@wksp_code,@title,@contents,@if_cancel,@cancel_date,@lm_user,@lm_date,@priority)";
+ values(@materiel_code,@eqptype_code,@filetype_code,@file_name,@define_name,@file_version,@file_path,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
--
Gitblit v1.9.3