From 2f91cbefebb537819abc851a3c17a08c691055f4 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 27 七月 2022 20:55:31 +0800
Subject: [PATCH] 大岛车间综合看板接口
---
VueWebApi/Tools/SeachEncode.cs | 73 ++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 29 deletions(-)
diff --git a/VueWebApi/Tools/SeachEncode.cs b/VueWebApi/Tools/SeachEncode.cs
index 0e7485b..c265a5d 100644
--- a/VueWebApi/Tools/SeachEncode.cs
+++ b/VueWebApi/Tools/SeachEncode.cs
@@ -23,6 +23,7 @@
int digit2, value2, digit3, digitdiff;
bool stf;
List<object> list = new List<object>();
+ List<string> listdt = new List<string>();
var dynamicParams = new DynamicParameters();
try
{
@@ -67,16 +68,18 @@
}
Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
- sql = @"update T_CodeRules set value=@cunm2 where rightcode=@rightcode";
- dynamicParams.Add("@cunm2", cunm2);
- dynamicParams.Add("@rightcode", rightcode);
- list.Add(new { str = sql, parm = dynamicParams });
+ //sql = @"update T_CodeRules set value=@cunm2 where rightcode=@rightcode";
+ //dynamicParams.Add("@cunm2", cunm2);
+ //dynamicParams.Add("@rightcode", rightcode);
+ //list.Add(new { str = sql, parm = dynamicParams });
stf = DapperHelper.DoTransaction(list);
if (stf)
{
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
mes.code = "200";
mes.Message = "鎴愬姛!";
- mes.data = Encode;
+ mes.data = listdt;
}
else
{
@@ -114,16 +117,18 @@
Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
- sql = @"update T_CodeRules set value=@cunm2 where rightcode=@rightcode";
- dynamicParams.Add("@cunm2", cunm2);
- dynamicParams.Add("@rightcode", rightcode);
- list.Add(new { str = sql, parm = dynamicParams });
+ //sql = @"update T_CodeRules set value=@cunm2 where rightcode=@rightcode";
+ //dynamicParams.Add("@cunm2", cunm2);
+ //dynamicParams.Add("@rightcode", rightcode);
+ //list.Add(new { str = sql, parm = dynamicParams });
stf = DapperHelper.DoTransaction(list);
if (stf)
{
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
mes.code = "200";
mes.Message = "鎴愬姛!";
- mes.data = Encode;
+ mes.data = listdt;
}
else
{
@@ -159,16 +164,18 @@
}
Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
- sql = @"update T_CodeRules set value=@cunm2 where rightcode=@rightcode";
- dynamicParams.Add("@cunm2", cunm2);
- dynamicParams.Add("@rightcode", rightcode);
- list.Add(new { str = sql, parm = dynamicParams });
+ //sql = @"update T_CodeRules set value=@cunm2 where rightcode=@rightcode";
+ //dynamicParams.Add("@cunm2", cunm2);
+ //dynamicParams.Add("@rightcode", rightcode);
+ //list.Add(new { str = sql, parm = dynamicParams });
stf = DapperHelper.DoTransaction(list);
if (stf)
{
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
mes.code = "200";
mes.Message = "鎴愬姛!";
- mes.data = Encode;
+ mes.data = listdt;
}
else
{
@@ -369,7 +376,7 @@
//绗竴灞�
sql = @"select distinct A.parent_id from TRight A
inner join TRoleRightRelation B on A.right_code=B.right_code
- where B.role_code='S001' and A.Type='PC' ";
+ where B.role_code=@rolecode and A.Type='PC' ";
dynamicParams.Add("@rolecode", rolecode);
dynamicParams.Add("@type", type);
var data1 = DapperHelper.selectdata(sql, dynamicParams);
@@ -379,17 +386,18 @@
cmp.code = "PC";
cmp.name = "PC";
cmp.flag = "Y";
-
+ cmp.is_delete = "0";
}
else
{
cmp.code = "PC";
cmp.name = "PC";
cmp.flag = "N";
+ cmp.is_delete = "0";
}
cmp.children = new List<TreeDMOne>();
//绗簩灞�
- sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select distinct A.parent_id from TRight A
@@ -405,17 +413,19 @@
cmp1.code = data2.Rows[i]["RIGHT_CODE"].ToString();
cmp1.name = data2.Rows[i]["RIGHT_NAME"].ToString();
cmp1.flag = data2.Rows[i]["FLAG"].ToString();
+ cmp1.is_delete= data2.Rows[i]["IS_DELETE"].ToString();
cmp.children.Add(cmp1);
cmp1.children = new List<TreeDMTwo>();
//绗笁灞�
- sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select B.right_code from TRight A
- inner join TRoleRightRelation B on A.right_code=B.right_code where A.parent_id=@right_code
+ inner join TRoleRightRelation B on A.right_code=B.right_code where A.parent_id=@right_code and B.role_code=@rolecode
) C on A.right_code=C.right_code
where A.parent_id=@right_code";
dynamicParams.Add("@right_code", data2.Rows[i]["RIGHT_CODE"].ToString());
+ dynamicParams.Add("@rolecode", rolecode);
var data3 = DapperHelper.selectdata(sql, dynamicParams);
for (int j = 0; j < data3.Rows.Count; j++)
{
@@ -423,6 +433,7 @@
cmp2.code = data3.Rows[j]["RIGHT_CODE"].ToString();
cmp2.name = data3.Rows[j]["RIGHT_NAME"].ToString();
cmp2.flag = data3.Rows[j]["FLAG"].ToString();
+ cmp2.is_delete= data3.Rows[j]["IS_DELETE"].ToString();
cmp1.children.Add(cmp2);
}
}
@@ -432,27 +443,28 @@
//绗竴灞�
sql = @"select distinct A.parent_id from TRight A
inner join TRoleRightRelation B on A.right_code=B.right_code
- where B.role_code='S001' and A.Type='PC' ";
+ where B.role_code=@rolecode and A.Type='APP' ";
dynamicParams.Add("@rolecode", rolecode);
dynamicParams.Add("@type", type);
var date1 = DapperHelper.selectdata(sql, dynamicParams);
TreeDM cmt = new TreeDM();
if (date1.Rows.Count > 0)
{
- cmt.code = "PC";
- cmt.name = "PC";
+ cmt.code = "APP";
+ cmt.name = "APP";
cmt.flag = "Y";
-
+ cmt.is_delete = "1";
}
else
{
- cmt.code = "PC";
- cmt.name = "PC";
+ cmt.code = "APP";
+ cmt.name = "APP";
cmt.flag = "N";
+ cmt.is_delete = "1";
}
cmt.children = new List<TreeDMOne>();
//绗簩灞�
- sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select distinct A.parent_id from TRight A
@@ -468,17 +480,19 @@
cmt1.code = date2.Rows[i]["RIGHT_CODE"].ToString();
cmt1.name = date2.Rows[i]["RIGHT_NAME"].ToString();
cmt1.flag = date2.Rows[i]["FLAG"].ToString();
+ cmt1.is_delete= date2.Rows[i]["IS_DELETE"].ToString();
cmt.children.Add(cmt1);
cmt1.children = new List<TreeDMTwo>();
//绗笁灞�
- sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select B.right_code from TRight A
- inner join TRoleRightRelation B on A.right_code=B.right_code where A.parent_id=@right_code
+ inner join TRoleRightRelation B on A.right_code=B.right_code where A.parent_id=@right_code and B.role_code=@rolecode
) C on A.right_code=C.right_code
where A.parent_id=@right_code";
dynamicParams.Add("@right_code", date2.Rows[i]["RIGHT_CODE"].ToString());
+ dynamicParams.Add("@rolecode", rolecode);
var date3 = DapperHelper.selectdata(sql, dynamicParams);
for (int j = 0; j < date3.Rows.Count; j++)
{
@@ -486,6 +500,7 @@
cmt2.code = date3.Rows[j]["RIGHT_CODE"].ToString();
cmt2.name = date3.Rows[j]["RIGHT_NAME"].ToString();
cmt2.flag = date3.Rows[j]["FLAG"].ToString();
+ cmt2.flag= date3.Rows[j]["IS_DELETE"].ToString();
cmt1.children.Add(cmt2);
}
}
--
Gitblit v1.9.3