@@ -344,7 +344,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
public ActionResult GetYearListByClass() | public ActionResult GetYearListByClass() | ||||
{ | { | ||||
var classList = classInfoIBLL.GetAllClass().ToList(); | var classList = classInfoIBLL.GetAllClass().ToList(); | ||||
var result = classList.GroupBy(a => a.ClassNo.Substring(0, 4)).Select(a => int.Parse(a.Key)).OrderBy(a=>a).ToList(); | |||||
var result = classList.GroupBy(a => a.Grade).Select(m=>m.Key).ToList(); | |||||
List<object> list=new List<object>(); | List<object> list=new List<object>(); | ||||
foreach (var item in result) | foreach (var item in result) | ||||
{ | { | ||||
@@ -340,7 +340,7 @@ var bootstrap = function ($, learun) { | |||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
param.SqlParameter = ' AND IsReport=1'; | param.SqlParameter = ' AND IsReport=1'; | ||||
param.Grade = "2020"; | |||||
param.Grade = "20"; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | ||||
} | } | ||||
}; | }; | ||||
@@ -301,7 +301,7 @@ var bootstrap = function ($, learun) { | |||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
//param.SqlParameter = " AND IsPay ='true'"; | //param.SqlParameter = " AND IsPay ='true'"; | ||||
param.Grade = "2020"; | |||||
param.Grade = "20"; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | ||||
} | } | ||||
}; | }; | ||||
@@ -301,7 +301,7 @@ var bootstrap = function ($, learun) { | |||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
//param.SqlParameter = " AND IsPay ='true'"; | //param.SqlParameter = " AND IsPay ='true'"; | ||||
param.Grade = "2020"; | |||||
param.Grade = "20"; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | ||||
} | } | ||||
}; | }; | ||||
@@ -297,7 +297,7 @@ var bootstrap = function ($, learun) { | |||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
//param.SqlParameter = " AND IsPay ='true'"; | //param.SqlParameter = " AND IsPay ='true'"; | ||||
param.Grade = "2020"; | |||||
param.Grade = "20"; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | ||||
} | } | ||||
}; | }; | ||||
@@ -479,7 +479,7 @@ var bootstrap = function ($, learun) { | |||||
}, | }, | ||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
param.Grade = "2020"; | |||||
param.Grade = "20"; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | ||||
} | } | ||||
}; | }; | ||||
@@ -370,7 +370,7 @@ var bootstrap = function ($, learun) { | |||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
param.SqlParameter = ' AND IsReport=1'; | param.SqlParameter = ' AND IsReport=1'; | ||||
param.Grade = "2020"; | |||||
param.Grade = "20"; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | ||||
} | } | ||||
}; | }; | ||||
@@ -348,7 +348,7 @@ var bootstrap = function ($, learun) { | |||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
param.SqlParameter = ' AND IsCheckIn IS NOT NULL AND IsSubsidize1 IS NOT NULL'; | param.SqlParameter = ' AND IsCheckIn IS NOT NULL AND IsSubsidize1 IS NOT NULL'; | ||||
param.Grade = "2020"; | |||||
param.Grade = "20"; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | ||||
} | } | ||||
}; | }; | ||||
@@ -292,7 +292,7 @@ var bootstrap = function ($, learun) { | |||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
//param.SqlParameter = " AND IsPay ='true'"; | //param.SqlParameter = " AND IsPay ='true'"; | ||||
param.Grade = "2020"; | |||||
param.Grade = "20"; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | ||||
} | } | ||||
}; | }; | ||||
@@ -348,7 +348,7 @@ var bootstrap = function ($, learun) { | |||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
param.SqlParameter = ' AND IsReport=1'; | param.SqlParameter = ' AND IsReport=1'; | ||||
param.Grade = "2020"; | |||||
param.Grade = "20"; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | ||||
} | } | ||||
}; | }; | ||||
@@ -424,7 +424,7 @@ var bootstrap = function ($, learun) { | |||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
param.SqlParameter = ' AND IsReport=1'; | param.SqlParameter = ' AND IsReport=1'; | ||||
param.Grade = "2020"; | |||||
param.Grade = "20"; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | ||||
} | } | ||||
}; | }; | ||||
@@ -404,7 +404,7 @@ var bootstrap = function ($, learun) { | |||||
}, | }, | ||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
param.Grade = "2020"; | |||||
param.Grade = "20"; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | ||||
} | } | ||||
}; | }; | ||||
@@ -358,7 +358,7 @@ var bootstrap = function ($, learun) { | |||||
}, | }, | ||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
param.Grade = "2020"; | |||||
param.Grade = "20"; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | ||||
} | } | ||||
}; | }; | ||||