@@ -56,7 +56,7 @@
-
+
提交
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js
index 23f0381a2..04248d0aa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js
@@ -14,7 +14,26 @@ var bootstrap = function ($, learun) {
page.search(queryJson);
}, 280, 400);
$('#SubmitBtn').on('click', function () {
- console.log('123465')
+ if (!$('body').lrValidform()) {
+ return false;
+ }
+ var entity = $('body').lrGetFormData();
+ entity.AnomalousType = entity.NewAnomalousType;
+ var selgridtab = $('#selgridtab').jfGridGet('rowdatas');
+ $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) },
+ function (res) {
+ //console.log(res)
+ if (res.code == 200) {
+ setTimeout(function () {
+ location.reload();
+ }, 100)
+ }
+ // 保存成功后才回调
+ //if (!!callBack) {
+ // callBack(res);
+ //}
+ }
+ );
})
$('#DeptNo').lrselect({
allowSearch: true,
@@ -128,6 +147,7 @@ var bootstrap = function ($, learun) {
});
//提交下拉框
+ $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
$('#NewDeptNo').lrselect({
allowSearch: true,
value: "deptno",
@@ -238,9 +258,10 @@ var bootstrap = function ($, learun) {
value: "classno",
text: "classname"
});
- $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType'});
$('#RecoverWriteMark').lrDataItemSelect({ code: 'YesOrNoInt' });
$('#RecoverStuStatus').lrDataItemSelect({ code: 'YesOrNoInt' });
+ $('#NewAnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
+ $('#NewAnomalousType').lrselectSet("03");
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
@@ -428,8 +449,8 @@ var bootstrap = function ($, learun) {
// return cellvalue == "1" ? "
已审核" : "
未审核";
// }
//},
- { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
- { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
+ { label: "学生编号", name: "StuNo", width: 100, align: "left" },
+ { label: "学籍号", name: "StuCode", width: 100, align: "left" },
{ label: "学号", name: "ProvinceCode", width: 100, align: "left" },
{ label: "姓名", name: "StuName", width: 100, align: "left" },
{
@@ -829,7 +850,7 @@ var bootstrap = function ($, learun) {
}, [])
//console.log('resources', list)
}
- console.log(list)
+ //console.log(list)
tempdatra = list
$('#selgridtab').jfGridSet('refreshdata', tempdatra);
}
@@ -839,7 +860,7 @@ var bootstrap = function ($, learun) {
},
search: function (param) {
param = param || {};
- param.SqlParameter = ' and (AnomalousType =03 or AnomalousType=02 or AnomalousType=06 ) and IsReturnSchool=0 ';
+ param.SqlParameter = ' and AnomalousType=06 and IsReturnSchool=1 and F_EnabledMark=1 ';
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
@@ -848,6 +869,3 @@ var bootstrap = function ($, learun) {
};
page.init();
}
-function delbtn() {
- console.log('111111')
-}
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js
index e625a6b60..170469ab0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js
@@ -733,7 +733,7 @@ var bootstrap = function ($, learun) {
}, [])
//console.log('resources', list)
}
- console.log(list)
+ //console.log(list)
tempdatra = list
$('#selgridtab').jfGridSet('refreshdata', tempdatra);
}
@@ -751,6 +751,3 @@ var bootstrap = function ($, learun) {
};
page.init();
}
-function delbtn() {
- console.log('111111')
-}
\ 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 3c4423b90..77b6188db 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
@@ -1362,6 +1362,7 @@
+
@@ -8049,6 +8050,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs
index 9c701d454..e07b9e48d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs
@@ -266,7 +266,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
,[LessonNo]
,[ELOrder]
,[ELEnabled],ExamTime,LessonTypeId,DeptNo,MajorNo)
-select NEWID(),AcademicYearNo,t.Semester,Grade,t.LessonName,t.[LessonNo],0,1,'{ExamTime}',a.lessontypeid,t.DeptNo,t.MajorNo from OpenLessonPlan t
+select NEWID(),AcademicYearNo,t.Semester,replace(Grade,'级','') Grade,t.LessonName,t.[LessonNo],0,1,'{ExamTime}',a.lessontypeid,t.DeptNo,t.MajorNo from OpenLessonPlan t
left join lessoninfo a on t.lessonno=a.lessonno
where t.ExamType='1' and t.lessonsortno=1 and t.AcademicYearNo='{AcademicYearNo}' and t.Semester='{Semester}'
and t.[LessonNo] not in (select [LessonNo] from Exam_ExamLesson where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' )
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs
index 84ce9608a..14cb72eed 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs
@@ -265,6 +265,15 @@ and examtime is not null and datediff(day, examdate, '{examPlanLesson.ExamDate}'
//{
// entity.ClassStuNum = stuinfo.Count(x => x.ClassNo == entity.ClassNo);
//}
+ var classList = this.BaseRepository("CollegeMIS").FindList
(x => x.CheckMark == true);
+ if (list.Exists(x => string.IsNullOrEmpty(x.ClassName)))
+ {
+ foreach (var item in list.Where(x => string.IsNullOrEmpty(x.ClassName)).ToList())
+ {
+ item.ClassName = classList.Where(x => x.ClassNo == item.ClassNo).FirstOrDefault().ClassName;
+ }
+ }
+
this.BaseRepository("CollegeMIS").Insert(list);
//更新排考安排课程表实排班级数、实排人数
//排考安排课程表Id