From f7fdf63c13241dfa7d66a3315fd54429670e24bf Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 21 六月 2022 08:37:49 +0800
Subject: [PATCH] 基础资料问题优化
---
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 630 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 557 insertions(+), 73 deletions(-)
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index c9b4b59..a66ec5a 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;
}
@@ -84,6 +86,7 @@
#region [缁勭粐鏋舵瀯鏌ユ壘涓婄骇鍗曚綅]
public static ToMessage PrentOrganization(string orgcode)
{
+ var sql = "";
var dynamicParams = new DynamicParameters();
string search = "";
try
@@ -116,11 +119,14 @@
dynamicParams.Add("@orgcode", orgcode);
break;
default:
+ orgcode = "";
+ search += "and description=@orgcode ";
+ dynamicParams.Add("@orgcode", orgcode);
break;
}
- var sql = @"select roletype_code,roletype_name
- from TRoleType
- where A.is_delete<>'1' " + search;
+ sql = @"select id,org_code,org_name
+ from TOrganization
+ where is_delete<>'1' " + search;
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
@@ -130,7 +136,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -156,12 +164,16 @@
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")
@@ -177,19 +189,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;
}
@@ -219,19 +237,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;
}
@@ -240,7 +264,7 @@
#region[鐢ㄦ埛娓呭崟鏁版嵁鏌ヨ]
- public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg, 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 = "";
@@ -261,6 +285,11 @@
search += "and u.stu_torgcode=@StuOrg ";
dynamicParams.Add("@StuOrg", StuOrg);
}
+ if (wagetype != "" && wagetype != null)
+ {
+ search += "and u.wagetype=@wagetype ";
+ dynamicParams.Add("@wagetype", wagetype);
+ }
if (Enable != "" && Enable != null)
{
search += "and u.enable=@Enable ";
@@ -273,7 +302,7 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select u.usercode,u.username,u.stu_torgcode,t.org_name,u.enable,u.lm_user,u.lm_date,u.is_role
+ 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
from TUser u
left join TOrganization t on u.stu_torgcode=t.org_code where u.is_delete<>1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -285,7 +314,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -321,7 +352,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.data = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -354,63 +387,77 @@
#endregion
#region[鐢ㄦ埛娓呭崟鏂板缂栬緫]
- public static ToMessage AddUpdateUser(string UserId, string UserCode, string UserName, string Enable, string StuOrg, 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 wagetype, string Mobile, string Email, string Operator, string OperType)
{
var dynamicParams = new DynamicParameters();
try
{
if (OperType == "Add")
{
- var sql = @"insert into TUser(usercode,username,enable,mobile,lm_date,email,lm_user,stu_torgcode)
- values(@UserCode,@UserName,@Enable,@CreateDate,@Email,@Operator,@StuOrg)";
+ 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)";
dynamicParams.Add("@UserCode", UserCode);
dynamicParams.Add("@UserName", UserName);
+ dynamicParams.Add("@password", Password);
dynamicParams.Add("@Enable", Enable);
dynamicParams.Add("@Mobile", Mobile);
dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
dynamicParams.Add("@Email", Email);
dynamicParams.Add("@Operator", Operator);
dynamicParams.Add("@StuOrg", StuOrg);
+ dynamicParams.Add("@wagetype", wagetype);
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,enable=@Enable,mobile=@Mobile,lm_user=@Operator,email=@Email,stu_torgcode=@StuOrg,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,lm_date=@CreateDate where id=@UserId";
dynamicParams.Add("@UserId", UserId);
dynamicParams.Add("@UserName", UserName);
+ dynamicParams.Add("@password", Password);
dynamicParams.Add("@Enable", Enable);
dynamicParams.Add("@Mobile", Mobile);
dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
dynamicParams.Add("@Email", Email);
dynamicParams.Add("@Operator", Operator);
dynamicParams.Add("@StuOrg", StuOrg);
+ dynamicParams.Add("@wagetype", wagetype);
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;
}
@@ -429,29 +476,33 @@
dynamicParams.Add("@userid", userid);
var data = DapperHelper.selectdata(sql, dynamicParams);
- sql = @"update TUserRoleRelation set is_delete='1' where user_code=@usercode";
- dynamicParams.Add("@usercode", data.Rows[0]["USERCODE"].ToString());
- list.Add(new { str = sql, parm = dynamicParams });
+ 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";
- dynamicParams.Add("@userid", userid);
- list.Add(new { str = sql, parm = dynamicParams });
+ list.Add(new { str = sql, parm = new { userid = userid } });
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;
}
@@ -479,8 +530,8 @@
for (int i = 0; i < data.Count; i++)
{
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 TUserRoleRelation C on B.role_code=C.role_code
- where B.roletype_code=@roletype_code and C.user_code=@usercode and B.is_delete='0'";
+ 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'";
dynamicParams.Add("@roletype_code", data[i].code);
dynamicParams.Add("@usercode", usercode);
var data0 = DapperHelper.select<TreeObejctCn>(sql, dynamicParams);
@@ -494,7 +545,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -505,7 +558,6 @@
{
var sql = "";
List<object> list = new List<object>();
- var dynamicParams = new DynamicParameters();
try
{
list.Clear();
@@ -513,52 +565,124 @@
{
//娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
sql = @"delete TUserRoleRelation where user_code=@usercode";
- dynamicParams.Add("@usercode", usercode);
- list.Add(new { str = sql, parm = dynamicParams });
+ list.Add(new { str = sql, parm =new {usercode = usercode } });
//娓呴櫎鐢ㄦ埛琛ㄥ叧鑱旇鑹叉爣璇�
- sql = @"update TUser set is_role='N' where user_code=@usercode";
- dynamicParams.Add("@usercode", usercode);
- list.Add(new { str = sql, parm = dynamicParams });
+ sql = @"update TUser set is_role='N' where usercode=@usercode";
+ list.Add(new { str = sql, parm = new { usercode = usercode } });
}
else
{
//娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
sql = @"delete TUserRoleRelation where user_code=@usercode";
- dynamicParams.Add("@usercode", usercode);
- list.Add(new { str = sql, parm = dynamicParams });
+ 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(usercode,role_code) values(@usercode,@role_code)";
- dynamicParams.Add("@usercode", usercode);
- dynamicParams.Add("@role_code", json[i].Data[j]);
- list.Add(new { str = sql, parm = dynamicParams });
+ 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] } });
}
}
//鏍囪鐢ㄦ埛琛ㄥ叧鑱旇鑹叉爣璇�
- sql = @"update TUser set is_role='Y' where user_code=@usercode";
- dynamicParams.Add("@usercode", usercode);
- list.Add(new { str = sql, parm = dynamicParams });
+ sql = @"update TUser set is_role='Y' where usercode=@usercode";
+ list.Add(new { str = sql, parm = new { usercode = usercode} });
}
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 ImportUserExcel(string username, string filesName)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ DataTable ds = new DataTable();
+
+ try
+ {
+ ds = NPOIHelper.GetExcelDatatable(filesName); //璋冪敤鑷畾涔夋柟娉�
+ int rowsnum = ds.Rows.Count;
+ if (rowsnum == 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "Excel琛ㄦ牸涓虹┖,鏃犳暟鎹紒";
+ mes.data = null;
+ }
+ else
+ {
+ list.Clear();
+ for (int i = 0; i < ds.Rows.Count; i++)
+ {
+
+ if (ds.Rows[i][1].ToString() != "" && ds.Rows[i][1].ToString() != null)
+ {
+ 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()
+ }
+ });
+ }
+ }
+ 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;
}
@@ -576,7 +700,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 = "鏌ヨ鎴愬姛!";
@@ -586,7 +710,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -604,27 +730,39 @@
//寰幆鍐欏叆瑙掕壊绫诲瀷琛�
for (int i = 0; i < json.Count; i++)
{
- sql = @"insert into TRoleType(roletypecode,roletypename) values(@roletypecode,@roletypename)";
- dynamicParams.Add("@roletypecode", json[i].code);
- dynamicParams.Add("@roletypename", json[i].name);
- list.Add(new { str = sql, parm = dynamicParams });
+ sql = @"insert into TRoleType(roletype_code,roletype_name) values(@roletypecode,@roletypename)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ roletypecode = json[i].code,
+ roletypename = json[i].name
+ }
+ });
}
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;
}
@@ -635,33 +773,35 @@
{
var sql = "";
List<object> list = new List<object>();
- var dynamicParams = new DynamicParameters();
try
{
list.Clear();
sql = @"delete TRoleType where roletype_code=@roletypecode";
- dynamicParams.Add("@roletypecode", roleTypeCode);
- list.Add(new { str = sql, parm = dynamicParams });
+ list.Add(new { str = sql, parm = new { roletypecode = roleTypeCode}});
sql = @"delete TRole where roletype_code=@roletypecode";
- dynamicParams.Add("@roletypecode", roleTypeCode);
- list.Add(new { str = sql, parm = dynamicParams });
-
+ list.Add(new { str = sql, parm = new { roletypecode = roleTypeCode }});
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;
}
@@ -701,7 +841,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;
@@ -714,7 +854,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -740,17 +882,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);
@@ -761,19 +907,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;
}
@@ -784,40 +936,39 @@
{
var sql = "";
List<object> list = new List<object>();
- var dynamicParams = new DynamicParameters();
try
{
//鏇存柊瑙掕壊琛ㄣ�佽鑹插叧鑱旂敤鎴锋爣璇嗗強鍒犻櫎鐘舵��
sql = @"update TRole set is_user='N',is_right='N',is_delete='1' where role_code=@RoleCode";
- dynamicParams.Add("@RoleCode", RoleCode);
- list.Add(new { str = sql, parm = dynamicParams });
-
+ list.Add(new { str = sql, parm = new { RoleCode = RoleCode } });
//鏇存柊瑙掕壊鍏宠仈鐢ㄦ埛琛ㄣ�佽鑹插叧鑱旂敤鎴锋爣璇嗗強鍒犻櫎鐘舵��
- sql = @"update TUserRoleRelation set is_delete='1' where role_code=@RoleCode";
- dynamicParams.Add("@RoleCode", RoleCode);
- list.Add(new { str = sql, parm = dynamicParams });
-
+ 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";
- dynamicParams.Add("@RoleCode", RoleCode);
- list.Add(new { str = sql, parm = dynamicParams });
-
+ 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;
}
@@ -832,12 +983,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)
@@ -858,7 +1009,7 @@
}
if (search == "")
{
- search = "and 1=1 ";
+ search = " and 1=1 ";
}
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
@@ -868,7 +1019,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 = "鏌ヨ鎴愬姛!";
@@ -878,67 +1030,399 @@
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)
+ {
+ var dynamicParams = new DynamicParameters();
+ string sql = "";
+ try
+ {
+ List<TreeDG> list = new List<TreeDG>();
+ sql = @"select id,parent_id,org_code,org_name,description
+ FROM TOrganization ";
+ var dt = DapperHelper.selectdata(sql, dynamicParams);
+ for (int i = 0; i < dt.Rows.Count; i++) //杩欓噷鏄惊鐜墍鏈�
+ {
+ if (string.IsNullOrEmpty(dt.Rows[i]["PARENT_ID"].ToString()) || dt.Rows[i]["PARENT_ID"].ToString() == "0") //鍒ゆ柇鏄惁鏈�澶栧眰鏍硅妭鐐�
+ {
+ TreeDG tbj = new TreeDG();
+ tbj.id = dt.Rows[i]["ID"].ToString();
+ tbj.code = dt.Rows[i]["ORG_CODE"].ToString();
+ tbj.name = dt.Rows[i]["ORG_NAME"].ToString();
+ list.Add(tbj);
+ }
+ }
+ digui(dt, list);
+ mes.code = "200";
+ mes.Message = "鍔犺浇瀹屾垚";
+ mes.data = list;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.data = e.Message;
+ mes.data = null;
+ }
+ return mes;
+
+ 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;
}
#endregion
#region[瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛淇濆瓨]
- public static ToMessage SaveRoleAssociationUser(string rolecode, List<ObjectData> json)
+ public static ToMessage SaveRoleAssoctUser(string rolecode, List<ObjectData> json)
{
var sql = "";
List<object> list = new List<object>();
- var dynamicParams = new DynamicParameters();
try
{
list.Clear();
if (json == null || json.Count <= 0)
{
- mes.code = "300";
- mes.Message = "璇峰厛閫夋嫨鍏宠仈瑙掕壊鐨勭敤鎴蜂俊鎭�";
- return mes;
+ //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
+ sql = @"delete TUserRoleRelation where role_code=@rolecode";
+ list.Add(new { str = sql, parm = new { rolecode = rolecode } });
+ //鏍囪瑙掕壊琛ㄥ叧鑱旂敤鎴锋爣璇�
+ sql = @"update TRole set is_user='N' where role_code=@rolecode";
+ list.Add(new { str = sql, parm = new { rolecode = rolecode } });
}
else
{
//娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
sql = @"delete TUserRoleRelation where role_code=@rolecode";
- dynamicParams.Add("@rolecode", rolecode);
- list.Add(new { str = sql, parm = dynamicParams });
+ list.Add(new { str = sql, parm = new { rolecode = rolecode } });
//寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
for (int i = 0; i < json.Count; i++)
{
- sql = @"insert into TUserRoleRelation(usercode,role_code) values(@usercode,@role_code)";
- dynamicParams.Add("@usercode", json[i]);
- dynamicParams.Add("@role_code", rolecode);
- list.Add(new { str = sql, parm = dynamicParams });
+ 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";
- dynamicParams.Add("@rolecode", rolecode);
- list.Add(new { str = sql, parm = dynamicParams });
+ 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;
+ }
+ #endregion
+
+ #region[瑙掕壊娓呭崟鍏宠仈鍔熻兘鏌ヨ]
+ public static ToMessage RoleAssociationRight(string rolecode,string type)
+ {
+
+ Dictionary<object, object> dList = new Dictionary<object, object>();
+ List<object> list=new List<object>();
+ try
+ {
+ if (type == "" || type == null)
+ {
+ list.Add(SeachEncode.RightLocation(rolecode, "PC"));
+ list.Add(SeachEncode.RightLocation(rolecode, "APP"));
+ }
+ else if (type == "APP")
+ {
+ list.Add(SeachEncode.RightLocation(rolecode, type));
+ }
+ else {
+ list.Add(SeachEncode.RightLocation(rolecode, type));
+ }
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = list;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region [瑙掕壊娓呭崟鍏宠仈鍔熻兘淇濆瓨]
+ public static ToMessage SaveUserAssoctRight(string rolecode,string usercode, List<TreeDM> json)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ try
+ {
+ list.Clear();
+ if (json == null || json.Count <= 0)
+ {
+ //娓呴櫎鐢ㄦ埛鍏宠仈鍔熻兘琛ㄦ暟鎹�
+ sql = @"delete TRoleRightRelation where role_code=@rolecode";
+ list.Add(new { str = sql, parm = new { rolecode = rolecode } });
+ //鏍囪瑙掕壊琛ㄥ叧鑱斿姛鑳芥爣璇�
+ sql = @"update TRole set is_right='N' where role_code=@rolecode";
+ list.Add(new { str = sql, parm = new { rolecode = rolecode } });
+ }
+ else
+ {
+ //娓呴櫎瑙掕壊鍏宠仈鍔熻兘琛ㄦ暟鎹�
+ sql = @"delete TRoleRightRelation where role_code=@rolecode";
+ list.Add(new { str = sql, parm = new { rolecode = rolecode } });
+ //寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
+ 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()
+ }
+ });
+ }
+ }
+ }
+ //鏍囪瑙掕壊琛ㄥ叧鑱旂敤鎴锋爣璇�
+ sql = @"update TRole set is_right='Y' 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;
}
#endregion
+ #region[寰�鏉ュ崟浣嶆煡璇
+ public static ToMessage CurrentUnitSearch(string cuntUnitCode, string cuntUnitName, string unitAttr, string createUser, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (cuntUnitCode != "" && cuntUnitCode != null)
+ {
+ search += "and code like '%'+@cuntUnitCode+'%' ";
+ dynamicParams.Add("@cuntUnitCode", cuntUnitCode);
+ }
+ if (cuntUnitName != "" && cuntUnitName != null)
+ {
+ search += "and name like '%'+@cuntUnitName+'%' ";
+ dynamicParams.Add("@cuntUnitName", cuntUnitName);
+ }
+ if (unitAttr != "" && unitAttr != null)
+ {
+ search += "and unitattribute=@unitAttr ";
+ dynamicParams.Add("@unitAttr", unitAttr);
+ }
+ if (createUser != "" && createUser != null)
+ {
+ search += "and lm_user like '%'+@createUser+'%' ";
+ dynamicParams.Add("@createUser", createUser);
+ }
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select id,code,name,unitattribute,conttacts,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";
+ 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 AddUpdateCurrentUnit(string unitid, string unitcode, string unitname, string unitattr, 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)";
+ dynamicParams.Add("@unitcode", unitcode);
+ dynamicParams.Add("@unitname", unitname);
+ dynamicParams.Add("@unitattr", unitattr);
+ dynamicParams.Add("@person", person);
+ dynamicParams.Add("@contact", contact);
+ dynamicParams.Add("@description", description);
+ dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ 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 TCustomer set name=@unitname,unitattribute=@unitattr,conttacts=@person,conttphone=@contact,addr=@description,lm_user=@usercode,lm_date=@CreateDate where id=@RoleId";
+ dynamicParams.Add("@unitid", unitid);
+ dynamicParams.Add("@unitname", unitname);
+ dynamicParams.Add("@unitattr", unitattr);
+ dynamicParams.Add("@person", person);
+ dynamicParams.Add("@contact", contact);
+ dynamicParams.Add("@description", description);
+ dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ 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;
+ }
+ #endregion
+
+ #region[寰�鏉ュ崟浣嶅垹闄
+ public static ToMessage DeleteCurrentUnit(string unitid)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ try
+ {
+ //鍒犻櫎(鏇存柊鐘舵��)寰�鏉ュ崟浣嶈〃
+ sql = @"update TCustomer set is_delete='1' where id=@unitid";
+ list.Add(new { str = sql, parm = new { unitid = unitid } });
+ 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
}
}
\ No newline at end of file
--
Gitblit v1.9.3