+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js
index 9ed573a15..7d630e802 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js
@@ -27,8 +27,8 @@ var bootstrap = function ($, learun) {
id: 'form',
title: '新增',
url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/Form',
- width: 600,
- height: 400,
+ width: 800,
+ height: 600,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
@@ -46,8 +46,8 @@ var bootstrap = function ($, learun) {
id: 'form',
title: '编辑',
url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/Form?keyValue=' + keyValue,
- width: 600,
- height: 400,
+ width: 800,
+ height: 600,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
@@ -81,6 +81,7 @@ var bootstrap = function ($, learun) {
{ label: "毕业学校", name: "BySchool", width: 150, align: "left" },
{ label: "初中学号", name: "H_SchoolNo", width: 150, align: "left" },
{ label: "报名号", name: "ApplyNo", width: 150, align: "left" },
+ { label: "省编学号", name: "ProvinceCode", width: 150, align: "left" },
{ label: "学生姓名", name: "StuName", width: 100, align: "left" },
{
label: "性别", name: "Sex", width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs
index 88606a2b6..8ecf1a84b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs
@@ -708,6 +708,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
[Column("TWOPOSITION")]
public string TwoPosition { get; set; }
+ ///
+ /// 省编学号
+ ///
+ [Column("PROVINCECODE")]
+
+ public string ProvinceCode { get; set; }
#endregion
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs
index d6aef3475..8ea525103 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs
@@ -251,6 +251,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("LINKPHONE")]
public string LinkPhone { get; set; }
+ ///
+ /// 省编学号
+ ///
+ [Column("PROVINCECODE")]
+ public string ProvinceCode { get; set; }
#endregion
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs
index 5eae36568..5d9689f7b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs
@@ -324,11 +324,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
db.ExecuteBySql(updSql);
string addSql = @"insert into StuInfoBasic (
-Stuid,StuNo,StuCode,ClassNo,StuName,GenderNo,DeptNo,MajorNo,IdentityCardNo,ExamScore
-)
-select newid(),StuNo,'G'+CardNo,ClassNo,StuName,Sex,DeptNo,MajorNo,CardNo,StuScore
-from StuVolunteer t where t.ClassStatus=1
-and t.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=t.StuNo) ";
+ Stuid,StuNo,StuCode,ClassNo,StuName,GenderNo,DeptNo,MajorNo,IdentityCardNo,ExamScore,ProvinceCode
+ )
+ select newid(),StuNo,'G'+CardNo,ClassNo,StuName,Sex,DeptNo,MajorNo,CardNo,StuScore,ProvinceCode
+ from StuVolunteer t where t.ClassStatus=1
+ and t.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=t.StuNo) ";
db.ExecuteBySql(addSql);
db.Commit();