From 9c634fd767aec36ef97c3a814bf7a29c67d20ee1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 29 三月 2024 10:57:35 +0800
Subject: [PATCH] 修改单据重复显示问题，增加工单源单id关联
---
VueWebApi/DLL/DAL/LoginDAL.cs | 110 +++++++++++++++++++++++++++----------------------------
1 files changed, 54 insertions(+), 56 deletions(-)
diff --git a/VueWebApi/DLL/DAL/LoginDAL.cs b/VueWebApi/DLL/DAL/LoginDAL.cs
index 9912f53..d757bb9 100644
--- a/VueWebApi/DLL/DAL/LoginDAL.cs
+++ b/VueWebApi/DLL/DAL/LoginDAL.cs
@@ -28,7 +28,9 @@
{
//鎵цsql
- strProcName = "select * from [dbo].[TUser] where usercode=@username and password=@password and is_delete='0'";
+ strProcName = @"select * from TUser U
+ left join TOrganization T on U.stu_torgcode = T.org_code
+ where U.usercode =@username and U.password =@password and U.is_delete = '0'";
//鍒涘缓鍙傛暟
listStr.Add(new SqlParameter("@username", username));
listStr.Add(new SqlParameter("@password", password));
@@ -40,61 +42,33 @@
#endregion
#region [鍐欏叆鐧诲綍璁板綍琛╙
- public static ToMessage LoginBas(string usercode, string usertype)
+ public static ToMessage LoginBas(string usercode, string usertype,string stu_torgcode)
{
var sql = "";
var cont = 0;
var dynamicParams = new DynamicParameters();
try
{
- sql = @"select * from T_Bas_Login where usercode=@usercode and origin=@usertype";
+ sql = @"insert into T_Bas_Login(usercode,status,indate,origin,torg_code)
+ values(@usercode,'Y',@indate,@usertype,@stu_torgcode)";
dynamicParams.Add("@usercode", usercode);
dynamicParams.Add("@usertype", usertype);
- cont = DapperHelper.selectcount(sql, dynamicParams);
+ dynamicParams.Add("@indate", DateTime.Now.ToString());
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
{
- sql = @"update T_Bas_Login set indate=@indate,status='Y' where usercode=@usercode and origin=@usertype";
- dynamicParams.Add("@usercode", usercode);
- dynamicParams.Add("@usertype", usertype);
- dynamicParams.Add("@indate", DateTime.Now.ToString());
- 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;
- }
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "璁板綍鎴愬姛!";
+ mes.data = null;
}
else
{
- sql = @"insert into T_Bas_Login(usercode,status,indate,origin)
- values(@usercode,'Y',@indate,@usertype)";
- dynamicParams.Add("@usercode", usercode);
- dynamicParams.Add("@usertype", usertype);
- dynamicParams.Add("@indate", DateTime.Now.ToString());
- 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;
- }
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "璁板綍澶辫触!";
+ mes.data = null;
}
}
catch (Exception e)
@@ -134,12 +108,13 @@
}).ToList();
for (int i = 0; i < data.Count; i++)
{
- sql = @"select distinct mu.right_code as code,mu.right_name as name,mu.right_seq,mu.is_delete as flag,imgurl
+ sql = @"select * from(
+ select distinct mu.right_code as code,mu.right_name as name,mu.right_seq,mu.is_delete as flag,imgurl
from TRight mu
inner join TRoleRightRelation rl on mu.right_code=rl.right_code
inner join TUserRoleRelation ro on rl.role_code=ro.role_code
where mu.type=@usertype and ro.user_code=@usercode and mu.parent_id=@paent_id
- order by mu.right_seq, mu.right_code";
+ ) as AA order by CAST(AA.right_seq AS DECIMAL) ASC,AA.code";
dynamicParams.Add("@usercode", usercode);
dynamicParams.Add("@usertype", usertype);
dynamicParams.Add("@paent_id", data[i].code);
@@ -293,7 +268,7 @@
//閲嶇疆瀵嗙爜
sql = @"update [dbo].[TUser] set password=@newpassword where usercode=@usercode and username=@username";
- list.Add(new { str = sql, parm = new { usercode = usercode, username = username,newpassword ="123456" } });
+ list.Add(new { str = sql, parm = new { usercode = usercode, username = username, newpassword = "123456" } });
//鍐欏叆鎿嶄綔璁板綍琛�
sql = @"insert into T_Bas_User_Operlog(usercode,oper_date,oper_type,description,origin) values(@usercode,@oper_date,@oper_type,@description,@origin)";
list.Add(new
@@ -329,7 +304,7 @@
#endregion
#region[PC鐧诲嚭]
- public static ToMessage LoginOut(int userid, string usercode, string username, string usertype)
+ public static ToMessage LoginOut(int userid, string usercode, string username, string usertype,string stu_torgcode)
{
var sql = "";
var cont = 0;
@@ -337,14 +312,16 @@
RedisHelper redis = new RedisHelper();
try
{
- sql = @"update T_Bas_Login set outdate=@outdate,status='N' where usercode=@usercode and origin=@usertype";
+ sql = @"insert into T_Bas_Login(usercode,status,outdate,origin,torg_code)
+ values(@usercode,'N',@outdate,@usertype,@stu_torgcode)";
dynamicParams.Add("@usercode", usercode);
- dynamicParams.Add("@outdate", DateTime.Now.ToString());
dynamicParams.Add("@usertype", usertype);
+ dynamicParams.Add("@outdate", DateTime.Now.ToString());
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
{
- redis.Remove(Enterprise + "LoginUserID" + usertype + userid, 0); //鍒犻櫎redis
+ redis.Remove(Enterprise + stu_torgcode + "LoginUserID" + usertype + userid, 0); //鍒犻櫎redis
mes.code = "200";
mes.count = 0;
mes.Message = "鐧诲嚭鎴愬姛!";
@@ -370,7 +347,7 @@
#endregion
#region[App鐧诲嚭]
- public static ToMessage LoginAppOut(int userid, string usercode, string username, string usertype)
+ public static ToMessage LoginAppOut(int userid, string usercode, string username, string usertype,string stu_torgcode)
{
var sql = "";
var cont = 0;
@@ -378,14 +355,16 @@
RedisHelper redis = new RedisHelper();
try
{
- sql = @"update T_Bas_Login set outdate=@outdate,status='N' where usercode=@usercode and origin=@usertype";
+ sql = @"insert into T_Bas_Login(usercode,status,outdate,origin,torg_code)
+ values(@usercode,'N',@outdate,@usertype,@stu_torgcode)";
dynamicParams.Add("@usercode", usercode);
- dynamicParams.Add("@outdate", DateTime.Now.ToString());
dynamicParams.Add("@usertype", usertype);
+ dynamicParams.Add("@outdate", DateTime.Now.ToString());
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
{
- redis.Remove(Enterprise + "LoginUserID" + usertype + userid, 1); //鍒犻櫎redis
+ redis.Remove(Enterprise + stu_torgcode + "LoginUserID" + usertype + userid, 1); //鍒犻櫎redis
mes.code = "200";
mes.count = 0;
mes.Message = "鐧诲嚭鎴愬姛!";
@@ -411,12 +390,30 @@
#endregion
#region[App鐧诲綍鏌ヨ瀹夌伅鍛煎彨淇℃伅]
- public static ToMessage LoginAppAnDonMessage(string rid, string usercode, string username, string usertype)
+ public static ToMessage LoginAppAnDonMessage(string rid, string usercode, string username, string usertype,string stu_torgcode,string stu_torgtypecode)
{
var sql = "";
+ string search = "";
var dynamicParams = new DynamicParameters();
try
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ search += "and T.description=@description ";
+ dynamicParams.Add("@description", "W");
+ break;
+ case "D":
+ search += "and child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and T.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
sql = @"select B.eqp_code,E.name as eqp_name,B.wkshp_code,T.org_name as wkshp_name,
A.type as typecode,D.name as typename,B.start_user,B.start_date
from TAnDnMessagePush A
@@ -425,7 +422,8 @@
left join TOrganization T on B.wkshp_code=T.org_code
left join TAnDonType D on A.type=d.code
left join TUser U on A.resp_user=U.usercode
- where A.resp_user=@usercode and B.status='START' and U.rid=@rid and T.description='W'";
+ left join TOrganization as child on T.parent_id=child.id
+ where A.resp_user=@usercode and B.status='START' and U.rid=@rid "+search;
dynamicParams.Add("@usercode", usercode);
dynamicParams.Add("@rid", rid);
var data = DapperHelper.selectdata(sql, dynamicParams);
--
Gitblit v1.9.3