From c63b40452aeaf1b46ef716da9f5dc9e8c2a843a6 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 13 七月 2022 20:30:33 +0800
Subject: [PATCH] 生产开报工提交
---
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 465 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 417 insertions(+), 48 deletions(-)
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 8875edf..94c473a 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -75,7 +75,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -134,43 +136,48 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
#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)
+ 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);
- 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)
+ 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;
mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
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);
@@ -181,19 +188,25 @@
if (cont > 0)
{
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;
}
@@ -210,7 +223,7 @@
sql = @"select * from TOrganization where parent_id=@orgid";
dynamicParams.Add(@"orgid", orgid);
cont = DapperHelper.selectcount(sql, dynamicParams);
- if (cont <= 0)
+ if (cont>0)
{
mes.code = "300";
mes.Message = "褰撳墠缁勭粐鏈変笅绾у叧鑱�,璇峰厛鍒犻櫎涓嬬骇缁勭粐!";
@@ -223,19 +236,25 @@
if (cont > 0)
{
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;
}
@@ -282,9 +301,11 @@
//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,u.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
+ where u.is_delete<>1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -294,7 +315,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -309,7 +332,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++) //杩欓噷鏄惊鐜墍鏈�
{
@@ -330,7 +353,37 @@
catch (Exception e)
{
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;
}
@@ -363,15 +416,15 @@
#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 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);
@@ -382,21 +435,26 @@
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)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
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);
@@ -407,23 +465,30 @@
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)
{
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;
}
@@ -442,7 +507,7 @@
dynamicParams.Add("@userid", userid);
var data = DapperHelper.selectdata(sql, dynamicParams);
- sql = @"update TUserRoleRelation set is_delete='1' where user_code=@usercode";
+ sql = @"delete TUserRoleRelation where user_code=@usercode";
list.Add(new { str = sql, parm = new { usercode = data.Rows[0]["USERCODE"].ToString() } });
sql = @"update TUser set is_delete='1' where id=@userid";
@@ -451,18 +516,24 @@
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;
}
@@ -505,7 +576,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -552,18 +625,24 @@
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;
}
@@ -583,7 +662,9 @@
if (rowsnum == 0)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "Excel琛ㄦ牸涓虹┖,鏃犳暟鎹紒";
+ mes.data = null;
}
else
{
@@ -614,23 +695,164 @@
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 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++)
+ {
+ 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
+
+
@@ -644,7 +866,7 @@
var total = 0; //鎬绘潯鏁�
var sql = @"select roletype_code,roletype_name
from TRoleType
- where A.is_delete<>'1' ";
+ where is_delete<>'1' ";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -654,7 +876,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -672,7 +896,7 @@
//寰幆鍐欏叆瑙掕壊绫诲瀷琛�
for (int i = 0; i < json.Count; i++)
{
- sql = @"insert into TRoleType(roletypecode,roletypename) values(@roletypecode,@roletypename)";
+ sql = @"insert into TRoleType(roletype_code,roletype_name) values(@roletypecode,@roletypename)";
list.Add(new
{
str = sql,
@@ -687,18 +911,24 @@
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;
}
@@ -720,18 +950,48 @@
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 RoleTypeSelect()
+ {
+ string sql = "";
+ try
+ {
+ //鑾峰彇璁惧绫诲瀷鏁版嵁
+ sql = @"select roletype_code,roletype_name from TRoleType where is_delete<>'1' ";
+ var data = DapperHelper.selecttable(sql);
+ 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;
}
@@ -771,7 +1031,7 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.role_code,A.role_name,b.roletype_code,B.roletype_name,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,A.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;
@@ -784,7 +1044,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -810,17 +1072,21 @@
if (cont > 0)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
if (OperType == "Update")
{
- var sql = @"update TRole set role_name=@UserName,Usercode=@Usercode,CreateDate=@CreateDate,RoleTypeCode=@RoleTypeCode,description=@description where id=@RoleId";
+ var sql = @"update TRole set role_name=@RoleName,lm_user=@Usercode,lm_date=@CreateDate,roletype_code=@RoleTypeCode,description=@description where id=@RoleId";
dynamicParams.Add("@RoleId", RoleId);
dynamicParams.Add("@RoleName", RoleName);
dynamicParams.Add("@Usercode", Usercode);
@@ -831,19 +1097,25 @@
if (cont > 0)
{
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;
}
@@ -860,27 +1132,33 @@
sql = @"update TRole set is_user='N',is_right='N',is_delete='1' where role_code=@RoleCode";
list.Add(new { str = sql, parm = new { RoleCode = RoleCode } });
//鏇存柊瑙掕壊鍏宠仈鐢ㄦ埛琛ㄣ�佽鑹插叧鑱旂敤鎴锋爣璇嗗強鍒犻櫎鐘舵��
- sql = @"update TUserRoleRelation set is_delete='1' where role_code=@RoleCode";
+ sql = @"delete TUserRoleRelation where role_code=@RoleCode";
list.Add(new { str = sql, parm = new { RoleCode = RoleCode } });
//鍒犻櫎(鏇存柊鐘舵��)瑙掕壊鍔熻兘琛�
- sql = @"update TRoleRightRelation set is_delete='1' where user_code=@RoleCode";
+ sql = @"update TRoleRightRelation set is_delete='1' where role_code=@RoleCode";
list.Add(new { str = sql, parm = new { RoleCode = RoleCode } });
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;
}
@@ -895,12 +1173,12 @@
{
if (usercode != "" && usercode != null)
{
- search += "and A.usercode like '%'+@RoleCode+'%' ";
+ search += "and A.usercode like '%'+@usercode+'%' ";
dynamicParams.Add("@usercode", usercode);
}
if (username != "" && username != null)
{
- search += "and A.username like '%'+@RoleName+'%' ";
+ search += "and A.username like '%'+@username+'%' ";
dynamicParams.Add("@username", username);
}
if (orgcode != "" && orgcode != null)
@@ -921,7 +1199,7 @@
}
if (search == "")
{
- search = "and 1=1 ";
+ search = " and 1=1 ";
}
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
@@ -931,7 +1209,8 @@
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" + search;
+ ) C on A.usercode=C.user_code where A.is_delete<>'1' " + search;
+ dynamicParams.Add("@rolecode", rolecode);
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -941,7 +1220,36 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊鏌ヨ1]
+ public static ToMessage RoleAssociationUserTwo(string rolecode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<TreeObejct> list = new List<TreeObejct>();
+ try
+ {
+ //鑾峰彇瑙掕壊绫诲瀷闆嗗悎(鍖呭惈缁戝畾鏍囪瘑)
+ dynamicParams.Add("@role_code", rolecode);
+ var data = DapperHelper.selectProcedure("h_p_T_RoleAssociationUserDisplay", 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;
}
@@ -972,8 +1280,8 @@
//寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
for (int i = 0; i < json.Count; i++)
{
- sql = @"insert into TUserRoleRelation(usercode,role_code) values(@usercode,@role_code)";
- list.Add(new { str = sql, parm = new { usercode = json[i], role_code = rolecode } });
+ sql = @"insert into TUserRoleRelation(user_code,role_code) values(@usercode,@role_code)";
+ list.Add(new { str = sql, parm = new { usercode = json[i].code, role_code = rolecode } });
}
//鏍囪瑙掕壊琛ㄥ叧鑱旂敤鎴锋爣璇�
sql = @"update TRole set is_user='Y' where role_code=@rolecode";
@@ -983,18 +1291,24 @@
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;
}
@@ -1003,8 +1317,6 @@
#region[瑙掕壊娓呭崟鍏宠仈鍔熻兘鏌ヨ]
public static ToMessage RoleAssociationRight(string rolecode,string type)
{
-
- Dictionary<object, object> dList = new Dictionary<object, object>();
List<object> list=new List<object>();
try
{
@@ -1021,13 +1333,16 @@
list.Add(SeachEncode.RightLocation(rolecode, type));
}
mes.code = "200";
+ mes.count = list.Count;
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -1080,18 +1395,24 @@
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;
}
@@ -1117,8 +1438,21 @@
}
if (unitAttr != "" && unitAttr != null)
{
- search += "and unitattribute=@unitAttr ";
- dynamicParams.Add("@unitAttr", unitAttr);
+ 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;
+ }
}
if (createUser != "" && createUser != null)
{
@@ -1131,7 +1465,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select id,code,name,unitattribute,conttacts,addr,lm_user,lm_date from TCustomer
+ var sql = @"select id,code,name,mtype,btype,htype,conttacts,conttphone,addr,lm_user,lm_date from TCustomer
where is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -1142,25 +1476,29 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
#endregion
#region[寰�鏉ュ崟浣嶆柊澧炵紪杈慮
- public static ToMessage AddUpdateCurrentUnit(string unitid, string unitcode, string unitname, string unitattr, string person, string contact, string description, string usercode,string OperType)
+ 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)
{
var dynamicParams = new DynamicParameters();
try
{
if (OperType == "Add")
{
- var sql = @"insert into TCustomer(code,name,unitattribute,conttacts,conttphone,addr,lm_user,lm_date)
- values(@unitcode,@unitname,@unitattr,@person,@contact,@description,@usercode,@CreateDate)";
+ 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)";
dynamicParams.Add("@unitcode", unitcode);
dynamicParams.Add("@unitname", unitname);
- dynamicParams.Add("@unitattr", unitattr);
+ dynamicParams.Add("@mtypecode", mtypecode);
+ dynamicParams.Add("@btypecode", btypecode);
+ dynamicParams.Add("@htypecode", htypecode);
dynamicParams.Add("@person", person);
dynamicParams.Add("@contact", contact);
dynamicParams.Add("@description", description);
@@ -1170,20 +1508,26 @@
if (cont > 0)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
if (OperType == "Update")
{
- var sql = @"update TCustomer set name=@unitname,unitattribute=@unitattr,conttacts=@person,conttphone=@contact,addr=@description,lm_user=@usercode,lm_date=@CreateDate where id=@RoleId";
+ 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";
dynamicParams.Add("@unitid", unitid);
dynamicParams.Add("@unitname", unitname);
- dynamicParams.Add("@unitattr", unitattr);
+ dynamicParams.Add("@mtypecode", mtypecode);
+ dynamicParams.Add("@btypecode", btypecode);
+ dynamicParams.Add("@htypecode", htypecode);
dynamicParams.Add("@person", person);
dynamicParams.Add("@contact", contact);
dynamicParams.Add("@description", description);
@@ -1193,50 +1537,75 @@
if (cont > 0)
{
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 DeleteCurrentUnit(string unitid)
+ public static ToMessage DeleteCurrentUnit(string unitcode)
{
var sql = "";
List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
try
{
+ list.Clear();
+ sql = @"select * from TFlw_Rteqp where eqp_code=@unitcode";
+ dynamicParams.Add("@unitcode", unitcode);
+ 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 = @"update TCustomer set is_delete='1' where id=@unitid";
- list.Add(new { str = sql, parm = new { unitid = unitid } });
+ sql = @"update TCustomer set is_delete='1' where code=@unitcode";
+ list.Add(new { str = sql, parm = new { unitcode = unitcode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
mes.code = "200";
- mes.Message = "鍒犻櫎鐢ㄦ埛鎴愬姛!";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
- mes.Message = "鍒犻櫎鐢ㄦ埛澶辫触!";
+ 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;
}
--
Gitblit v1.9.3