From 6a19b4394850d0aac5cf3aab8a0136c77515c41d Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 19 三月 2024 17:16:14 +0800
Subject: [PATCH] 生产进度报表查询条件增减
---
VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs b/VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs
index 0bb40c2..0d27c5b 100644
--- a/VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs
@@ -32,22 +32,22 @@
union ALL
select e.menucode, e.parent_id, e.menuname,e.menu_seq,e.Type
from TMenu e
- inner join RecursiveCTE r ON e.menucode = r.parent_id
+ inner join RecursiveCTE r ON e.menucode = r.parent_id
)
- select menucode, parent_id, menuname,Type
- from RecursiveCTE order by menu_seq";
+ select distinct menucode, parent_id, menuname,Type,menu_seq
+ from RecursiveCTE order by menucode, parent_id,Type,menu_seq";
var data = DapperHelper.selecttable(sql);
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犲彲璁剧疆鍔熻兘瑙勫垯!";
+ mes.message = "鏃犲彲璁剧疆鍔熻兘瑙勫垯!";
mes.data = null;
}
}
@@ -55,7 +55,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -92,7 +92,7 @@
where " + search + "";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -100,7 +100,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -145,14 +145,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗙紪鐮佽鍒�", us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -183,14 +183,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗙紪鐮佽鍒�", us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -199,7 +199,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -222,14 +222,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗙紪鐮佽鍒�", us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
@@ -238,7 +238,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -270,14 +270,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
return mes;
@@ -337,7 +337,7 @@
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
@@ -345,7 +345,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
--
Gitblit v1.9.3