From 7c18e59a8682e0cabd840b01b59f76ce55f139d0 Mon Sep 17 00:00:00 2001 From: liangkun Date: Mon, 10 Jul 2023 15:36:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=8D=A1=E9=80=9A=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../YKTStateMent/YKTStateMentService.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentService.cs index de4d8e302..5bf3108c0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentService.cs +++ b/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