diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineService.cs index 4ee311234..892eb8f4e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineService.cs @@ -2269,6 +2269,15 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad failDt.Rows.Add(dr.ItemArray); continue; } + else + { + if (item.CheckMark == "1") + { + dr["导入错误"] = "当前学生成绩已审核!"; + failDt.Rows.Add(dr.ItemArray); + continue; + } + } var TermEndScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["最终核定成绩"].ToString().Trim()) ? "0" : dr["最终核定成绩"].ToString().Trim()); if (TermEndScore < 0) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElectiveOnline/StuSelectLessonListOfElectiveOnlineService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElectiveOnline/StuSelectLessonListOfElectiveOnlineService.cs index 082500018..f3eab087f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElectiveOnline/StuSelectLessonListOfElectiveOnlineService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElectiveOnline/StuSelectLessonListOfElectiveOnlineService.cs @@ -266,7 +266,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration if (model != null) { count++; + //修改StuSelectLessonListOfElectiveOnline状态为报名失败 db.ExecuteBySql("update StuSelectLessonListOfElectiveOnline set Status=3 where Id='" + item + "'"); + //删除StuScoreOnline已生成成绩数据 + db.ExecuteBySql($"delete from StuScoreOnline where StuNo='{model.StuNo}' and StuName='{model.StuName}' and AcademicYearNo='{model.AcademicYearNo}' and Semester='{model.Semester}' and LessonNo='{model.LessonNo}' and LessonName='{model.LessonName}' and EmpNo='{model.EmpNo}' "); } } //修改LessonInfoOfElectiveOnline通过人数 @@ -417,7 +420,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var queryParam = queryJson.ToJObject(); var strSql = new StringBuilder(); - + strSql.Append("select a.StuNo,a.StuName,a.DeptNo,a.MajorNo,a.F_SchoolId,a.ClassNo,b.Status,b.Id,"); strSql.Append("'" + queryParam["AcademicYearNo"].ToString() + "' as AcademicYearNo,'" + queryParam["Semester"].ToString() + "' as Semester,"); strSql.Append("b.LessonNo,b.LessonName,b.EmpNo,b.EmpName");