diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js
index a68f072fd..b5a2cf01f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js
@@ -156,7 +156,7 @@ var bootstrap = function ($, learun) {
scoreList.push(entity);
});
var entity = $('body').lrGetFormData();
- entity.MajorName = $('#MajorNo').lrselectGetText();
+ //entity.MajorName = $('#MajorNo').lrselectGetText();
var postData = {
strEntity: JSON.stringify(entity),
scoreList: JSON.stringify(scoreList)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.cshtml
index 0ef2ab278..ee60a02fc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.cshtml
@@ -68,6 +68,9 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js
index 9b6eb2c19..155f281c1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js
@@ -335,6 +335,13 @@ var bootstrap = function ($, learun) {
value: 'value',
text: 'text'
});
+ //状态
+ $('#Status').lrselect({
+ placeholder: "请选择状态",
+ data: [{ value: "1", text: "已审核" }, { value: "0", text: "未审核" }],
+ value: 'value',
+ text: 'text'
+ });
},
initGird: function () {
$('#gridtable').jfGrid({
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 25676ac46..c79ebbbd5 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
@@ -8030,6 +8030,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs
index ab7224d02..69e7f78b6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs
@@ -2192,6 +2192,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
try
{
db.BeginTrans();
+ var sql = $" select top 1 [year] as year,Majorname from CdMajor where ID='{entity.MajorNo}'";
+ var majorData = db.FindTable(sql);
+ entity.MajorName = majorData.Rows[0]["Majorname"].ToString();
+ entity.Year = majorData.Rows[0]["year"].ToString();
if (!string.IsNullOrEmpty(keyValue))
{
entity.Modify(keyValue);
@@ -2201,10 +2205,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
entity.Create();
entity.EnrollStatus = 0;
- var sql = $" select top 1 [year] as year,Majorname from CdMajor where ID='{entity.MajorNo}'";
- var majorData = db.FindTable(sql);
- entity.MajorName = majorData.Rows[0]["Majorname"].ToString();
- entity.Year = majorData.Rows[0]["year"].ToString();
+
db.Insert(entity);
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreService.cs
index 6d28ed6b3..81d47dd82 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreService.cs
@@ -63,6 +63,18 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
dp.Add("SubjectId", queryParam["SubjectId"].ToString(), DbType.String);
}
+ if (!queryParam["Status"].IsEmpty())
+ {
+ if (queryParam["Status"].ToString() == "1")
+ {
+ strSql.Append(" and t.Status=1 ");
+ }
+ else
+ {
+ strSql.Append(" and t.Status<>1 ");
+ }
+ }
+
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp);
}
catch (Exception ex)
@@ -175,6 +187,17 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
strSql.Append(" and t.SubjectId=@SubjectId ");
dp.Add("SubjectId", queryParam["SubjectId"].ToString(), DbType.String);
}
+ if (!queryParam["Status"].IsEmpty())
+ {
+ if (queryParam["Status"].ToString() == "1")
+ {
+ strSql.Append(" and t.Status=1 ");
+ }
+ else
+ {
+ strSql.Append(" and t.Status<>1 ");
+ }
+ }
return this.BaseRepository("CollegeMIS").FindEntity(strSql.ToString(), dp);
}
@@ -605,22 +628,23 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
var Year = queryParam["Year"].ToString();
//考试科目
var SubjectId = queryParam["SubjectId"].ToString();
+ var statuswhere = queryParam["Status"].ToString();
- db.ExecuteBySql($"update StuEnrollScore set Status='{Status}' where YearNo='{Year}' and SubjectId='{SubjectId}' ");
+ db.ExecuteBySql($"update StuEnrollScore set Status='{Status}' where YearNo='{Year}' and SubjectId='{SubjectId}' and Status='{statuswhere}'");
//已审核 记录学生总分
- if (Status == 1)
- {
- var list = db.FindList(x => x.YearNo == Year && x.SubjectId == SubjectId).Select(x => x.StuId);
- foreach (var item in list)
- {
- var stuEnrollEntity = db.FindEntity(x => x.StuId == item);
- stuEnrollEntity.ExamScore =
- db.FindList(x => x.YearNo == Year && x.StuId == item)
- .Sum(x => x.Score);
- db.Update(stuEnrollEntity);
- }
- }
+ //if (Status == 1)
+ //{
+ // var list = db.FindList(x => x.YearNo == Year && x.SubjectId == SubjectId).Select(x => x.StuId);
+ // foreach (var item in list)
+ // {
+ // var stuEnrollEntity = db.FindEntity(x => x.StuId == item);
+ // stuEnrollEntity.ExamScore =
+ // db.FindList(x => x.YearNo == Year && x.StuId == item)
+ // .Sum(x => x.Score);
+ // db.Update(stuEnrollEntity);
+ // }
+ //}
db.Commit();
}