diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.cshtml
new file mode 100644
index 000000000..b1eca8c22
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.cshtml
@@ -0,0 +1,29 @@
+@{
+ ViewBag.Title = "学籍异动综合查询-成绩查看";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.js
new file mode 100644
index 000000000..c9fc14119
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.js
@@ -0,0 +1,276 @@
+var refreshGirdData;
+var StuId = request('keyValue');
+var StuNo = request('StuNo');
+var tempdatra = new Array();
+var list = [];
+var bootstrap = function ($, learun) {
+ "use strict";
+ var page = {
+ init: function () {
+ page.initGird();;
+ page.bind();
+ },
+ bind: function () {
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuScoreTran/GetPageList',
+ headData: [
+ { label: '学号', name: 'StuNo', width: 150, align: "left" },
+ { label: '姓名', name: 'StuName', width: 100, align: "left" },
+ {
+ label: "性别", name: "GenderNo", width: 40, align: "left",
+ formatter: function (cellvalue) {
+ return cellvalue == true ? "男" : "女";
+ }
+ },
+ {
+ label: "系所", name: "DeptNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+ key: value,
+ keyId: 'deptno',
+ callback: function (_data) {
+ callback(_data['deptname']);
+ }
+ });
+ }
+ },
+ {
+ label: "专业", name: "MajorNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+ key: value,
+ keyId: 'majorno',
+ callback: function (_data) {
+ callback(_data['majorname']);
+ }
+ });
+ }
+ },
+ {
+ label: "班级", name: "ClassNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+ key: value,
+ keyId: 'classno',
+ callback: function (_data) {
+ callback(_data['classname']);
+ }
+ });
+ }
+ },
+ { label: "年级", name: "Grade", width: 40, align: "left" },
+ { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
+ { label: '学期', name: 'Semester', width: 40, align: "left" },
+ {
+ label: '课程名称', name: 'LessonNo', width: 150, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+ key: value,
+ keyId: 'lessonno',
+ callback: function (_data) {
+ callback(_data['lessonname']);
+ }
+ });
+ }
+ },
+ {
+ label: '平时成绩', name: 'OrdinaryScore', width: 80, align: "left"
+ },
+ {
+ label: '期中成绩', name: 'TermInScore', width: 80, align: "left"
+ },
+ {
+ label: '期末成绩', name: 'TermEndScore', width: 80, align: "left"
+ },
+ {
+ label: '其他成绩', name: 'OtherScore', width: 80, align: "left"
+ },
+ { label: '总成绩', name: 'Score', width: 80, align: "left" },
+ {
+ label: '备注', name: 'Remark', width: 100, align: "left"
+ }
+ ],
+ mainId: 'ScoreId',
+ isPage: true
+ });
+ $('#gridtableNotPass').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTran/GetPageList',
+ headData: [
+ { label: '学号', name: 'StuNo', width: 150, align: "left" },
+ { label: '姓名', name: 'StuName', width: 100, align: "left" },
+ {
+ label: "性别", name: "GenderNo", width: 40, align: "left",
+ formatter: function (cellvalue) {
+ return cellvalue == true ? "男" : "女";
+ }
+ },
+ {
+ label: "系所", name: "DeptNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+ key: value,
+ keyId: 'deptno',
+ callback: function (_data) {
+ callback(_data['deptname']);
+ }
+ });
+ }
+ },
+ {
+ label: "专业", name: "MajorNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+ key: value,
+ keyId: 'majorno',
+ callback: function (_data) {
+ callback(_data['majorname']);
+ }
+ });
+ }
+ },
+ {
+ label: "班级", name: "ClassNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+ key: value,
+ keyId: 'classno',
+ callback: function (_data) {
+ callback(_data['classname']);
+ }
+ });
+ }
+ },
+ { label: "年级", name: "Grade", width: 40, align: "left" },
+ { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
+ { label: '学期', name: 'Semester', width: 40, align: "left" },
+ {
+ label: '课程名称', name: 'LessonNo', width: 150, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+ key: value,
+ keyId: 'lessonno',
+ callback: function (_data) {
+ callback(_data['lessonname']);
+ }
+ });
+ }
+ },
+ {
+ label: '期末成绩', name: 'TermEndScore', width: 80, align: "left"
+ },
+ { label: '补考成绩', name: 'Score', width: 80, align: "left" },
+ {
+ label: '备注', name: 'Remark', width: 100, align: "left"
+ }
+ ],
+ mainId: 'ScoreId',
+ isPage: true
+ });
+
+ $('#gridtableNotPossTwo').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwoTran/GetPageList',
+ headData: [
+ { label: '学号', name: 'StuNo', width: 150, align: "left" },
+ { label: '姓名', name: 'StuName', width: 100, align: "left" },
+ {
+ label: "性别", name: "GenderNo", width: 40, align: "left",
+ formatter: function (cellvalue) {
+ return cellvalue == true ? "男" : "女";
+ }
+ },
+ {
+ label: "系所", name: "DeptNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+ key: value,
+ keyId: 'deptno',
+ callback: function (_data) {
+ callback(_data['deptname']);
+ }
+ });
+ }
+ },
+ {
+ label: "专业", name: "MajorNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+ key: value,
+ keyId: 'majorno',
+ callback: function (_data) {
+ callback(_data['majorname']);
+ }
+ });
+ }
+ },
+ {
+ label: "班级", name: "ClassNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+ key: value,
+ keyId: 'classno',
+ callback: function (_data) {
+ callback(_data['classname']);
+ }
+ });
+ }
+ },
+ { label: "年级", name: "Grade", width: 40, align: "left" },
+ { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
+ { label: '学期', name: 'Semester', width: 40, align: "left" },
+ {
+ label: '课程名称', name: 'LessonNo', width: 150, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+ key: value,
+ keyId: 'lessonno',
+ callback: function (_data) {
+ callback(_data['lessonname']);
+ }
+ });
+ }
+ },
+ {
+ label: '期末成绩', name: 'TermEndScore', width: 80, align: "left"
+ },
+ { label: '二次补考成绩', name: 'Score', width: 80, align: "left" },
+ {
+ label: '备注', name: 'Remark', width: 100, align: "left"
+ }
+ ],
+ mainId: 'ScoreId',
+ isPage: true
+ });
+ page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ param.StuNo = StuNo;
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ $('#gridtableNotPass').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ $('#gridtableNotPossTwo').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ page.search();
+ };
+ page.init();
+}
\ No newline at end of file
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 b30f3055d..0b72efff4 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
@@ -1370,6 +1370,7 @@
+
@@ -8089,6 +8090,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTran/StuScoreNotPassTranService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTran/StuScoreNotPassTranService.cs
index 75ffc4d18..2be3b31ca 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTran/StuScoreNotPassTranService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTran/StuScoreNotPassTranService.cs
@@ -125,16 +125,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
try
{
var strSql = new StringBuilder();
- strSql.Append("SELECT ");
- strSql.Append(fieldSql);
- strSql.Append(" FROM StuScoreNotPassTran t ");
- var userlogin = LoginUserInfo.Get();
- if (userlogin.Description == "学生")
+ strSql.Append("SELECT t.* ");
+ strSql.Append(" FROM StuScoreNotPassTran t where 1= 1 ");
+ var queryParam = queryJson.ToJObject();
+ // 虚拟参数
+ var dp = new DynamicParameters(new { });
+ if (!queryParam["StuNo"].IsEmpty())
{
- strSql.Append(" where 1= 1 and Stuno = '" + userlogin.account + "'");
+ dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+ strSql.Append(" AND t.StuNo = @StuNo ");
}
- return this.BaseRepository("CollegeMIS").FindList
(strSql.ToString(), pagination);
+ return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwoTran/StuScoreNotPassTwoTranService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwoTran/StuScoreNotPassTwoTranService.cs
index 3ac5f59a7..c81179f62 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwoTran/StuScoreNotPassTwoTranService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwoTran/StuScoreNotPassTwoTranService.cs
@@ -125,15 +125,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
try
{
var strSql = new StringBuilder();
- strSql.Append("SELECT ");
- strSql.Append(fieldSql);
- strSql.Append(" FROM StuScoreNotPassTwoTran t ");
- var userlogin = LoginUserInfo.Get();
- if (userlogin.Description == "学生")
+ strSql.Append("SELECT t.* ");
+ strSql.Append(" FROM StuScoreNotPassTwoTran t where 1=1 ");
+ var queryParam = queryJson.ToJObject();
+ // 虚拟参数
+ var dp = new DynamicParameters(new { });
+ if (!queryParam["StuNo"].IsEmpty())
{
- strSql.Append(" where 1= 1 and Stuno = '" + userlogin.account + "'");
+ dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+ strSql.Append(" AND t.StuNo = @StuNo ");
}
- return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination);
+
+ return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreTran/StuScoreTranService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreTran/StuScoreTranService.cs
index 979e92b08..c00587c67 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreTran/StuScoreTranService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreTran/StuScoreTranService.cs
@@ -127,15 +127,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
try
{
var strSql = new StringBuilder();
- strSql.Append("SELECT ");
- strSql.Append(fieldSql);
- strSql.Append(" FROM StuScoreTran t ");
- var userlogin = LoginUserInfo.Get();
- if (userlogin.Description == "学生")
+ strSql.Append("SELECT t.* ");
+ strSql.Append(" FROM StuScoreTran t where 1=1 ");
+ var queryParam = queryJson.ToJObject();
+ // 虚拟参数
+ var dp = new DynamicParameters(new { });
+ if (!queryParam["StuNo"].IsEmpty())
{
- strSql.Append(" where 1= 1 and Stuno = '" + userlogin.account + "'");
+ dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+ strSql.Append(" AND t.StuNo = @StuNo ");
}
- return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination);
+
+ return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
{