From 142d83adde8f5cbdbd383a5e027d9278f60e2cef Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Mon, 6 Jan 2025 14:43:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=AD=A6?=
=?UTF-8?q?=E7=B1=8D=E5=BC=82=E5=8A=A8=E4=BC=98=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Views/StuTransferInfo/CheckIndex.js | 10 +-
.../StuInfoBasicTranEntity.cs | 259 ++++++++++++++++++
.../StuTransferInfo/StuTransferInfoService.cs | 102 +++++++
3 files changed, 366 insertions(+), 5 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js
index 940696d0c..f6b0f367d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js
+++ b/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: '查看',
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranEntity.cs
index 3a19c9316..0a90cc920 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranEntity.cs
+++ b/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
///
[Column("DIPLOMARECEIVEREMARK")]
public string DiplomaReceiveRemark { get; set; }
+
+
+ ///
+ /// 毕业学校
+ ///
+ [Column("GRADUATESCHOOL")]
+ public string GraduateSchool { get; set; }
+
+ ///
+ /// 成员3名称
+ ///
+ [Column("THREENAME")]
+ public string ThreeName { get; set; }
+ ///
+ /// 成员3工作单位（或者具体家庭住址）
+ ///
+ [Column("THREEJOB")]
+ public string ThreeJob { get; set; }
+ ///
+ /// 成员3电话
+ ///
+ [Column("THREEMOBILE")]
+ public string ThreeMobile { get; set; }
+ ///
+ /// 成员3电话
+ ///
+ [Column("THREEIDENTITYCARDNO")]
+ public string ThreeIdentityCardNo { get; set; }
+ ///
+ /// 成员3政治面貌
+ ///
+ [Column("THREEPARTYFACENO")]
+ public string ThreePartyFaceNo { get; set; }
+ ///
+ /// 成员4名称
+ ///
+ [Column("FOURNAME")]
+ public string FourName { get; set; }
+ ///
+ /// 成员4工作单位（或者具体家庭住址）
+ ///
+ [Column("FOURJOB")]
+ public string FourJob { get; set; }
+ ///
+ /// 成员4电话
+ ///
+ [Column("FOURMOBILE")]
+ public string FourMobile { get; set; }
+ ///
+ /// 成员4电话
+ ///
+ [Column("FOURIDENTITYCARDNO")]
+ public string FourIdentityCardNo { get; set; }
+ ///
+ /// 成员4政治面貌
+ ///
+ [Column("FOURPARTYFACENO")]
+ public string FourPartyFaceNo { get; set; }
+ ///
+ /// 成员5名称
+ ///
+ [Column("FIVENAME")]
+ public string FiveName { get; set; }
+ ///
+ /// 成员5工作单位（或者具体家庭住址）
+ ///
+ [Column("FIVEJOB")]
+ public string FiveJob { get; set; }
+ ///
+ /// 成员5电话
+ ///
+ [Column("FIVEMOBILE")]
+ public string FiveMobile { get; set; }
+ ///
+ /// 成员5电话
+ ///
+ [Column("FIVEIDENTITYCARDNO")]
+ public string FiveIdentityCardNo { get; set; }
+ ///
+ /// 成员5政治面貌
+ ///
+ [Column("FIVEPARTYFACENO")]
+ public string FivePartyFaceNo { get; set; }
+ ///
+ /// 成员6名称
+ ///
+ [Column("SIXNAME")]
+ public string SixName { get; set; }
+ ///
+ /// 成员6工作单位（或者具体家庭住址）
+ ///
+ [Column("SIXJOB")]
+ public string SixJob { get; set; }
+ ///
+ /// 成员6电话
+ ///
+ [Column("SIXMOBILE")]
+ public string SixMobile { get; set; }
+ ///
+ /// 成员6电话
+ ///
+ [Column("SIXIDENTITYCARDNO")]
+ public string SixIdentityCardNo { get; set; }
+ ///
+ /// 成员6政治面貌
+ ///
+ [Column("SIXPARTYFACENO")]
+ public string SixPartyFaceNo { get; set; }
+ ///
+ /// 成员6名称
+ ///
+ [Column("OTHERNAME")]
+ public string OtherName { get; set; }
+ ///
+ /// 成员6工作单位（或者具体家庭住址）
+ ///
+ [Column("OTHERJOB")]
+ public string OtherJob { get; set; }
+ ///
+ /// 成员6电话
+ ///
+ [Column("OTHERMOBILE")]
+ public string OtherMobile { get; set; }
+ ///
+ /// 成员6电话
+ ///
+ [Column("OTHERIDENTITYCARDNO")]
+ public string OtherIdentityCardNo { get; set; }
+ ///
+ /// 成员6政治面貌
+ ///
+ [Column("OTHERPARTYFACENO")]
+ public string OtherPartyFaceNo { get; set; }
+ ///
+ /// 是建档立卡户
+ ///
+ [Column("ISFILING")]
+ public bool? IsFiling { get; set; }
+ ///
+ /// 低保
+ ///
+ [Column("ISSA")]
+ public bool? IsSA { get; set; }
+ ///
+ /// 烈士子女
+ ///
+ [Column("ISMARTYRSCHILD")]
+ public bool? IsMartyrsChild { get; set; }
+ ///
+ /// 孤儿
+ ///
+ [Column("ISORPHAN")]
+ public bool? IsOrphan { get; set; }
+ ///
+ /// 入学年级
+ ///
+ [Column("ENROLGRADE")]
+ public string EnrolGrade { get; set; }
+ ///
+ /// 入学专业
+ ///
+ [Column("ENROLMAJORNO")]
+ public string EnrolMajorNo { get; set; }
+ ///
+ /// 入学班级
+ ///
+ [Column("ENROLCLASSNO")]
+ public string EnrolClassNo { get; set; }
+ ///
+ /// 是否在籍
+ ///
+ [Column("ISREGISTERED")]
+ public string IsRegistered { get; set; }
+ ///
+ /// 是否在校
+ ///
+ [Column("ISATSCHOOL")]
+ public string IsAtSchool { get; set; }
+ ///
+ /// 学籍状态
+ ///
+ [Column("STUDENTSTATUS")]
+ public string StudentStatus { get; set; }
+ ///
+ /// 预计毕业日期
+ ///
+ [Column("EXPECTEDGRADUATIONDATE")]
+ public DateTime? ExpectedGraduationDate { get; set; }
+ ///
+ /// 毕业证书编号
+ ///
+ [Column("CERTIFICATENO")]
+ public string CertificateNo { get; set; }
+ ///
+ /// 离校时间
+ ///
+ [Column("DEPARTURETIME")]
+ public DateTime? DepartureTime { get; set; }
+ ///
+ /// 班主任姓名
+ ///
+ [Column("CLASSADVISER")]
+ public string ClassAdviser { get; set; }
+ ///
+ /// 考生号
+ ///
+ [Column("EXAMINEENUMBER")]
+ public string ExamineeNumber { get; set; }
+ ///
+ /// 高考成绩
+ ///
+ [Column("COLLEGESCORE")]
+ public string CollegeScore { get; set; }
+ ///
+ /// 毕业中学名称
+ ///
+ [Column("GRADUATIONHIGHSCHOOLNAME")]
+ public string GraduationHighSchoolName { get; set; }
+ ///
+ /// 是否常住户口在农村
+ ///
+ [Column("ISPERMANENTRURALAREA")]
+ public bool? IsPermanentRuralArea { get; set; }
+ ///
+ /// 监护人身份证号码
+ ///
+ [Column("GUARDIANIDNO")]
+ public string GuardianIDNo { get; set; }
+ ///
+ /// 监护人政治面貌
+ ///
+ [Column("GUARDIANPOLITICALSTATU")]
+ public string GuardianPoliticalStatu { get; set; }
+ ///
+ /// 监护人工作单位或者具体家庭住址
+ ///
+ [Column("GUARDIANWORKUNITORHOMEADDRESS")]
+ public string GuardianWorkUnitOrHomeAddress { get; set; }
+ ///
+ /// 备用1
+ ///
+ [Column("STANDBY1")]
+ public string Standby1 { get; set; }
+ ///
+ /// 备用2
+ ///
+ [Column("STANDBY2")]
+ public string Standby2 { get; set; }
+ ///
+ /// 备用3
+ ///
+ [Column("STANDBY3")]
+ public string Standby3 { get; set; }
+ ///
+ /// 备用4
+ ///
+ [Column("STANDBY4")]
+ public string Standby4 { get; set; }
+
///
/// 异动类型
///
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs
index 3b0b8efb7..c38d18841 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs
+++ b/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;