From 3fb978e25d7ea25038e56ec1db950189b413718b Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 04 三月 2023 11:17:30 +0800
Subject: [PATCH] 1.工单派发选择工艺路线或选择生产车间时判断绑定条件接口开发 2.组织架构删除update改为delete 3.工艺路线新增else if改为if
---
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 837 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 744 insertions(+), 93 deletions(-)
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 49a4858..f120520 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -44,7 +44,7 @@
}
if (userName != "" && userName != null)
{
- search += "and parent.lm_user like '%'+@userName+'%' ";
+ search += "and U.username like '%'+@userName+'%' ";
dynamicParams.Add("@userName", userName);
}
if (search == "")
@@ -62,10 +62,12 @@
parent.parent_id,
child.org_code as parentorg_code,
child.org_name as parentorg_name,
- parent.lm_user,
+ U.username as lm_user,
parent.lm_date
from TOrganization as parent
- left join TOrganization as child on parent.parent_id=child.id where parent.is_delete<>1 " + search;
+ left join TOrganization as child on parent.parent_id=child.id
+ left join TUser U on parent.lm_user=U.usercode
+ where parent.is_delete<>1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -124,7 +126,7 @@
dynamicParams.Add("@orgcode", orgcode);
break;
}
- sql = @"select id,org_code,org_name
+ sql = @"select id,org_code,org_name
from TOrganization
where is_delete<>'1' " + search;
@@ -145,23 +147,34 @@
#endregion
#region[鏂板缂栬緫缁勭粐鏋舵瀯]
- public static ToMessage AddUpdateOrganization(string organType, string organCode, string organName, string Operator, int supUnit, string operType)
+ public static ToMessage AddUpdateOrganization(string organType, string organCode, string organName, string Operator, int supUnit, string RightCode, string numvalue, string operType)
{
+ string sql = "";
+ List<object> list = new List<object>();
var dynamicParams = new DynamicParameters();
try
{
if (operType == "Add")
{
- var sql = @"insert into TOrganization(parent_id,org_code,org_name,lm_user,lm_date,description)
- values(@supUnit,@organCode,@organName,@Operator,@CreateDate,@organType)";
- dynamicParams.Add("@supUnit", supUnit);
+ sql = @"select * from TOrganization where org_code=@organCode";
dynamicParams.Add("@organCode", organCode);
- dynamicParams.Add("@organName", organName);
- dynamicParams.Add("@Operator", Operator);
- dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
- dynamicParams.Add("@organType", organType);
- int cont = DapperHelper.SQL(sql, dynamicParams);
- if (cont > 0)
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏂板鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
+
+ sql = @"insert into TOrganization(parent_id,org_code,org_name,lm_user,lm_date,description)
+ values(@supUnit,@organCode,@organName,@Operator,@CreateDate,@organType)";
+ list.Add(new { str = sql, parm = new { supUnit = supUnit, organCode = organCode, organName = organName, Operator = Operator, CreateDate = DateTime.Now.ToString(), organType = organType } });
+ //sql = @"update T_CodeRules set value=@cunm2 where rightcode=@RightCode";
+ //list.Add(new { str = sql, parm = new { cunm2 = numvalue, RightCode = RightCode } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
{
mes.code = "200";
mes.count = 0;
@@ -178,7 +191,7 @@
}
if (operType == "Update")
{
- var sql = @"update TOrganization set description=@organType,org_name=@organName,parent_id=@supUnit,lm_user=@Operator,lm_date=@CreateDate where org_code=@organCode";
+ sql = @"update TOrganization set description=@organType,org_name=@organName,parent_id=@supUnit,lm_user=@Operator,lm_date=@CreateDate where org_code=@organCode";
dynamicParams.Add(@"organCode", organCode);
dynamicParams.Add("@supUnit", supUnit);
dynamicParams.Add("@organName", organName);
@@ -221,17 +234,17 @@
var dynamicParams = new DynamicParameters();
try
{
- sql = @"select * from TOrganization where parent_id=@orgid";
+ sql = @"select * from TOrganization where parent_id=@orgid and is_delete<>'1'";
dynamicParams.Add(@"orgid", orgid);
cont = DapperHelper.selectcount(sql, dynamicParams);
- if (cont <= 0)
+ if (cont > 0)
{
mes.code = "300";
mes.Message = "褰撳墠缁勭粐鏈変笅绾у叧鑱�,璇峰厛鍒犻櫎涓嬬骇缁勭粐!";
}
else
{
- sql = @"update TOrganization set is_delete='1' where id=@orgid";
+ sql = @"delete TOrganization where id=@orgid";
dynamicParams.Add(@"orgid", orgid);
cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
@@ -264,7 +277,7 @@
#region[鐢ㄦ埛娓呭崟鏁版嵁鏌ヨ]
- public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg,string wagetype, string Enable, int startNum, int endNum, string prop, string order)
+ public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -277,7 +290,7 @@
}
if (UserName != "" && UserName != null)
{
- search += "and u.username like '%'+@UserName+'%' ";
+ search += "and S.username like '%'+@UserName+'%' ";
dynamicParams.Add("@UserName", UserName);
}
if (StuOrg != "" && StuOrg != null)
@@ -302,9 +315,12 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select u.id,u.usercode,u.username,u.stu_torgcode,t.org_name,u.password,u.mobile,u.email,u.wagetype,u.enable,u.lm_user,u.lm_date,u.is_role
+ var sql = @"select u.id,u.usercode,u.username,g.group_code,g.group_name,u.stu_torgcode,t.org_name,u.password,u.mobile,u.email,u.wagetype,u.enable,S.username as lm_user,u.lm_date,u.is_role
from TUser u
- left join TOrganization t on u.stu_torgcode=t.org_code where u.is_delete<>1 " + search;
+ left join TOrganization t on u.stu_torgcode=t.org_code
+ left join TGroup g on u.usergroup_code=g.group_code
+ left join TUser S on u.lm_user=S.usercode
+ where u.is_delete='0' and u.userclassid='0' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -331,7 +347,7 @@
{
List<TreeDG> list = new List<TreeDG>();
sql = @"select id,parent_id,org_code,org_name,description
- FROM TOrganization ";
+ FROM TOrganization where is_delete<>'1'";
var dt = DapperHelper.selectdata(sql, dynamicParams);
for (int i = 0; i < dt.Rows.Count; i++) //杩欓噷鏄惊鐜墍鏈�
{
@@ -354,6 +370,34 @@
mes.code = "300";
mes.count = 0;
mes.data = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鐢ㄦ埛鎵�灞炵彮缁刔
+ public static ToMessage UserGroup()
+ {
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select group_code,group_name
+ from TGroup
+ where is_delete<>'1' ";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
mes.data = null;
}
return mes;
@@ -387,15 +431,27 @@
#endregion
#region[鐢ㄦ埛娓呭崟鏂板缂栬緫]
- public static ToMessage AddUpdateUser(string UserId, string UserCode, string UserName,string Password, string Enable, string StuOrg, string wagetype, string Mobile, string Email, string Operator, string OperType)
+ public static ToMessage AddUpdateUser(string UserId, string UserCode, string UserName, string Password, string Enable, string StuOrg, string groupcode, string wagetype, string Mobile, string Email, string Operator, string OperType)
{
var dynamicParams = new DynamicParameters();
try
{
if (OperType == "Add")
{
- var sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype)
- values(@UserCode,@UserName,@password,@Enable,@Mobile,@CreateDate,@Email,@Operator,@StuOrg,@wagetype)";
+ var sql0 = @"select * from TUser where usercode=@UserCode";
+ dynamicParams.Add("@UserCode", UserCode);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏂板鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
+
+ var sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype,usergroup_code)
+ values(@UserCode,@UserName,@password,@Enable,@Mobile,@CreateDate,@Email,@Operator,@StuOrg,@wagetype,@groupcode)";
dynamicParams.Add("@UserCode", UserCode);
dynamicParams.Add("@UserName", UserName);
dynamicParams.Add("@password", Password);
@@ -406,6 +462,7 @@
dynamicParams.Add("@Operator", Operator);
dynamicParams.Add("@StuOrg", StuOrg);
dynamicParams.Add("@wagetype", wagetype);
+ dynamicParams.Add("@groupcode", groupcode);
int cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
{
@@ -424,7 +481,7 @@
}
if (OperType == "Update")
{
- var sql = @"update TUser set username=@UserName,password=@password,enable=@Enable,mobile=@Mobile,lm_user=@Operator,email=@Email,stu_torgcode=@StuOrg,wagetype=@wagetype,lm_date=@CreateDate where id=@UserId";
+ var sql = @"update TUser set username=@UserName,password=@password,enable=@Enable,mobile=@Mobile,lm_user=@Operator,email=@Email,stu_torgcode=@StuOrg,wagetype=@wagetype,usergroup_code=@groupcode,lm_date=@CreateDate where id=@UserId";
dynamicParams.Add("@UserId", UserId);
dynamicParams.Add("@UserName", UserName);
dynamicParams.Add("@password", Password);
@@ -435,6 +492,7 @@
dynamicParams.Add("@Operator", Operator);
dynamicParams.Add("@StuOrg", StuOrg);
dynamicParams.Add("@wagetype", wagetype);
+ dynamicParams.Add("@groupcode", groupcode);
int cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
{
@@ -531,7 +589,7 @@
{
sql = @"select B.role_code as code,B.role_name as name,(case when C.role_code is null then 'N' else 'Y' end) flag from TRole B
left join(select role_code from TUserRoleRelation where user_code=@usercode) C on B.role_code=C.role_code
- where B.roletype_code=@roletype_code and B.is_delete='0'";
+ where B.roletype_code=@roletype_code and B.is_delete='0' and B.is_system='0'";
dynamicParams.Add("@roletype_code", data[i].code);
dynamicParams.Add("@usercode", usercode);
var data0 = DapperHelper.select<TreeObejctCn>(sql, dynamicParams);
@@ -565,7 +623,7 @@
{
//娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
sql = @"delete TUserRoleRelation where user_code=@usercode";
- list.Add(new { str = sql, parm =new {usercode = usercode } });
+ list.Add(new { str = sql, parm = new { usercode = usercode } });
//娓呴櫎鐢ㄦ埛琛ㄥ叧鑱旇鑹叉爣璇�
sql = @"update TUser set is_role='N' where usercode=@usercode";
list.Add(new { str = sql, parm = new { usercode = usercode } });
@@ -575,20 +633,20 @@
//娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
sql = @"delete TUserRoleRelation where user_code=@usercode";
list.Add(new { str = sql, parm = new { usercode = usercode } });
-
+
//寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
for (int i = 0; i < json.Count; i++)
{
for (int j = 0; j < json[i].Data.Count; j++)
{
sql = @"insert into TUserRoleRelation(user_code,role_code) values(@usercode,@role_code)";
- list.Add(new { str = sql, parm = new { usercode = usercode, role_code= json[i].Data[j] } });
+ list.Add(new { str = sql, parm = new { usercode = usercode, role_code = json[i].Data[j] } });
}
}
//鏍囪鐢ㄦ埛琛ㄥ叧鑱旇鑹叉爣璇�
sql = @"update TUser set is_role='Y' where usercode=@usercode";
- list.Add(new { str = sql, parm = new { usercode = usercode} });
+ list.Add(new { str = sql, parm = new { usercode = usercode } });
}
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -645,18 +703,22 @@
{
sql = @"insert into TUser(usercode,username,enable,password,mobile,email,lm_user,lm_date,wagetype,stu_torgcode)
values(@usercode,@username,@enable,@password,@mobile,@email,@lm_user,@lm_date,@wagetype,@stu_torgcode)";
- list.Add(new { str = sql, parm = new {
- usercode = ds.Rows[i][1].ToString(),
- username = ds.Rows[i][2].ToString(),
- enable = ds.Rows[i][3].ToString(),
- password = ds.Rows[i][4].ToString(),
- mobile = ds.Rows[i][5].ToString(),
- email = ds.Rows[i][6].ToString(),
- lm_user = username,
- lm_date = DateTime.Now.ToString(),
- wagetype = ds.Rows[i][7].ToString(),
- stu_torgcode = ds.Rows[i][8].ToString()
- }
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ usercode = ds.Rows[i][1].ToString(),
+ username = ds.Rows[i][2].ToString(),
+ enable = ds.Rows[i][3].ToString(),
+ password = ds.Rows[i][4].ToString(),
+ mobile = ds.Rows[i][5].ToString(),
+ email = ds.Rows[i][6].ToString(),
+ lm_user = username,
+ lm_date = DateTime.Now.ToString(),
+ wagetype = ds.Rows[i][7].ToString(),
+ stu_torgcode = ds.Rows[i][8].ToString()
+ }
});
}
}
@@ -687,6 +749,152 @@
return mes;
}
#endregion
+
+
+
+ #region[鐢ㄦ埛缁勫垪琛ㄦ煡璇
+ public static ToMessage UserGroupSearch(int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select group_code,group_name,description
+ from TGroup
+ where is_delete<>'1' ";
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鐢ㄦ埛缁勬柊澧瀅
+ public static ToMessage UserGroupAdd(List<StepDefect> json, string username)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //寰幆鍐欏叆鐢ㄦ埛缁勮〃
+ for (int i = 0; i < json.Count; i++)
+ {
+ var sql0 = @"select * from TGroup where group_code=@group_code";
+ dynamicParams.Add("@group_code", json[i].code);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
+ sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date) values(@groupcode,@groupename,@description,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ groupcode = json[i].code,
+ groupename = json[i].name,
+ description = json[i].flag,
+ lm_user = username,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鐢ㄦ埛缁勫垹闄
+ public static ToMessage UserGroupDelete(string UserGrupCode)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ sql = @"select * from TUser where is_delete<>'1' and usergroup_code=@UserGrupCode";
+ dynamicParams.Add("@UserGrupCode", UserGrupCode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "璇ョ敤鎴风粍涓嬫湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ return mes;
+ }
+ sql = @"delete TGroup where group_code=@UserGrupCode";
+ list.Add(new { str = sql, parm = new { UserGrupCode = UserGrupCode } });
+
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
@@ -730,6 +938,17 @@
//寰幆鍐欏叆瑙掕壊绫诲瀷琛�
for (int i = 0; i < json.Count; i++)
{
+ var sql0 = @"select * from TRoleType where roletype_code=@roletype_code";
+ dynamicParams.Add("@roletype_code", json[i].code);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
sql = @"insert into TRoleType(roletype_code,roletype_name) values(@roletypecode,@roletypename)";
list.Add(new
{
@@ -777,9 +996,9 @@
{
list.Clear();
sql = @"delete TRoleType where roletype_code=@roletypecode";
- list.Add(new { str = sql, parm = new { roletypecode = roleTypeCode}});
+ list.Add(new { str = sql, parm = new { roletypecode = roleTypeCode } });
sql = @"delete TRole where roletype_code=@roletypecode";
- list.Add(new { str = sql, parm = new { roletypecode = roleTypeCode }});
+ list.Add(new { str = sql, parm = new { roletypecode = roleTypeCode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
@@ -855,7 +1074,7 @@
}
if (CreateUser != "" && CreateUser != null)
{
- search += "and A.lm_user like '%'+@CreateUser+'%' ";
+ search += "and T.username like '%'+@CreateUser+'%' ";
dynamicParams.Add("@CreateUser", CreateUser);
}
if (search == "")
@@ -865,10 +1084,11 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.id,A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.description,A.lm_user,A.lm_date,A.is_user,A.is_right
+ var sql = @"select A.id,A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.description,T.username as lm_user,A.lm_date,A.is_user,A.is_right
from TRole A
left join TRoleType B on A.roletype_code=B.roletype_code
- where A.is_delete<>'1' " + search;
+ left join TUser T on A.lm_user=T.usercode
+ where A.is_delete='0' and A.is_system='0' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -894,6 +1114,17 @@
{
if (OperType == "Add")
{
+ var sql0 = @"select * from TRole where role_code=@role_code";
+ dynamicParams.Add("@role_code", RoleCode);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
var sql = @"insert into TRole(role_code,role_name,lm_user,lm_date,roletype_code,description)
values(@RoleCode,@RoleName,@Usercode,@CreateDate,@RoleTypeCode,@description)";
dynamicParams.Add("@RoleCode", RoleCode);
@@ -1043,7 +1274,7 @@
left join TOrganization B on A.stu_torgcode=B.org_code
left join (
select distinct user_code from TUserRoleRelation where role_code=@rolecode
- ) C on A.usercode=C.user_code where A.is_delete<>'1' " + search;
+ ) C on A.usercode=C.user_code where A.is_delete='0' and A.userclassid='0' " + search;
dynamicParams.Add("@rolecode", rolecode);
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -1073,7 +1304,7 @@
//鑾峰彇瑙掕壊绫诲瀷闆嗗悎(鍖呭惈缁戝畾鏍囪瘑)
dynamicParams.Add("@role_code", rolecode);
var data = DapperHelper.selectProcedure("h_p_T_RoleAssociationUserDisplay", dynamicParams);
-
+
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -1093,7 +1324,9 @@
public static ToMessage SaveRoleAssoctUser(string rolecode, List<ObjectData> json)
{
var sql = "";
+ var sql2 = "";
List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
try
{
list.Clear();
@@ -1105,6 +1338,7 @@
//鏍囪瑙掕壊琛ㄥ叧鑱旂敤鎴锋爣璇�
sql = @"update TRole set is_user='N' where role_code=@rolecode";
list.Add(new { str = sql, parm = new { rolecode = rolecode } });
+
}
else
{
@@ -1149,9 +1383,9 @@
#endregion
#region[瑙掕壊娓呭崟鍏宠仈鍔熻兘鏌ヨ]
- public static ToMessage RoleAssociationRight(string rolecode,string type)
+ public static ToMessage RoleAssociationRight(string rolecode, string type)
{
- List<object> list=new List<object>();
+ List<object> list = new List<object>();
try
{
if (type == "" || type == null)
@@ -1163,7 +1397,8 @@
{
list.Add(SeachEncode.RightLocation(rolecode, type));
}
- else {
+ else
+ {
list.Add(SeachEncode.RightLocation(rolecode, type));
}
mes.code = "200";
@@ -1183,7 +1418,7 @@
#endregion
#region [瑙掕壊娓呭崟鍏宠仈鍔熻兘淇濆瓨]
- public static ToMessage SaveUserAssoctRight(string rolecode,string usercode, List<TreeDM> json)
+ public static ToMessage SaveUserAssoctRight(string rolecode, string usercode, List<TreeDM> json)
{
var sql = "";
List<object> list = new List<object>();
@@ -1208,15 +1443,20 @@
for (int i = 0; i < json.Count; i++) //PC銆丄PP灞�
{
for (int j = 0; j < json[i].children.Count; j++) //涓�绾ц彍鍗�
- {
+ {
for (int k = 0; k < json[i].children[j].children.Count; k++) //浜岀骇鑿滃崟
{
sql = @"insert into TRoleRightRelation(role_code,right_code,lm_user,lm_date) values(@role_code,@right_code,@lm_user,@lm_date)";
- list.Add(new { str = sql, parm = new {
- role_code = rolecode,
- right_code= json[i].children[j].children[k].code,
- lm_user= usercode, lm_date= DateTime.Now.ToString()
- }
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ role_code = rolecode,
+ right_code = json[i].children[j].children[k].code,
+ lm_user = usercode,
+ lm_date = DateTime.Now.ToString()
+ }
});
}
}
@@ -1262,35 +1502,22 @@
{
if (cuntUnitCode != "" && cuntUnitCode != null)
{
- search += "and code like '%'+@cuntUnitCode+'%' ";
+ search += "and A.code like '%'+@cuntUnitCode+'%' ";
dynamicParams.Add("@cuntUnitCode", cuntUnitCode);
}
if (cuntUnitName != "" && cuntUnitName != null)
{
- search += "and name like '%'+@cuntUnitName+'%' ";
+ search += "and A.name like '%'+@cuntUnitName+'%' ";
dynamicParams.Add("@cuntUnitName", cuntUnitName);
}
if (unitAttr != "" && unitAttr != null)
{
- switch (unitAttr)
- {
- case "WG": //澶栬喘
- search += "and mtype=@unitAttr ";
- dynamicParams.Add("@unitAttr", unitAttr);
- break;
- case "WX": //澶栧崗
- search += "and btype=@unitAttr ";
- dynamicParams.Add("@unitAttr", unitAttr);
- break;
- default: //瀹㈡埛
- search += "and htype=@unitAttr ";
- dynamicParams.Add("@unitAttr", unitAttr);
- break;
- }
+ search += "and A.type=@unitAttr ";
+ dynamicParams.Add("@unitAttr", unitAttr);
}
if (createUser != "" && createUser != null)
{
- search += "and lm_user like '%'+@createUser+'%' ";
+ search += "and T.username like '%'+@createUser+'%' ";
dynamicParams.Add("@createUser", createUser);
}
if (search == "")
@@ -1299,8 +1526,9 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select id,code,name,mtype,btype,htype,conttacts,conttphone,addr,lm_user,lm_date from TCustomer
- where is_delete<>'1' " + search;
+ var sql = @"select A.id,A.code,A.name,A.type,A.conttacts,A.conttphone,A.addr,T.username as lm_user,A.lm_date from TCustomer A
+ left join TUser T on A.lm_user=T.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -1319,20 +1547,29 @@
#endregion
#region[寰�鏉ュ崟浣嶆柊澧炵紪杈慮
- public static ToMessage AddUpdateCurrentUnit(string unitid, string unitcode, string unitname, string mtypecode, string btypecode, string htypecode, string person, string contact, string description, string usercode,string OperType)
+ public static ToMessage AddUpdateCurrentUnit(string unitid, string unitcode, string unitname, string typecode, string person, string contact, string description, string usercode, string OperType)
{
var dynamicParams = new DynamicParameters();
try
{
if (OperType == "Add")
{
- var sql = @"insert into TCustomer(code,name,mtype,btype,htype,conttacts,conttphone,addr,lm_user,lm_date)
- values(@unitcode,@unitname,@mtypecode,@btypecode,@htypecode,@person,@contact,@description,@usercode,@CreateDate)";
+ var sql0 = @"select * from TCustomer where code=@unitcode";
+ dynamicParams.Add("@unitcode", unitcode);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
+ var sql = @"insert into TCustomer(code,name,type,conttacts,conttphone,addr,lm_user,lm_date)
+ values(@unitcode,@unitname,@typecode,@person,@contact,@description,@usercode,@CreateDate)";
dynamicParams.Add("@unitcode", unitcode);
dynamicParams.Add("@unitname", unitname);
- dynamicParams.Add("@mtypecode", mtypecode);
- dynamicParams.Add("@btypecode", btypecode);
- dynamicParams.Add("@htypecode", htypecode);
+ dynamicParams.Add("@typecode", typecode);
dynamicParams.Add("@person", person);
dynamicParams.Add("@contact", contact);
dynamicParams.Add("@description", description);
@@ -1356,12 +1593,10 @@
}
if (OperType == "Update")
{
- var sql = @"update TCustomer set name=@unitname,mtype=@mtypecode,btype=@btypecode,htype=@htypecode,conttacts=@person,conttphone=@contact,addr=@description,lm_user=@usercode,lm_date=@CreateDate where id=@unitid";
+ var sql = @"update TCustomer set name=@unitname,type=@typecode,conttacts=@person,conttphone=@contact,addr=@description,lm_user=@usercode,lm_date=@CreateDate where id=@unitid";
dynamicParams.Add("@unitid", unitid);
dynamicParams.Add("@unitname", unitname);
- dynamicParams.Add("@mtypecode", mtypecode);
- dynamicParams.Add("@btypecode", btypecode);
- dynamicParams.Add("@htypecode", htypecode);
+ dynamicParams.Add("@typecode", typecode);
dynamicParams.Add("@person", person);
dynamicParams.Add("@contact", contact);
dynamicParams.Add("@description", description);
@@ -1415,8 +1650,8 @@
mes.data = null;
return mes;
}
- //鍒犻櫎(鏇存柊鐘舵��)寰�鏉ュ崟浣嶈〃
- sql = @"update TCustomer set is_delete='1' where code=@unitcode";
+ //鍒犻櫎寰�鏉ュ崟浣嶈〃
+ sql = @"delete TCustomer where code=@unitcode";
list.Add(new { str = sql, parm = new { unitcode = unitcode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -1444,5 +1679,421 @@
return mes;
}
#endregion
+
+
+ #region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫煡璇
+ public static ToMessage AnDengTypeSearch()
+ {
+ try
+ {
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select id, code,name
+ from TAnDonType
+ where is_delete<>'1' ";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫柊澧瀅
+ public static ToMessage AddUpdateAnDengType(List<ObjectData> json, string username)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //寰幆鍐欏叆鍛煎彨绫诲瀷琛�
+ for (int i = 0; i < json.Count; i++)
+ {
+ sql = @"insert into TAnDonType(code,name,lm_user,lm_date) values(@code,@name,@username,@createdate)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ code = json[i].code,
+ name = json[i].name,
+ username = username,
+ createdate = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬪垹闄
+ public static ToMessage DeleteAnDengType(string andengtypecode)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍒ゆ柇鍛煎彨绫诲瀷涓嬫槸鍚﹀叧鑱�
+ sql = @"select * from TAnDon_Roul_ConFig where andotype_code=@andengtypecode and is_delete<>'1'";
+ dynamicParams.Add("@andengtypecode", andengtypecode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "褰撳墠鍛煎彨绫诲瀷宸插叧鑱斿懠鍙厤缃�,涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ }
+ else
+ {
+ sql = @"delete TAnDonType where code=@andengtypecode";
+ list.Add(new { str = sql, parm = new { andengtypecode = andengtypecode } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎澶辫触!";
+ mes.data = null;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鏌ヨ缁戝畾鐨勫搷搴斾汉鍛榏
+ public static ToMessage AnDengResponUserSearch(string wkshopcode, string calltypecode)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select B.id,B.ando_cogfigid,U.usercode,U.username,A.enable from TAnDon_Roul_ConFig A
+ inner join TAnDon_Roul_ConFigUser B on A.id=B.ando_cogfigid
+ left join TUser U on B.usercode=U.usercode
+ where A.wkshp_code=@wkshopcode and A.andotype_code=@calltypecode and U.is_delete=0";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ dynamicParams.Add("@calltypecode", calltypecode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鏂板鍝嶅簲浜哄憳鏌ヨ宸茬粦瀹氱殑鍝嶅簲浜哄憳]
+ public static ToMessage AnDengDialogResponUserSearch(string wkshopcode, string calltypecode)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select A.usercode,A.username,(case when B.usercode<>'' then 'Y' else 'N' end) as flag
+ from TUser A
+ left join (
+ select B.usercode from TAnDon_Roul_ConFig A
+ inner join TAnDon_Roul_ConFigUser B on A.id=B.ando_cogfigid
+ where A.wkshp_code=@wkshopcode and A.andotype_code=@calltypecode
+ ) B on A.usercode=B.usercode
+ where A.userclassid='0'";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ dynamicParams.Add("@calltypecode", calltypecode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏆傛棤鍝嶅簲浜哄憳!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鏂板鍝嶅簲浜哄憳鎻愪氦]
+ public static ToMessage AnDengDigoResponUserSeave(string wkshopcode, string calltypecode, string enable, string usercode, DataTable json)
+ {
+ var sql = "";
+ int mid = 0;
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍒ゆ柇鍛煎彨绫诲瀷涓嬫槸鍚﹀叧鑱�
+ sql = @"select isnull(id,0) id from TAnDon_Roul_ConFig where wkshp_code=@wkshopcode and andotype_code=@calltypecode and is_delete<>'1'";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ dynamicParams.Add("@calltypecode", calltypecode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mid = Convert.ToInt32(data.Rows[0]["ID"].ToString());
+ //娓呴櫎瀹夌伅銆佽澶囦换鍔￠厤缃叧鑱斾汉鍛樿〃鏁版嵁
+ sql = @"delete TAnDon_Roul_ConFigUser where ando_cogfigid=@mid";
+ list.Add(new { str = sql, parm = new { mid = mid } });
+ }
+ else
+ {
+ //鑾峰彇涓昏〃鏈�澶D
+ sql = @"select ISNULL(IDENT_CURRENT('TAnDon_Roul_ConFig')+1,1) as id";
+ var dt = DapperHelper.selecttable(sql);
+ mid = Convert.ToInt32(dt.Rows[0]["ID"].ToString());
+ //鍐欏叆瀹夌伅銆佽澶囦换鍔￠厤缃〃鏁版嵁
+ sql = @"insert into TAnDon_Roul_ConFig(wkshp_code,andotype_code,lm_user,lm_date,enable) values(@wkshp_code,@andotype_code,@lm_user,@lm_date,@enable)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wkshp_code = wkshopcode,
+ andotype_code = calltypecode,
+ lm_user = usercode,
+ lm_date = DateTime.Now.ToString(),
+ enable = enable
+ }
+ });
+ }
+ //寰幆鍐欏叆瀹夌伅銆佽澶囦换鍔￠厤缃叧鑱斾汉鍛樿〃
+ for (int i = 0; i < json.Rows.Count; i++)
+ {
+ sql = @"insert into TAnDon_Roul_ConFigUser(ando_cogfigid,usercode) values(@ando_cogfigid,@role_code)";
+ list.Add(new { str = sql, parm = new { ando_cogfigid = mid, role_code = json.Rows[i]["CODE"].ToString() } });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鍝嶅簲浜哄憳鍏佽鍏抽棴]
+ public static ToMessage AnDengResponUserCloseSeave(string wkshopcode, string calltypecode, string enable, string usercode)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ try
+ {
+ list.Clear();
+ //鏇存柊瀹夌伅銆佽澶囦换鍔￠厤缃〃鐘舵��
+ sql = @"update TAnDon_Roul_ConFig set enable=@enable,lm_user=@lm_user,lm_date=@lm_date where wkshp_code=@wkshp_code and andotype_code=@andengtypecode";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wkshp_code = wkshopcode,
+ andengtypecode = calltypecode,
+ lm_user = usercode,
+ lm_date = DateTime.Now.ToString(),
+ enable = enable
+ }
+ });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鍝嶅簲浜哄憳鍒犻櫎]
+ public static ToMessage AnDengResponUserDeleteSeave(string id, string ando_cogfigid)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鏌ヨ瀹夌伅銆佽澶囦换鍔￠厤缃〃
+ sql = @"select id from TAnDon_Roul_ConFigUser where ando_cogfigid=@ando_cogfigid";
+ dynamicParams.Add("@ando_cogfigid", ando_cogfigid);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 1)
+ {
+ //鏍规嵁瀛愯〃id鍒犻櫎瀵瑰簲瀛愯〃浜哄憳
+ sql = @"delete TAnDon_Roul_ConFigUser where id=@id";
+ list.Add(new { str = sql, parm = new { id = id } });
+ }
+ else
+ {
+ //鏍规嵁瀛愯〃id鍒犻櫎瀵瑰簲瀛愯〃浜哄憳
+ sql = @"delete TAnDon_Roul_ConFigUser where id=@id";
+ list.Add(new { str = sql, parm = new { id = id } });
+ //鏍规嵁涓昏〃id鍒犻櫎涓昏〃鏁版嵁
+ sql = @"delete TAnDon_Roul_ConFig where id=@id";
+ list.Add(new { str = sql, parm = new { id = ando_cogfigid } });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅]
+ public static ToMessage WhkspIsEqpSearch(string wkshpcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇璁惧涓嬫媺妗嗘暟鎹�
+ sql = @"select code as eqp_code,name as eqp_name
+ from TEqpInfo where wksp_code=@wkshpcode and enable='Y' ";
+ dynamicParams.Add("@wkshpcode", wkshpcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3