一卡通关联历史表

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentService.cs

@@ -33,7 +33,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var queryParam = queryJson.ToJObject();
                 var strSql = new StringBuilder();
                 strSql.Append(@"SELECT  A.fromcardno AS YKTNO,round(A.tranamt/100,2) AS MONEY,round(A.ebagamt/100,2) AS BALANCE,A.jndatetime AS HAPPENTIME,b.tranname AS SUBJECT,g.mercname as TERMNAME,C.StuNo,C.StuName,d.DeptName,e.ClassName,c.identityno as IdentityCardNo, f.MajorName
-                FROM card.trjn A LEFT JOIN card.trcd B ON A.trancode = B.trancode
+                FROM (select FROMCARDNO, FROMACCOUNT, FROMJNNUMBER, TOACCOUNT, SYSCODE, POSCODE, DINESEQ, OPERCODE, TRANCODE, JOURNALSTATUS, JNDATETIME, EFFECTDATE, CARDBALANCE, USEDCARDNUM, TRANAMT, BANKACC, EBAGAMT, NAME, SNO, IDENTITY, DEPTCODE, PID from  card.HisTrjn 
+ union 
+ select FROMCARDNO, FROMACCOUNT, FROMJNNUMBER, TOACCOUNT, SYSCODE, POSCODE, DINESEQ, OPERCODE, TRANCODE, JOURNALSTATUS, JNDATETIME, EFFECTDATE, CARDBALANCE, USEDCARDNUM, TRANAMT, BANKACC, EBAGAMT, NAME, SNO, IDENTITY, DEPTCODE, PID from card.trjn) A LEFT JOIN card.trcd B ON A.trancode = B.trancode
                 left join ds_stuinfo C on A.identity = C.Identityno
                 left join ds_dept d on c.deptno = d.deptno
                 left join ds_classinfo e on c.classno = e.classno
@@ -142,7 +144,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var queryParam = queryJson.ToJObject();
                 var strSql = new StringBuilder();
                 strSql.Append(@"SELECT  A.fromcardno AS YKTNO,round(A.tranamt/100,2) AS MONEY,round(A.ebagamt/100,2) AS BALANCE,A.jndatetime AS HAPPENTIME,b.tranname AS SUBJECT,g.mercname as TERMNAME,c.EmpNo,c.EmpName,d.Name as DepartmentName,c.identityno as IdentityCardNo
-                FROM card.trjn A LEFT JOIN card.trcd B ON A.trancode = B.trancode
+                FROM (select FROMCARDNO, FROMACCOUNT, FROMJNNUMBER, TOACCOUNT, SYSCODE, POSCODE, DINESEQ, OPERCODE, TRANCODE, JOURNALSTATUS, JNDATETIME, EFFECTDATE, CARDBALANCE, USEDCARDNUM, TRANAMT, BANKACC, EBAGAMT, NAME, SNO, IDENTITY, DEPTCODE, PID from  card.HisTrjn 
+ union 
+ select FROMCARDNO, FROMACCOUNT, FROMJNNUMBER, TOACCOUNT, SYSCODE, POSCODE, DINESEQ, OPERCODE, TRANCODE, JOURNALSTATUS, JNDATETIME, EFFECTDATE, CARDBALANCE, USEDCARDNUM, TRANAMT, BANKACC, EBAGAMT, NAME, SNO, IDENTITY, DEPTCODE, PID from card.trjn) A LEFT JOIN card.trcd B ON A.trancode = B.trancode
                 left join ds_empinfo C on A.identity = C.Identityno
                 left join ds_department d on c.departmentid=d.id
                 left join card.mercacc g on a.toaccount=g.account