@@ -23,6 +23,10 @@ | |||||
<div class="lr-form-item-title">通知书号<font face="宋体">*</font></div> | <div class="lr-form-item-title">通知书号<font face="宋体">*</font></div> | ||||
<input id="NoticeNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | <input id="NoticeNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | ||||
</div> | </div> | ||||
<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic"> | |||||
<div class="lr-form-item-title">省编学号</div> | |||||
<input id="ProvinceCode" type="text" /> | |||||
</div> | |||||
<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic"> | <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic"> | ||||
<div class="lr-form-item-title">身份证号<font face="宋体">*</font></div> | <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div> | ||||
<input id="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | <input id="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | ||||
@@ -225,6 +225,7 @@ var bootstrap = function ($, learun) { | |||||
headData: [ | headData: [ | ||||
{ label: "学号", name: "StuNo", width: 100, align: "left" }, | { label: "学号", name: "StuNo", width: 100, align: "left" }, | ||||
{ label: "学籍号", name: "StuCode", width: 100, align: "left" }, | { label: "学籍号", name: "StuCode", width: 100, align: "left" }, | ||||
{ label: "省编学号", name: "ProvinceCode", width: 100, align: "left" }, | |||||
{ label: "姓名", name: "StuName", width: 100, align: "left" }, | { label: "姓名", name: "StuName", width: 100, align: "left" }, | ||||
{ | { | ||||
label: "性别", name: "GenderNo", width: 80, align: "left", | label: "性别", name: "GenderNo", width: 80, align: "left", | ||||
@@ -19,15 +19,19 @@ | |||||
<div class="lr-form-item-title">报名号<font face="宋体">*</font></div> | <div class="lr-form-item-title">报名号<font face="宋体">*</font></div> | ||||
<input id="ApplyNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | <input id="ApplyNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | ||||
</div> | </div> | ||||
<div class="col-xs-4 lr-form-item" data-table="StuVolunteer"> | |||||
<div class="col-xs-6 lr-form-item" data-table="StuVolunteer"> | |||||
<div class="lr-form-item-title">省编学号</div> | |||||
<input id="ProvinceCode" type="text" class="form-control" /> | |||||
</div> | |||||
<div class="col-xs-6 lr-form-item" data-table="StuVolunteer"> | |||||
<div class="lr-form-item-title">学生姓名<font face="宋体">*</font></div> | <div class="lr-form-item-title">学生姓名<font face="宋体">*</font></div> | ||||
<input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="Chinese" /> | <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="Chinese" /> | ||||
</div> | </div> | ||||
<div class="col-xs-4 lr-form-item" data-table="StuVolunteer"> | |||||
<div class="col-xs-6 lr-form-item" data-table="StuVolunteer"> | |||||
<div class="lr-form-item-title">性别<font face="宋体">*</font></div> | <div class="lr-form-item-title">性别<font face="宋体">*</font></div> | ||||
<div id="Sex" isvalid="yes" checkexpession="NotNull"></div> | <div id="Sex" isvalid="yes" checkexpession="NotNull"></div> | ||||
</div> | </div> | ||||
<div class="col-xs-4 lr-form-item" data-table="StuVolunteer"> | |||||
<div class="col-xs-6 lr-form-item" data-table="StuVolunteer"> | |||||
<div class="lr-form-item-title">中考总分<font face="宋体">*</font></div> | <div class="lr-form-item-title">中考总分<font face="宋体">*</font></div> | ||||
<input id="StuScore" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" /> | <input id="StuScore" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" /> | ||||
</div> | </div> | ||||
@@ -27,8 +27,8 @@ var bootstrap = function ($, learun) { | |||||
id: 'form', | id: 'form', | ||||
title: '新增', | title: '新增', | ||||
url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/Form', | url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/Form', | ||||
width: 600, | |||||
height: 400, | |||||
width: 800, | |||||
height: 600, | |||||
callBack: function (id) { | callBack: function (id) { | ||||
return top[id].acceptClick(refreshGirdData); | return top[id].acceptClick(refreshGirdData); | ||||
} | } | ||||
@@ -46,8 +46,8 @@ var bootstrap = function ($, learun) { | |||||
id: 'form', | id: 'form', | ||||
title: '编辑', | title: '编辑', | ||||
url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/Form?keyValue=' + keyValue, | url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/Form?keyValue=' + keyValue, | ||||
width: 600, | |||||
height: 400, | |||||
width: 800, | |||||
height: 600, | |||||
callBack: function (id) { | callBack: function (id) { | ||||
return top[id].acceptClick(refreshGirdData); | return top[id].acceptClick(refreshGirdData); | ||||
} | } | ||||
@@ -81,6 +81,7 @@ var bootstrap = function ($, learun) { | |||||
{ label: "毕业学校", name: "BySchool", width: 150, align: "left" }, | { label: "毕业学校", name: "BySchool", width: 150, align: "left" }, | ||||
{ label: "初中学号", name: "H_SchoolNo", width: 150, align: "left" }, | { label: "初中学号", name: "H_SchoolNo", width: 150, align: "left" }, | ||||
{ label: "报名号", name: "ApplyNo", 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: "StuName", width: 100, align: "left" }, | ||||
{ | { | ||||
label: "性别", name: "Sex", width: 100, align: "left", | label: "性别", name: "Sex", width: 100, align: "left", | ||||
@@ -708,6 +708,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
/// </summary> | /// </summary> | ||||
[Column("TWOPOSITION")] | [Column("TWOPOSITION")] | ||||
public string TwoPosition { get; set; } | public string TwoPosition { get; set; } | ||||
/// <summary> | |||||
/// 省编学号 | |||||
/// </summary> | |||||
[Column("PROVINCECODE")] | |||||
public string ProvinceCode { get; set; } | |||||
#endregion | #endregion | ||||
@@ -251,6 +251,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
[Column("LINKPHONE")] | [Column("LINKPHONE")] | ||||
public string LinkPhone { get; set; } | public string LinkPhone { get; set; } | ||||
/// <summary> | |||||
/// 省编学号 | |||||
/// </summary> | |||||
[Column("PROVINCECODE")] | |||||
public string ProvinceCode { get; set; } | |||||
#endregion | #endregion | ||||
@@ -324,11 +324,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
db.ExecuteBySql(updSql); | db.ExecuteBySql(updSql); | ||||
string addSql = @"insert into StuInfoBasic ( | 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.ExecuteBySql(addSql); | ||||
db.Commit(); | db.Commit(); | ||||