From 2264c47cff7ab5ce52d7c158ac0eb941e7b46506 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 31 八月 2022 23:50:53 +0800
Subject: [PATCH] 大岛测试bug修改
---
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 314 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 278 insertions(+), 36 deletions(-)
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 49a4858..e512458 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 = "鏌ヨ鎴愬姛!";
@@ -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,10 +234,10 @@
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 = "褰撳墠缁勭粐鏈変笅绾у叧鑱�,璇峰厛鍒犻櫎涓嬬骇缁勭粐!";
@@ -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<>1 " + 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)
{
@@ -690,6 +748,152 @@
+ #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
+
+
+
+
+
#region[瑙掕壊绫诲瀷鏌ヨ]
public static ToMessage RoleTypeSearch(int startNum, int endNum, string prop, string order)
{
@@ -730,6 +934,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
{
@@ -855,7 +1070,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,9 +1080,10 @@
//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
+ 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";
@@ -894,6 +1110,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);
@@ -1093,7 +1320,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 +1334,7 @@
//鏍囪瑙掕壊琛ㄥ叧鑱旂敤鎴锋爣璇�
sql = @"update TRole set is_user='N' where role_code=@rolecode";
list.Add(new { str = sql, parm = new { rolecode = rolecode } });
+
}
else
{
@@ -1262,12 +1492,12 @@
{
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)
@@ -1275,22 +1505,22 @@
switch (unitAttr)
{
case "WG": //澶栬喘
- search += "and mtype=@unitAttr ";
+ search += "and A.mtype=@unitAttr ";
dynamicParams.Add("@unitAttr", unitAttr);
break;
case "WX": //澶栧崗
- search += "and btype=@unitAttr ";
+ search += "and A.btype=@unitAttr ";
dynamicParams.Add("@unitAttr", unitAttr);
break;
default: //瀹㈡埛
- search += "and htype=@unitAttr ";
+ search += "and A.htype=@unitAttr ";
dynamicParams.Add("@unitAttr", unitAttr);
break;
}
}
if (createUser != "" && createUser != null)
{
- search += "and lm_user like '%'+@createUser+'%' ";
+ search += "and T.username like '%'+@createUser+'%' ";
dynamicParams.Add("@createUser", createUser);
}
if (search == "")
@@ -1299,8 +1529,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.mtype,A.btype,A.htype,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 = "鏌ヨ鎴愬姛!";
@@ -1326,6 +1557,17 @@
{
if (OperType == "Add")
{
+ 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,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);
@@ -1415,8 +1657,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)
--
Gitblit v1.9.3