From 6c62b03bcaf50b0d2dcf85e2accd374283ad5e2e Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 16 九月 2022 23:15:46 +0800
Subject: [PATCH] 班组工资报表开发、人员工资明细报表开发、不良明细报表开发、品质异常报表开发、维修明细报表开发
---
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 122 +++++++++++++++++++++++++++++++++-------
1 files changed, 99 insertions(+), 23 deletions(-)
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 94c473a..60137cb 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 = "鏌ヨ鎴愬姛!";
@@ -154,7 +156,19 @@
{
if (operType == "Add")
{
- sql = @"insert into TOrganization(parent_id,org_code,org_name,lm_user,lm_date,description)
+ sql = @"select * from TOrganization where org_code=@organCode";
+ dynamicParams.Add("@organCode", organCode);
+ 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";
@@ -220,7 +234,7 @@
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)
@@ -276,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)
@@ -301,11 +315,12 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- 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
+ 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
left join TGroup g on u.usergroup_code=g.group_code
- where u.is_delete<>1 " + search;
+ 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 = "鏌ヨ鎴愬姛!";
@@ -423,6 +438,18 @@
{
if (OperType == "Add")
{
+ 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);
@@ -562,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);
@@ -761,6 +788,17 @@
//寰幆鍐欏叆鐢ㄦ埛缁勮〃
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
{
@@ -896,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
{
@@ -1021,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 == "")
@@ -1031,10 +1080,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 = "鏌ヨ鎴愬姛!";
@@ -1060,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);
@@ -1209,7 +1270,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";
@@ -1259,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();
@@ -1271,6 +1334,7 @@
//鏍囪瑙掕壊琛ㄥ叧鑱旂敤鎴锋爣璇�
sql = @"update TRole set is_user='N' where role_code=@rolecode";
list.Add(new { str = sql, parm = new { rolecode = rolecode } });
+
}
else
{
@@ -1428,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)
@@ -1441,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 == "")
@@ -1465,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 = "鏌ヨ鎴愬姛!";
@@ -1492,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);
@@ -1581,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