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 | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/VueWebApi/DLL/DAL/LoginDAL.cs b/VueWebApi/DLL/DAL/LoginDAL.cs
index 54e94cc..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,18 +42,19 @@
#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 = @"insert into T_Bas_Login(usercode,status,indate,origin)
- values(@usercode,'Y',@indate,@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);
dynamicParams.Add("@indate", DateTime.Now.ToString());
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
{
@@ -301,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;
@@ -309,15 +312,16 @@
RedisHelper redis = new RedisHelper();
try
{
- sql = @"insert into T_Bas_Login(usercode,status,outdate,origin)
- values(@usercode,'N',@outdate,@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("@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 = "鐧诲嚭鎴愬姛!";
@@ -343,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;
@@ -351,15 +355,16 @@
RedisHelper redis = new RedisHelper();
try
{
- sql = @"insert into T_Bas_Login(usercode,status,outdate,origin)
- values(@usercode,'N',@outdate,@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("@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 = "鐧诲嚭鎴愬姛!";
@@ -385,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
@@ -399,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