【修改】学籍异动审核方法：细分要处理的功能模块；

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs

@@ -427,35 +427,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
                     switch (upTrua.AnomalousType)
                     {
-                        case "01": //留级                        
-                        case "07": //转班
-                        case "08": //转专业
+                        //case "01": //留级                        
+                        //case "07": //转班
+                        //case "08": //转专业
 
-                            #region 复制一份学生学籍表
-                            copyStuInfoBasic(upTrua, stulist, InsertStuTran);
-                            InStuinTran.Add(InsertStuTran);
-                            #endregion
+                        //    break;
 
-                            #region 学籍操作
+                        //case "02": //转校
+                        //case "05": //退学
+                        //case "06": //休学
 
-                            StuEntity = new StuInfoBasicEntity
-                            {
-                                //修改学籍表信息
-                                StuId = upTrua.StuId,
-                                StuNo = upTrua.StuNo,
-                                StuName = upTrua.StuName,
-                                ClassNo = upTrua.ClassNo,
-                                MajorNo = upTrua.NewMajorNo,
-                                DeptNo = upTrua.NewDeptNo,
-                                Grade = upTrua.NewGrade,
-                                EduSystem = upTrua.EduSystem
-                            };
-
-                            upStulist.Add(StuEntity);
-                            #endregion
+                        //    #region 复制一份学生学籍表
+                        //    copyStuInfoBasic(upTrua, stulist, InsertStuTran);
+                        //    InStuinTran.Add(InsertStuTran);
+                        //    #endregion
 
-                            break;
+                        //    break;
 
+                        case "01": //留级                        
+                        case "07": //转班
+                        case "08": //转专业
                         case "02": //转校
                         case "05": //退学
                         case "06": //休学
@@ -465,9 +456,32 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             InStuinTran.Add(InsertStuTran);
                             #endregion
 
-                            #region 学籍操作
-                            if (upTrua.StuStatus == 1) //如果是保留学籍 修改学籍 否则删除学籍
+                            #region 成绩（StuScore，新-写入，旧-删除；StuSelectLessonList，新-写入，旧-删除；StuSelectLessonListOfElective，新-写入，旧-删除；OpenLessonPlanOfElective，旧-修改；）
+
+                            #endregion
+                            #region 补考成绩（StuScoreNotPass，新-写入，旧-删除；）
+                            #endregion
+                            #region 二次补考（StuScoreNotPassTwo，新-写入，旧-删除；）
+                            #endregion
+                            #region 助学金奖学金（ScholarshipAudit，新-写入，旧-删除；）
+                            #endregion
+                            #region 学生心理健康档案（APStuHealthRecords，新-写入，旧-删除；）
+                            #endregion
+                            #region 兵役一（MSRIntentionManagement，新-写入，旧-删除；）
+                            #endregion
+                            #region 兵役二（MSRMilitaryRecord，新-写入，旧-删除；）
+                            #endregion
+                            #region 兵役三（MSRMilitaryServiceRegistration，新-写入，旧-删除；）
+                            #endregion
+                            #region 奖励（StuEncourgement，新-写入，旧-删除；）
+                            #endregion
+                            #region 处分（StuPunishment，新-写入，旧-删除；）
+                            #endregion
+
+                            if (upTrua.AnomalousType == "01" || upTrua.AnomalousType == "07" || upTrua.AnomalousType == "08")
                             {
+                                #region 学籍操作
+
                                 StuEntity = new StuInfoBasicEntity
                                 {
                                     //修改学籍表信息
@@ -480,24 +494,48 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                     Grade = upTrua.NewGrade,
                                     EduSystem = upTrua.EduSystem
                                 };
+
                                 upStulist.Add(StuEntity);
+                                #endregion
+
+                                #region 课表（StuSelectLessonList，旧-写入；）
+                                #endregion
                             }
-                            else
+                            else if(upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06")
                             {
-                                //删除学籍
-                                db.Delete<StuInfoBasicEntity>(x => x.StuId == upTrua.StuId);
-                            }
-                            #endregion
+                                #region 学籍操作
+                                if (upTrua.StuStatus == 1) //如果是保留学籍 修改学籍 否则删除学籍
+                                {
+                                    StuEntity = new StuInfoBasicEntity
+                                    {
+                                        //修改学籍表信息
+                                        StuId = upTrua.StuId,
+                                        StuNo = upTrua.StuNo,
+                                        StuName = upTrua.StuName,
+                                        ClassNo = upTrua.ClassNo,
+                                        MajorNo = upTrua.NewMajorNo,
+                                        DeptNo = upTrua.NewDeptNo,
+                                        Grade = upTrua.NewGrade,
+                                        EduSystem = upTrua.EduSystem
+                                    };
+                                    upStulist.Add(StuEntity);
+                                }
+                                else
+                                {
+                                    //删除学籍
+                                    db.Delete<StuInfoBasicEntity>(x => x.StuId == upTrua.StuId);
+                                }
+                                #endregion
 
-                            #region 删除用户表
+                                #region 删除用户表
 
-                            //是注销账号,账号禁用
-                            if (upTrua.F_WriteMark == 1)
-                            {
-                                db1.ExecuteBySql(" update LR_Base_User set F_EnabledMark=0 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' ");
+                                //是注销账号,账号禁用
+                                if (upTrua.F_WriteMark == 1)
+                                {
+                                    db1.ExecuteBySql(" update LR_Base_User set F_EnabledMark=0 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' ");
+                                }
+                                #endregion
                             }
-                            #endregion
-
                             break;
                         case "03": //复学
                             //学籍异动列表
@@ -508,7 +546,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 {
                                     //复学的学籍
                                     var ReturnStu = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicTranEntity>(x => x.StuId == upTrua.StuId);
-
+                                    //todo:根据页面更新系专业班级年级数据；
                                     #region 重新生成学籍
                                     addTruan.StuId = ReturnStu.StuId;
                                     addTruan.StuNo = ReturnStu.StuNo;
@@ -688,10 +726,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 }
                                 if (upTrua.RecoverWriteMark == "0") //恢复账号
                                 {
+                                    #region 用户表
+
                                     db1.ExecuteBySql(" update LR_Base_User set F_EnabledMark= 1 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' ");
                                     UpStuTran.Add(upTrua); //修改学籍异动表 为复学
+
+                                    #endregion
                                 }
                             }
+
+                            #region 课表（StuSelectLessonList，旧-写入；）
+                            #endregion
                             break;
                         case "04": //转入
                             #region 学籍表加数据
@@ -716,43 +761,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             stuInfoBasicEntity.IdCardType = upTrua.IdCardType;
                             db.Insert(stuInfoBasicEntity);
                             #endregion
-                            break;
-                        default:
-                            #region 复制一份学生学籍表
-                            copyStuInfoBasic(upTrua, stulist, InsertStuTran);
-                            InStuinTran.Add(InsertStuTran);
-                            #endregion
 
-                            #region 学籍操作
-                            ////删除学籍
-                            //db.Delete<StuInfoBasicEntity>(x => x.StuId == upTrua.StuId);
-                            if (upTrua.StuStatus == 0) //如果是保留学籍 修改学籍 否则删除学籍
-                            {
-                                StuEntity = new StuInfoBasicEntity
-                                {
-                                    //修改学籍表信息
-                                    StuId = upTrua.StuId,
-                                    StuNo = upTrua.StuNo,
-                                    StuName = upTrua.StuName,
-                                    ClassNo = upTrua.ClassNo,
-                                    MajorNo = upTrua.MajorNo,
-                                    DeptNo = upTrua.DeptNo,
-                                    Grade = upTrua.Grade,
-                                    EduSystem = upTrua.EduSystem
-                                };
-                                upStulist.Add(StuEntity);
-                            }
+                            #region 课表（StuSelectLessonList，旧-写入；）
                             #endregion
-
-                            #region 删除用户表
-
-                            //是注销账号,账号禁用
-                            if (upTrua.F_WriteMark == 1)
-                            {
-                                db1.ExecuteBySql(" update LR_Base_User set F_EnabledMark=0 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' ");
-                            }
-                            #endregion
-
+                            break;
+                        default:
                             break;
                     }
                 }