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 | 322 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 254 insertions(+), 68 deletions(-)
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index a66ec5a..94c473a 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -145,23 +145,22 @@
#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;
@@ -178,7 +177,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);
@@ -224,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 = "褰撳墠缁勭粐鏈変笅绾у叧鑱�,璇峰厛鍒犻櫎涓嬬骇缁勭粐!";
@@ -302,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 = "鏌ヨ鎴愬姛!";
@@ -331,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++) //杩欓噷鏄惊鐜墍鏈�
{
@@ -354,6 +355,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 +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);
@@ -406,6 +435,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 +454,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 +465,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 +721,141 @@
+ #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
+
+
+
+
+
#region[瑙掕壊绫诲瀷鏌ヨ]
public static ToMessage RoleTypeSearch(int startNum, int endNum, string prop, string order)
{
@@ -795,6 +961,30 @@
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)
{
@@ -1041,39 +1231,6 @@
#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>();
@@ -1160,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
{
@@ -1178,6 +1333,7 @@
list.Add(SeachEncode.RightLocation(rolecode, type));
}
mes.code = "200";
+ mes.count = list.Count;
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
@@ -1282,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)
{
@@ -1296,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";
@@ -1316,18 +1485,20 @@
#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);
@@ -1351,10 +1522,12 @@
}
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);
@@ -1389,28 +1562,41 @@
#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.count = 0;
- mes.Message = "鍒犻櫎鐢ㄦ埛鎴愬姛!";
+ mes.Message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎鐢ㄦ埛澶辫触!";
+ mes.Message = "鍒犻櫎澶辫触!";
mes.data = null;
}
}
--
Gitblit v1.9.3