Merge branch '娄底高职分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 娄底高职分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.js

@@ -120,7 +120,7 @@ var bootstrap = function ($, learun) {
                     { label: "专业", name: "MajorName", width: 100, align: "left" },
                     { 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: "MONEY", 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" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForStudent.js

@@ -65,7 +65,7 @@ var bootstrap = function ($, learun) {
                     { label: "科目", name: "SUBJECT", width: 100, align: "left" },
                     { label: "终端名称", name: "TERMNAME", width: 150, align: "left" },
                 ],
-                sidx: 'A.OPDT',
+                sidx: 'A.jndatetime',
                 sord: 'desc',
                 isPage: true
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForTeacher.js

@@ -58,13 +58,13 @@ var bootstrap = function ($, learun) {
                     { label: "姓名", name: "EmpName", width: 100, align: "left" },
                     { label: "部门", name: "DepartmentName", 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: "MONEY", 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" }
                 ],
-                sidx: 'A.OPDT',
+                sidx: 'A.jndatetime',
                 sord: 'desc',
                 isPage: true
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/ManageIndexTeacher.js

@@ -61,14 +61,14 @@ var bootstrap = function ($, learun) {
                     { label: "姓名", name: "EmpName", width: 100, align: "left" },
                     { label: "部门", name: "DepartmentName", 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: "MONEY", 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
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -983,8 +983,6 @@
     <Content Include="Areas\AssetManagementSystem\Views\Ass_UserChangeInfo\Index.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Form.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\CdMajor\FormProvince.js" />
-    <Content Include="Areas\EducationalAdministration\Views\CdMajor\IndexProvince.js" />
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\AnalysisByMonthForStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\ManageIndexTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\IndexForTeacher.js" />
@@ -7758,14 +7756,7 @@
     <Content Include="Areas\EducationalAdministration\Views\RecruitStuPlan\IndexPlan.cshtml" />
     <Content Include="Areas\LR_OAModule\Views\Notice\IndexStatistics.cshtml" />
     <Content Include="Content\excel\AccommodationImport.xls" />
-    <Content Include="Areas\EducationalAdministration\Views\StuSubsidize\FormView.cshtml" />
-    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexStatistics.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuScore\InputScoreIndexInTeacherImport.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\CdMajor\IndexProvince.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\CdMajor\FormProvince.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\IndexForStudent.cshtml" />
-    <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\IndexPersonal.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\FormView.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\IndexForTeacher.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\ManageIndexTeacher.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\AnalysisByMonthForStudent.cshtml" />

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

@@ -34,7 +34,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 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
-                left join ds_stuinfo C on A.sno = C.stuno
+                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
                 left join ds_major f on c.majorno=f.majorno
@@ -143,7 +143,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 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
-                left join ds_empinfo C on A.sno = C.empno
+                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
                 where 1=1 and EmpNo is not null and a.pid='01' and a.journalstatus='0' ");
@@ -165,7 +165,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 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<YKTStateMentEntity>(strSql.ToString(), pagination);