@@ -206,7 +206,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
/// 初始化补考成绩 | /// 初始化补考成绩 | ||||
/// <returns></returns> | /// <returns></returns> | ||||
[HttpPost] | [HttpPost] | ||||
[ValidateAntiForgeryToken] | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult InitScore() | public ActionResult InitScore() | ||||
{ | { | ||||
@@ -91,7 +91,7 @@ var bootstrap = function ($, learun) { | |||||
$('#lr_Init').on('click', function () { | $('#lr_Init').on('click', function () { | ||||
learun.layerConfirm('是否确认初始化补考成绩!', function (res) { | learun.layerConfirm('是否确认初始化补考成绩!', function (res) { | ||||
if (res) { | if (res) { | ||||
learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/InitScore', { keyValue: keyValue }, function () { | |||||
learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/InitScore', function () { | |||||
refreshGirdData(); | refreshGirdData(); | ||||
}); | }); | ||||
} | } | ||||
@@ -87,7 +87,7 @@ var bootstrap = function ($, learun) { | |||||
$('#lr_Init').on('click', function () { | $('#lr_Init').on('click', function () { | ||||
learun.layerConfirm('是否确认初始化二次补考成绩!', function (res) { | learun.layerConfirm('是否确认初始化二次补考成绩!', function (res) { | ||||
if (res) { | if (res) { | ||||
learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/InitScore', { keyValue: keyValue }, function () { | |||||
learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/InitScore', function () { | |||||
refreshGirdData(); | refreshGirdData(); | ||||
}); | }); | ||||
} | } | ||||
@@ -415,13 +415,13 @@ else CONVERT(varchar,a.Score) end as Score2 "); | |||||
OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, | OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, | ||||
StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore, | StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore, | ||||
TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark, | TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark, | ||||
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable) | |||||
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable,F_SchoolId) | |||||
select | select | ||||
NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, | NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, | ||||
OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, | OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, | ||||
StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0', | StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0', | ||||
'0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0', | '0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0', | ||||
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1' | |||||
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1',F_SchoolId | |||||
from | from | ||||
( | ( | ||||
select a.* from | select a.* from | ||||
@@ -489,7 +489,7 @@ order by bb.ScoreId"; | |||||
var strSql = new StringBuilder(); | var strSql = new StringBuilder(); | ||||
strSql.Append("select distinct s.LessonNo as value,s.LessonName as text from StuScoreNotPass s "); | strSql.Append("select distinct s.LessonNo as value,s.LessonName as text from StuScoreNotPass s "); | ||||
strSql.Append(" left join LessonInfo l on s.LessonNo=l.LessonNo left join CdLessonType t on l.LessonTypeId=t.LTId "); | strSql.Append(" left join LessonInfo l on s.LessonNo=l.LessonNo left join CdLessonType t on l.LessonTypeId=t.LTId "); | ||||
strSql.Append(" where s.LessonSortNo='1' and t.LessonTypeCode='OpenLesson' "); | |||||
strSql.Append(" where s.LessonSortNo='1' "); | |||||
if (userType == "教师") | if (userType == "教师") | ||||
{ | { | ||||
strSql.Append(" and s.EmpNo='" + userAccount + "' "); | strSql.Append(" and s.EmpNo='" + userAccount + "' "); | ||||
@@ -394,13 +394,13 @@ else CONVERT(varchar,a.Score) end as Score2 "); | |||||
OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, | OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, | ||||
StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore, | StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore, | ||||
TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark, | TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark, | ||||
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable) | |||||
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable,F_SchoolId) | |||||
select | select | ||||
NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, | NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, | ||||
OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, | OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, | ||||
StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0', | StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0', | ||||
'0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0', | '0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0', | ||||
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1' | |||||
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1',F_SchoolId | |||||
from | from | ||||
( | ( | ||||
select a.* from | select a.* from | ||||