diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.cshtml
new file mode 100644
index 000000000..57ca8d6e4
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.cshtml
@@ -0,0 +1,54 @@
+@{
+ ViewBag.Title = "宿舍调换申请";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/YKTStateMent/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.js
index e1f3a62c7..19105434c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.js
@@ -121,13 +121,13 @@ var bootstrap = function ($, learun) {
{ label: "班级", name: "ClassName", width: 100, align: "left" },
{ label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
{ label: "消费金额", name: "MONEY", width: 100, align: "left", statistics: true },
- //{ label: "余额", name: "BALANCE", width: 100, align: "left" },
+ { label: "余额", name: "BALANCE", width: 100, align: "left" },
{ label: "发生时间", name: "HAPPENTIME", width: 120, align: "left" },
{ label: "科目", name: "SUBJECT", width: 100, align: "left" },
{ label: "终端名称", name: "TERMNAME", width: 150, align: "left" },
],
//mainId: 'AId',
- sidx: 'A.OPDT',
+ sidx: 'A.jndatetime',
sord: 'desc',
isPage: true
});
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 6d8bf1e56..2ab0d9dd1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
@@ -7757,12 +7757,9 @@
-
-
-
@@ -7771,6 +7768,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
index d3b78676e..4c2360d84 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
@@ -4,46 +4,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
-
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/document.pdf b/Learun.Framework.Ultimate V7/Learun.Application.Web/document.pdf
deleted file mode 100644
index eea4fd744..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/document.pdf
+++ /dev/null
@@ -1,6 +0,0 @@
-2
-2
-1
-1
-1
-
\ No newline at end of file
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 363a4ce84..4778bdbc4 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
@@ -32,13 +32,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
var queryParam = queryJson.ToJObject();
var strSql = new StringBuilder();
- strSql.Append(@"SELECT A.OUTID AS STUPHONE,A.CUSTOMERID AS YKTNO,round(A.OPFARE/100,2) AS MONEY,round(A.ODDFARE/100,2) AS BALANCE,A.OPDT AS HAPPENTIME,A.DSCRP AS SUBJECT,B.TERMNAME,C.StuNo,C.StuName,d.DeptName,e.ClassName,c.identityno as IdentityCardNo, f.MajorName
- FROM M_REC_CONSUME@ykt A LEFT JOIN M_BASE_TERM@ykt B ON A.TERMID = B.TERMID
- left join ds_stuinfo C on A.OUTID = C.mobile
+ 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
+ left join ds_stuinfo C on A.sno = C.stuno
left join ds_dept d on c.deptno = d.deptno
left join ds_classinfo e on c.classno = e.classno
left join ds_major f on c.majorno=f.majorno
- where 1=1 and stuno is not null ");
+ left join card.mercacc g on a.toaccount=g.account
+ where 1=1 and stuno is not null and a.pid='02' and a.journalstatus='0' ");
if (!queryParam["StuNo"].IsEmpty())
{
strSql.Append($" AND C.StuNo like '%{queryParam["StuNo"].ToString()}%' ");
@@ -57,11 +58,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
if (!queryParam["YKTNO"].IsEmpty())
{
- strSql.Append($" AND a.CUSTOMERID like '%{queryParam["CUSTOMERID"].ToString()}%' ");
+ strSql.Append($" AND a.fromcardno like '%{queryParam["YKTNO"].ToString()}%' ");
}
if (!queryParam["StartDate"].IsEmpty() && !queryParam["EndDate"].IsEmpty())
{
- strSql.Append(" and (A.OPDT>=to_date('" + queryParam["StartDate"] + "','yyyy-mm-dd') and A.OPDT<=to_date('" + queryParam["EndDate"] + "','yyyy-mm-dd hh24:mi:ss'))");
+ strSql.Append(" and (A.jndatetime>=to_date('" + queryParam["StartDate"] + "','yyyy-mm-dd hh24:mi:ss') and A.jndatetime<=to_date('" + queryParam["EndDate"] + "','yyyy-mm-dd hh24:mi:ss'))");
}
return BaseRepository("TLMZYMIDDLEString").FindList(strSql.ToString(), pagination);
@@ -92,7 +93,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
var strSql = new StringBuilder();
strSql.Append(
@"SELECT C.StuNo,C.StuName,d.DeptName,f.MajorName,e.ClassName,c.identityno as IdentityCardNo, sum(round(A.OPFARE/100,2)) AS MONEY,count(stuno) as PayTimes,round(sum(round(A.OPFARE/100,2))/count(stuno),2) as PerMoney
- FROM M_REC_CONSUME@ykt A LEFT JOIN M_BASE_TERM@ykt B ON A.TERMID = B.TERMID
+ FROM card.trjn A LEFT JOIN card.trcd B ON A.trancode = B.trancode
left join ds_stuinfo C on A.OUTID = C.mobile
left join ds_dept d on c.deptno = d.deptno
left join ds_classinfo e on c.classno = e.classno
@@ -140,12 +141,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
var queryParam = queryJson.ToJObject();
var strSql = new StringBuilder();
- strSql.Append(@"SELECT A.OUTID AS STUPHONE,A.CUSTOMERID AS YKTNO,round(A.OPFARE/100,2) AS MONEY,round(A.ODDFARE/100,2) AS BALANCE,A.OPDT AS HAPPENTIME,A.DSCRP AS SUBJECT,
-B.TERMNAME,c.EmpNo,c.EmpName,d.Name as DepartmentName,c.identityno as IdentityCardNo
- FROM M_REC_CONSUME@ykt A LEFT JOIN M_BASE_TERM@ykt B ON A.TERMID = B.TERMID
- left join ds_empinfo C on A.OUTID = C.mobile
+ 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
+ left join ds_empinfo C on A.sno = C.empno
left join ds_department d on c.departmentid=d.id
- where 1=1 and EmpNo is not null");
+ left join card.mercacc g on a.toaccount=g.account
+ where 1=1 and EmpNo is not null and a.pid='01' and a.journalstatus='0' ");
if (!queryParam["EmpNo"].IsEmpty())
{
strSql.Append($" AND C.EmpNo like '%{queryParam["EmpNo"].ToString()}%' ");
@@ -160,7 +161,7 @@ B.TERMNAME,c.EmpNo,c.EmpName,d.Name as DepartmentName,c.identityno as IdentityCa
}
if (!queryParam["YKTNO"].IsEmpty())
{
- strSql.Append($" AND a.CUSTOMERID like '%{queryParam["CUSTOMERID"].ToString()}%' ");
+ strSql.Append($" AND a.fromcardno like '%{queryParam["YKTNO"].ToString()}%' ");
}
if (!queryParam["StartDate"].IsEmpty() && !queryParam["EndDate"].IsEmpty())
{