Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -459,7 +459,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUDYMODALITY")]
         public string StudyModality { get; set; }
         /// <summary>
-        /// 学籍异动状态
+        /// 学籍异动状态（异动类型为退学、休学时值为1）
         /// </summary>
         /// <returns></returns>
         [Column("CHANGESTATUS")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs

@@ -210,13 +210,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         var classInfoEntity = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.ClassNo);
                         if (classInfoEntity != null)
                         {
-                            db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.DeptNo}',MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
+                            db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.DeptNo}',MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}',MoveType =null,MoveStatus=null where StuNo='{entity.StuNo}' ");
                         }
                     }
                     else if (entity.StuChangeType == "04" || entity.StuChangeType == "05")  //退学、休学
                     {
                         //改信息；显示成绩；
-                        db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null where StuNo='{entity.StuNo}' ");
+                        db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null,MoveType =null,MoveStatus=null where StuNo='{entity.StuNo}' ");
                     }
 
                     //修改状态

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs

@@ -72,7 +72,7 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach
                 var queryParam = queryJson.ToJObject();
                 var strSql = new StringBuilder();
                 strSql.Append("select aa.*,bb.UID,cc.EmpName,dd.LessonName from (select a.LessonNo,a.EmpNo,a.AcademicYearNo,a.Semester,b.VID,a.StuNo from " + misdbname + ".dbo.StuSelectLessonList a ");
-                strSql.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 and a.StuNo='" + queryParam["StuNo"] + "') aa ");
+                strSql.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 and a.StuNo='" + queryParam["StuNo"] + "' and a.StuNo not in (select StuNo from " + misdbname + ".dbo.StuInfoBasic where ChangeStatus=1) ) aa ");
                 strSql.Append("left join  (select distinct b.EmpNo, b.LessonNo, b.UID from Eval_Question a left join Eval_QuestionResult b  on a.QID=b.QID) bb on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID ");
                 strSql.Append("left join " + misdbname + ".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo left join " + misdbname + ".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo ");
                 if (pagination != null)
@@ -365,6 +365,7 @@ from " + misdbname + @".dbo.StuSelectLessonList a
 left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester 
 where b.Status=1 and b.VID='" + queryParam["VID"] + @"' 
 and a.StuNo is not null and a.StuNo <> ''
+and a.StuNo not in (select StuNo from " + misdbname + @".dbo.StuInfoBasic where ChangeStatus=1)
 ) aa
 left join 
 (
@@ -524,6 +525,7 @@ from " + misdbname + @".dbo.StuSelectLessonList a
 left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester 
 where b.Status=1 and b.VID='" + queryParam["VID"] + @"' 
 and a.StuNo is not null and a.StuNo <> ''
+and a.StuNo not in (select StuNo from " + misdbname + @".dbo.StuInfoBasic where ChangeStatus=1) 
 group by a.LessonNo,a.EmpNo,a.LessonName
 ) ss
 left join