From 3004bd5c7daa7d85ed691818ab96bde207aeeedc Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 05 十二月 2022 16:45:26 +0800
Subject: [PATCH] Sop文件接口修改
---
VueWebApi/DLL/DAL/SystemSettingDAL.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/VueWebApi/DLL/DAL/SystemSettingDAL.cs b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
index aafe25f..8bd2dca 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.file_name,''),isnull(AA.file_version,''),isnull(AA.username,'')) like '%@search%' ";
dynamicParams.Add("@search", search);
}
if (check == "Y")
@@ -374,11 +374,11 @@
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,
@@ -391,7 +391,7 @@
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