按照需求修改一卡通

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

@@ -18,10 +18,10 @@ var bootstrap = function ($, learun) {
             // 时间搜索框
             $('#datesearch').lrdate({
                 dfdata: [
-                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd') }, end: function () { return learun.getDate('yyyy-MM-dd') } },
-                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd') } },
-                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd') } },
-                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd') } }
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
                 ],
                 // 月
                 mShow: false,
@@ -57,10 +57,11 @@ var bootstrap = function ($, learun) {
                     { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     { label: "系部", name: "DeptName", width: 100, align: "left" },
+                    { 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" },
-                    { 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" },

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

@@ -18,10 +18,10 @@ var bootstrap = function ($, learun) {
             // 时间搜索框
             $('#datesearch').lrdate({
                 dfdata: [
-                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd') }, end: function () { return learun.getDate('yyyy-MM-dd') } },
-                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd') } },
-                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd') } },
-                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd') } }
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
                 ],
                 // 月
                 mShow: false,
@@ -117,10 +117,11 @@ var bootstrap = function ($, learun) {
                     { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     { label: "系部", name: "DeptName", width: 100, align: "left" },
+                    { 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" },
-                    { 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" },

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

@@ -47,6 +47,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public string StuNo { get; set; }
         public string StuName { get; set; }
         public string DeptName { get; set; }
+        public string MajorName { get; set; }
         public string ClassName { get; set; }
         public string IdentityCardNo { get; set; }
         public string mobile { get; set; }

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

@@ -32,11 +32,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.StuNo,C.StuName,d.DeptName,e.ClassName,c.identityno as IdentityCardNo 
+                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
                 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 ");
                 if (!queryParam["StuNo"].IsEmpty())
                 {
@@ -60,7 +61,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'))");
+                    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'))");
                 }
 
                 return BaseRepository("TLMZYMIDDLEString").FindList<YKTStateMentEntity>(strSql.ToString(), pagination);