Browse Source

补考录入、数据初始化改错

新疆影视学院高职
liangkun 2 years ago
parent
commit
019ba316aa
5 changed files with 7 additions and 8 deletions
  1. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs
  2. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js
  3. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js
  4. +3
    -3
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs
  5. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs

+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs View File

@@ -206,7 +206,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
/// 初始化补考成绩
/// <returns></returns>
[HttpPost]
[ValidateAntiForgeryToken]
[AjaxOnly]
public ActionResult InitScore()
{


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js View File

@@ -91,7 +91,7 @@ var bootstrap = function ($, learun) {
$('#lr_Init').on('click', function () {
learun.layerConfirm('是否确认初始化补考成绩!', function (res) {
if (res) {
learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/InitScore', { keyValue: keyValue }, function () {
learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/InitScore', function () {
refreshGirdData();
});
}


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js View File

@@ -87,7 +87,7 @@ var bootstrap = function ($, learun) {
$('#lr_Init').on('click', function () {
learun.layerConfirm('是否确认初始化二次补考成绩!', function (res) {
if (res) {
learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/InitScore', { keyValue: keyValue }, function () {
learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/InitScore', function () {
refreshGirdData();
});
}


+ 3
- 3
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs View File

@@ -415,13 +415,13 @@ else CONVERT(varchar,a.Score) end as Score2 ");
OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo,
StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore,
TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark,
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable)
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable,F_SchoolId)
select
NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester,
OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo,
StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0',
'0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0',
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1'
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1',F_SchoolId
from
(
select a.* from
@@ -489,7 +489,7 @@ order by bb.ScoreId";
var strSql = new StringBuilder();
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(" where s.LessonSortNo='1' and t.LessonTypeCode='OpenLesson' ");
strSql.Append(" where s.LessonSortNo='1' ");
if (userType == "教师")
{
strSql.Append(" and s.EmpNo='" + userAccount + "' ");


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs View File

@@ -394,13 +394,13 @@ else CONVERT(varchar,a.Score) end as Score2 ");
OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo,
StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore,
TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark,
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable)
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable,F_SchoolId)
select
NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester,
OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo,
StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0',
'0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0',
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1'
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1',F_SchoolId
from
(
select a.* from


Loading…
Cancel
Save