diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexBKUnpass.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexBKUnpass.cshtml
index b1a6e8418..e4957915c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexBKUnpass.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexBKUnpass.cshtml
@@ -34,10 +34,18 @@
课程
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexBKUnpass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexBKUnpass.js
index 59c053ddd..dc5860899 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexBKUnpass.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexBKUnpass.js
@@ -83,6 +83,15 @@ var bootstrap = function ($, learun) {
allowSearch: true,
code: 'LessonInfo', value: 'lessonno', text: 'lessonname'
});
+ $('#EmpNo').lrDataSourceSelect({
+ allowSearch: true,
+ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname'
+ });
+ $('#CheckMark').lrselect({
+ data: [{ text: "是", value: "1" }, { text: "否", value: "0" }],
+ text: "text",
+ value: "value"
+ });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
@@ -110,6 +119,19 @@ var bootstrap = function ($, learun) {
label: "姓名", name: "stuname", width: 100, align: "left"
},
{ label: "课程", name: "LessonName", width: 100, align: "left" },
+ {
+ label: "教师", name: "EmpNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+ key: value,
+ keyId: 'f_encode',
+ callback: function (_data) {
+ callback(_data['f_realname']);
+ }
+ });
+ }
+ },
{ label: "考试年级", name: "Grade", width: 100, align: "left" },
{
label: "学年", name: "AcademicYearNo", width: 80, align: "left",
@@ -132,7 +154,11 @@ var bootstrap = function ($, learun) {
{
label: "是否提交", name: "IsSubmit", width: 150, align: "left",
formatter: function (cellvalue) {
- return cellvalue == 1 ? "" : "";
+ if (cellvalue == 1) {
+ return '已提交';
+ } else {
+ return '未提交';
+ }
}
},
@@ -145,6 +171,7 @@ var bootstrap = function ($, learun) {
},
search: function (param) {
param = param || {};
+ console.log(param, "param")
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexBKUnpassTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexBKUnpassTwo.cshtml
index c654eafe1..083893fe0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexBKUnpassTwo.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexBKUnpassTwo.cshtml
@@ -34,10 +34,18 @@
课程
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexBKUnpassTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexBKUnpassTwo.js
index 19dfa1ddb..16e05fc93 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexBKUnpassTwo.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexBKUnpassTwo.js
@@ -79,6 +79,15 @@ var bootstrap = function ($, learun) {
$('#LessonNo').lrDataSourceSelect({
code: 'LessonInfo', value: 'lessonno', text: 'lessonname'
});
+ $('#EmpNo').lrDataSourceSelect({
+ allowSearch: true,
+ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname'
+ });
+ $('#CheckMark').lrselect({
+ data: [{ text: "是", value: "1" }, { text: "否", value: "0" }],
+ text: "text",
+ value: "value"
+ });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
@@ -106,6 +115,19 @@ var bootstrap = function ($, learun) {
label: "姓名", name: "stuname", width: 100, align: "left"
},
{ label: "课程", name: "LessonName", width: 100, align: "left" },
+ {
+ label: "教师", name: "EmpNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+ key: value,
+ keyId: 'f_encode',
+ callback: function (_data) {
+ callback(_data['f_realname']);
+ }
+ });
+ }
+ },
{ label: "考试年级", name: "Grade", width: 100, align: "left" },
{
label: "学年", name: "AcademicYearNo", width: 80, align: "left",
@@ -128,7 +150,11 @@ var bootstrap = function ($, learun) {
{
label: "是否提交", name: "IsSubmit", width: 150, align: "left",
formatter: function (cellvalue) {
- return cellvalue == 1 ? "" : "";
+ if (cellvalue == 1) {
+ return '已提交';
+ } else {
+ return '未提交';
+ }
}
}
],
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs
index b37cd3cac..cfc438519 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs
@@ -333,6 +333,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
public string stuno { get; set; }
public string stuname { get; set; }
+ public string EmpNo { get; set; }
public string LessonName { get; set; }
public string Grade { get; set; }
public string AcademicYearNo { get; set; }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs
index 66077600d..b164e90eb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs
@@ -210,6 +210,14 @@ else CONVERT(varchar,a.Score) end as Score2 ");
{
strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'");
}
+ if (!queryParam["EmpNo"].IsEmpty())
+ {
+ strSql.Append($" and a.EmpNo ='{queryParam["EmpNo"].ToString()}'");
+ }
+ if (!queryParam["CheckMark"].IsEmpty())
+ {
+ strSql.Append($" and ssnp.CheckMark ='{queryParam["CheckMark"].ToString()}'");
+ }
strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) ");
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination);
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs
index 8f1f14ffa..95ca1d73d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs
@@ -272,9 +272,8 @@ else CONVERT(varchar,a.Score) end as Score2 ");
strSql.Append(@" from StuScoreNotPass a left join StuInfoBasic b on b.StuNo=a.StuNo ");
strSql.Append(
@" left join StuScoreNotPassTwo ssnpt on ssnpt.StuNo = a.StuNo and ssnpt.lessonno = a.lessonno ");
- strSql.Append(@"where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) ");
- strSql.Append(
- @" and ( ssnpt.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus=1) and a.LessonSortNo='1' )");
+ strSql.Append(@"where 1=1 and ( ssnpt.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus=1) and a.LessonSortNo='1' )
+and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) ");
if (!queryParam["AcademicYearNo"].IsEmpty())
{
strSql.Append($" and a.AcademicYearNo ='{queryParam["AcademicYearNo"].ToString()}'");
@@ -303,7 +302,14 @@ else CONVERT(varchar,a.Score) end as Score2 ");
{
strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'");
}
-
+ if (!queryParam["EmpNo"].IsEmpty())
+ {
+ strSql.Append($" and a.EmpNo ='{queryParam["EmpNo"].ToString()}'");
+ }
+ if (!queryParam["CheckMark"].IsEmpty())
+ {
+ strSql.Append($" and ssnpt.CheckMark ='{queryParam["CheckMark"].ToString()}'");
+ }
strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) ");
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination);
}