【修改】学籍异动优化；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js

@@ -85,11 +85,11 @@ var bootstrap = function ($, learun) {
                         learun.alert.warning("只能选择一条记录进行查看！");
                         return;
                     }
-                    var CheckMark = $('#gridtable').jfGridValue('F_EnabledMark');
-                    if (CheckMark.indexOf('0') != -1) {
-                        learun.alert.warning("请选择已生效项进行查看！");
-                        return;
-                    }
+                    //var CheckMark = $('#gridtable').jfGridValue('F_EnabledMark');
+                    //if (CheckMark.indexOf('0') != -1) {
+                    //    learun.alert.warning("请选择已生效项进行查看！");
+                    //    return;
+                    //}
                     learun.layerForm({
                         id: 'formview',
                         title: '查看',

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranEntity.cs

@@ -1058,6 +1058,265 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         [Column("DIPLOMARECEIVEREMARK")]
         public string DiplomaReceiveRemark { get; set; }
+
+
+        /// <summary>
+        /// 毕业学校
+        /// </summary>
+        [Column("GRADUATESCHOOL")]
+        public string GraduateSchool { get; set; }
+
+        /// <summary>
+        /// 成员3名称
+        /// </summary>
+        [Column("THREENAME")]
+        public string ThreeName { get; set; }
+        /// <summary>
+        /// 成员3工作单位（或者具体家庭住址）
+        /// </summary>
+        [Column("THREEJOB")]
+        public string ThreeJob { get; set; }
+        /// <summary>
+        /// 成员3电话
+        /// </summary>
+        [Column("THREEMOBILE")]
+        public string ThreeMobile { get; set; }
+        /// <summary>
+        /// 成员3电话
+        /// </summary>
+        [Column("THREEIDENTITYCARDNO")]
+        public string ThreeIdentityCardNo { get; set; }
+        /// <summary>
+        /// 成员3政治面貌
+        /// </summary>
+        [Column("THREEPARTYFACENO")]
+        public string ThreePartyFaceNo { get; set; }
+        /// <summary>
+        /// 成员4名称
+        /// </summary>
+        [Column("FOURNAME")]
+        public string FourName { get; set; }
+        /// <summary>
+        /// 成员4工作单位（或者具体家庭住址）
+        /// </summary>
+        [Column("FOURJOB")]
+        public string FourJob { get; set; }
+        /// <summary>
+        /// 成员4电话
+        /// </summary>
+        [Column("FOURMOBILE")]
+        public string FourMobile { get; set; }
+        /// <summary>
+        /// 成员4电话
+        /// </summary>
+        [Column("FOURIDENTITYCARDNO")]
+        public string FourIdentityCardNo { get; set; }
+        /// <summary>
+        /// 成员4政治面貌
+        /// </summary>
+        [Column("FOURPARTYFACENO")]
+        public string FourPartyFaceNo { get; set; }
+        /// <summary>
+        /// 成员5名称
+        /// </summary>
+        [Column("FIVENAME")]
+        public string FiveName { get; set; }
+        /// <summary>
+        /// 成员5工作单位（或者具体家庭住址）
+        /// </summary>
+        [Column("FIVEJOB")]
+        public string FiveJob { get; set; }
+        /// <summary>
+        /// 成员5电话
+        /// </summary>
+        [Column("FIVEMOBILE")]
+        public string FiveMobile { get; set; }
+        /// <summary>
+        /// 成员5电话
+        /// </summary>
+        [Column("FIVEIDENTITYCARDNO")]
+        public string FiveIdentityCardNo { get; set; }
+        /// <summary>
+        /// 成员5政治面貌
+        /// </summary>
+        [Column("FIVEPARTYFACENO")]
+        public string FivePartyFaceNo { get; set; }
+        /// <summary>
+        /// 成员6名称
+        /// </summary>
+        [Column("SIXNAME")]
+        public string SixName { get; set; }
+        /// <summary>
+        /// 成员6工作单位（或者具体家庭住址）
+        /// </summary>
+        [Column("SIXJOB")]
+        public string SixJob { get; set; }
+        /// <summary>
+        /// 成员6电话
+        /// </summary>
+        [Column("SIXMOBILE")]
+        public string SixMobile { get; set; }
+        /// <summary>
+        /// 成员6电话
+        /// </summary>
+        [Column("SIXIDENTITYCARDNO")]
+        public string SixIdentityCardNo { get; set; }
+        /// <summary>
+        /// 成员6政治面貌
+        /// </summary>
+        [Column("SIXPARTYFACENO")]
+        public string SixPartyFaceNo { get; set; }
+        /// <summary>
+        /// 成员6名称
+        /// </summary>
+        [Column("OTHERNAME")]
+        public string OtherName { get; set; }
+        /// <summary>
+        /// 成员6工作单位（或者具体家庭住址）
+        /// </summary>
+        [Column("OTHERJOB")]
+        public string OtherJob { get; set; }
+        /// <summary>
+        /// 成员6电话
+        /// </summary>
+        [Column("OTHERMOBILE")]
+        public string OtherMobile { get; set; }
+        /// <summary>
+        /// 成员6电话
+        /// </summary>
+        [Column("OTHERIDENTITYCARDNO")]
+        public string OtherIdentityCardNo { get; set; }
+        /// <summary>
+        /// 成员6政治面貌
+        /// </summary>
+        [Column("OTHERPARTYFACENO")]
+        public string OtherPartyFaceNo { get; set; }
+        /// <summary>
+        /// 是建档立卡户
+        /// </summary>
+        [Column("ISFILING")]
+        public bool? IsFiling { get; set; }
+        /// <summary>
+        /// 低保
+        /// </summary>
+        [Column("ISSA")]
+        public bool? IsSA { get; set; }
+        /// <summary>
+        /// 烈士子女
+        /// </summary>
+        [Column("ISMARTYRSCHILD")]
+        public bool? IsMartyrsChild { get; set; }
+        /// <summary>
+        /// 孤儿
+        /// </summary>
+        [Column("ISORPHAN")]
+        public bool? IsOrphan { get; set; }
+        /// <summary> 
+        /// 入学年级 
+        /// </summary> 
+        [Column("ENROLGRADE")]
+        public string EnrolGrade { get; set; }
+        /// <summary> 
+        /// 入学专业 
+        /// </summary> 
+        [Column("ENROLMAJORNO")]
+        public string EnrolMajorNo { get; set; }
+        /// <summary> 
+        /// 入学班级 
+        /// </summary> 
+        [Column("ENROLCLASSNO")]
+        public string EnrolClassNo { get; set; }
+        /// <summary> 
+        /// 是否在籍 
+        /// </summary> 
+        [Column("ISREGISTERED")]
+        public string IsRegistered { get; set; }
+        /// <summary> 
+        /// 是否在校 
+        /// </summary> 
+        [Column("ISATSCHOOL")]
+        public string IsAtSchool { get; set; }
+        /// <summary> 
+        /// 学籍状态 
+        /// </summary> 
+        [Column("STUDENTSTATUS")]
+        public string StudentStatus { get; set; }
+        /// <summary> 
+        /// 预计毕业日期 
+        /// </summary> 
+        [Column("EXPECTEDGRADUATIONDATE")]
+        public DateTime? ExpectedGraduationDate { get; set; }
+        /// <summary> 
+        /// 毕业证书编号 
+        /// </summary> 
+        [Column("CERTIFICATENO")]
+        public string CertificateNo { get; set; }
+        /// <summary> 
+        /// 离校时间 
+        /// </summary> 
+        [Column("DEPARTURETIME")]
+        public DateTime? DepartureTime { get; set; }
+        /// <summary> 
+        /// 班主任姓名 
+        /// </summary> 
+        [Column("CLASSADVISER")]
+        public string ClassAdviser { get; set; }
+        /// <summary> 
+        /// 考生号 
+        /// </summary> 
+        [Column("EXAMINEENUMBER")]
+        public string ExamineeNumber { get; set; }
+        /// <summary> 
+        /// 高考成绩 
+        /// </summary> 
+        [Column("COLLEGESCORE")]
+        public string CollegeScore { get; set; }
+        /// <summary> 
+        /// 毕业中学名称 
+        /// </summary> 
+        [Column("GRADUATIONHIGHSCHOOLNAME")]
+        public string GraduationHighSchoolName { get; set; }
+        /// <summary> 
+        /// 是否常住户口在农村 
+        /// </summary> 
+        [Column("ISPERMANENTRURALAREA")]
+        public bool? IsPermanentRuralArea { get; set; }
+        /// <summary> 
+        /// 监护人身份证号码 
+        /// </summary> 
+        [Column("GUARDIANIDNO")]
+        public string GuardianIDNo { get; set; }
+        /// <summary> 
+        /// 监护人政治面貌 
+        /// </summary> 
+        [Column("GUARDIANPOLITICALSTATU")]
+        public string GuardianPoliticalStatu { get; set; }
+        /// <summary> 
+        /// 监护人工作单位或者具体家庭住址 
+        /// </summary> 
+        [Column("GUARDIANWORKUNITORHOMEADDRESS")]
+        public string GuardianWorkUnitOrHomeAddress { get; set; }
+        /// <summary> 
+        /// 备用1 
+        /// </summary> 
+        [Column("STANDBY1")]
+        public string Standby1 { get; set; }
+        /// <summary> 
+        /// 备用2 
+        /// </summary> 
+        [Column("STANDBY2")]
+        public string Standby2 { get; set; }
+        /// <summary> 
+        /// 备用3 
+        /// </summary> 
+        [Column("STANDBY3")]
+        public string Standby3 { get; set; }
+        /// <summary> 
+        /// 备用4 
+        /// </summary> 
+        [Column("STANDBY4")]
+        public string Standby4 { get; set; }
+
         /// <summary>
         /// 异动类型
         /// </summary>

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

@@ -869,6 +869,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                     addTruan.DiplomaReceiveSign = ReturnStu.DiplomaReceiveSign;
                                     addTruan.DiplomaReceiveIdcard = ReturnStu.DiplomaReceiveIdcard;
                                     addTruan.DiplomaReceiveRemark = ReturnStu.DiplomaReceiveRemark;
+                                    addTruan.GraduateSchool = ReturnStu.GraduateSchool;
+                                    addTruan.IsFiling = ReturnStu.IsFiling;
+                                    addTruan.IsSA = ReturnStu.IsSA;
+                                    addTruan.IsMartyrsChild = ReturnStu.IsMartyrsChild;
+                                    addTruan.IsOrphan = ReturnStu.IsOrphan;
+                                    addTruan.ThreeName = ReturnStu.ThreeName;
+                                    addTruan.ThreeJob = ReturnStu.ThreeJob;
+                                    addTruan.ThreeMobile = ReturnStu.ThreeMobile;
+                                    addTruan.ThreeIdentityCardNo = ReturnStu.ThreeIdentityCardNo;
+                                    addTruan.ThreePartyFaceNo = ReturnStu.ThreePartyFaceNo;
+                                    addTruan.FourName = ReturnStu.FourName;
+                                    addTruan.FourJob = ReturnStu.FourJob;
+                                    addTruan.FourMobile = ReturnStu.FourMobile;
+                                    addTruan.FourIdentityCardNo = ReturnStu.FourIdentityCardNo;
+                                    addTruan.FourPartyFaceNo = ReturnStu.FourPartyFaceNo;
+                                    addTruan.FiveName = ReturnStu.FiveName;
+                                    addTruan.FiveJob = ReturnStu.FiveJob;
+                                    addTruan.FiveMobile = ReturnStu.FiveMobile;
+                                    addTruan.FiveIdentityCardNo = ReturnStu.FiveIdentityCardNo;
+                                    addTruan.FivePartyFaceNo = ReturnStu.FivePartyFaceNo;
+                                    addTruan.SixName = ReturnStu.SixName;
+                                    addTruan.SixJob = ReturnStu.SixJob;
+                                    addTruan.SixMobile = ReturnStu.SixMobile;
+                                    addTruan.SixIdentityCardNo = ReturnStu.SixIdentityCardNo;
+                                    addTruan.SixPartyFaceNo = ReturnStu.SixPartyFaceNo;
+                                    addTruan.OtherName = ReturnStu.OtherName;
+                                    addTruan.OtherJob = ReturnStu.OtherJob;
+                                    addTruan.OtherMobile = ReturnStu.OtherMobile;
+                                    addTruan.OtherIdentityCardNo = ReturnStu.OtherIdentityCardNo;
+                                    addTruan.OtherPartyFaceNo = ReturnStu.OtherPartyFaceNo;
+                                    addTruan.EnrolGrade = ReturnStu.EnrolGrade;
+                                    addTruan.EnrolMajorNo = ReturnStu.EnrolMajorNo;
+                                    addTruan.EnrolClassNo = ReturnStu.EnrolClassNo;
+                                    addTruan.IsRegistered = ReturnStu.IsRegistered;
+                                    addTruan.IsAtSchool = ReturnStu.IsAtSchool;
+                                    addTruan.StudentStatus = ReturnStu.StudentStatus;
+                                    addTruan.ExpectedGraduationDate = ReturnStu.ExpectedGraduationDate;
+                                    addTruan.CertificateNo = ReturnStu.CertificateNo;
+                                    addTruan.DepartureTime = ReturnStu.DepartureTime;
+                                    addTruan.ClassAdviser = ReturnStu.ClassAdviser;
+                                    addTruan.ExamineeNumber = ReturnStu.ExamineeNumber;
+                                    addTruan.CollegeScore = ReturnStu.CollegeScore;
+                                    addTruan.GraduationHighSchoolName = ReturnStu.GraduationHighSchoolName;
+                                    addTruan.IsPermanentRuralArea = ReturnStu.IsPermanentRuralArea;
+                                    addTruan.GuardianIDNo = ReturnStu.GuardianIDNo;
+                                    addTruan.GuardianPoliticalStatu = ReturnStu.GuardianPoliticalStatu;
+                                    addTruan.GuardianWorkUnitOrHomeAddress = ReturnStu.GuardianWorkUnitOrHomeAddress;
+                                    addTruan.Standby1 = ReturnStu.Standby1;
+                                    addTruan.Standby2 = ReturnStu.Standby2;
+                                    addTruan.Standby3 = ReturnStu.Standby3;
+                                    addTruan.Standby4 = ReturnStu.Standby4;
                                     addTruan.CheckMark = "0";
                                     db.Insert(addTruan);
                                     #endregion
@@ -1271,6 +1322,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             InsertStuTran.DiplomaReceiveSign = stulist.DiplomaReceiveSign;
             InsertStuTran.DiplomaReceiveIdcard = stulist.DiplomaReceiveIdcard;
             InsertStuTran.DiplomaReceiveRemark = stulist.DiplomaReceiveRemark;
+            InsertStuTran.GraduateSchool = stulist.GraduateSchool;
+            InsertStuTran.IsFiling = stulist.IsFiling;
+            InsertStuTran.IsSA = stulist.IsSA;
+            InsertStuTran.IsMartyrsChild = stulist.IsMartyrsChild;
+            InsertStuTran.IsOrphan = stulist.IsOrphan;
+            InsertStuTran.ThreeName = stulist.ThreeName;
+            InsertStuTran.ThreeJob = stulist.ThreeJob;
+            InsertStuTran.ThreeMobile = stulist.ThreeMobile;
+            InsertStuTran.ThreeIdentityCardNo = stulist.ThreeIdentityCardNo;
+            InsertStuTran.ThreePartyFaceNo = stulist.ThreePartyFaceNo;
+            InsertStuTran.FourName = stulist.FourName;
+            InsertStuTran.FourJob = stulist.FourJob;
+            InsertStuTran.FourMobile = stulist.FourMobile;
+            InsertStuTran.FourIdentityCardNo = stulist.FourIdentityCardNo;
+            InsertStuTran.FourPartyFaceNo = stulist.FourPartyFaceNo;
+            InsertStuTran.FiveName = stulist.FiveName;
+            InsertStuTran.FiveJob = stulist.FiveJob;
+            InsertStuTran.FiveMobile = stulist.FiveMobile;
+            InsertStuTran.FiveIdentityCardNo = stulist.FiveIdentityCardNo;
+            InsertStuTran.FivePartyFaceNo = stulist.FivePartyFaceNo;
+            InsertStuTran.SixName = stulist.SixName;
+            InsertStuTran.SixJob = stulist.SixJob;
+            InsertStuTran.SixMobile = stulist.SixMobile;
+            InsertStuTran.SixIdentityCardNo = stulist.SixIdentityCardNo;
+            InsertStuTran.SixPartyFaceNo = stulist.SixPartyFaceNo;
+            InsertStuTran.OtherName = stulist.OtherName;
+            InsertStuTran.OtherJob = stulist.OtherJob;
+            InsertStuTran.OtherMobile = stulist.OtherMobile;
+            InsertStuTran.OtherIdentityCardNo = stulist.OtherIdentityCardNo;
+            InsertStuTran.OtherPartyFaceNo = stulist.OtherPartyFaceNo;
+            InsertStuTran.EnrolGrade = stulist.EnrolGrade;
+            InsertStuTran.EnrolMajorNo = stulist.EnrolMajorNo;
+            InsertStuTran.EnrolClassNo = stulist.EnrolClassNo;
+            InsertStuTran.IsRegistered = stulist.IsRegistered;
+            InsertStuTran.IsAtSchool = stulist.IsAtSchool;
+            InsertStuTran.StudentStatus = stulist.StudentStatus;
+            InsertStuTran.ExpectedGraduationDate = stulist.ExpectedGraduationDate;
+            InsertStuTran.CertificateNo = stulist.CertificateNo;
+            InsertStuTran.DepartureTime = stulist.DepartureTime;
+            InsertStuTran.ClassAdviser = stulist.ClassAdviser;
+            InsertStuTran.ExamineeNumber = stulist.ExamineeNumber;
+            InsertStuTran.CollegeScore = stulist.CollegeScore;
+            InsertStuTran.GraduationHighSchoolName = stulist.GraduationHighSchoolName;
+            InsertStuTran.IsPermanentRuralArea = stulist.IsPermanentRuralArea;
+            InsertStuTran.GuardianIDNo = stulist.GuardianIDNo;
+            InsertStuTran.GuardianPoliticalStatu = stulist.GuardianPoliticalStatu;
+            InsertStuTran.GuardianWorkUnitOrHomeAddress = stulist.GuardianWorkUnitOrHomeAddress;
+            InsertStuTran.Standby1 = stulist.Standby1;
+            InsertStuTran.Standby2 = stulist.Standby2;
+            InsertStuTran.Standby3 = stulist.Standby3;
+            InsertStuTran.Standby4 = stulist.Standby4;
             //异动状态;时间;原因
             InsertStuTran.AnomalousType = upTrua.AnomalousType;
             InsertStuTran.ChangeReason = upTrua.ChangeReason;