@@ -84,7 +84,7 @@ | |||||
<input id="EMail" type="text" class="form-control" /> | <input id="EMail" type="text" class="form-control" /> | ||||
</div> | </div> | ||||
<div class="col-xs-12 lr-form-item" data-table="StuInfoBasic"> | <div class="col-xs-12 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="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | <input id="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | ||||
</div> | </div> | ||||
<div class="col-xs-12 lr-form-item" data-table="StuInfoBasic"> | <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic"> | ||||
@@ -84,7 +84,7 @@ | |||||
<input id="EMail" type="text" class="form-control" /> | <input id="EMail" type="text" class="form-control" /> | ||||
</div> | </div> | ||||
<div class="col-xs-12 lr-form-item" data-table="StuInfoBasic"> | <div class="col-xs-12 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="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | <input id="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | ||||
</div> | </div> | ||||
<div class="col-xs-12 lr-form-item" data-table="StuInfoBasic"> | <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic"> | ||||
@@ -65,7 +65,7 @@ | |||||
<li>港澳台侨 : {{studentInfo.OverseasChineseNo | overseasChineseNo}} </li> | <li>港澳台侨 : {{studentInfo.OverseasChineseNo | overseasChineseNo}} </li> | ||||
<li>健康状况 : {{studentInfo.HealthStatusNo | healthStatusNo}}</li> | <li>健康状况 : {{studentInfo.HealthStatusNo | healthStatusNo}}</li> | ||||
<li>邮政编码 : {{studentInfo.PostalCode}}</li> | <li>邮政编码 : {{studentInfo.PostalCode}}</li> | ||||
<li>通信地址 : {{studentInfo.MailAddress}}</li> | |||||
<li>家庭地址 : {{studentInfo.MailAddress}}</li> | |||||
</ul> | </ul> | ||||
</div> | </div> | ||||
@@ -364,7 +364,7 @@ | |||||
<input id="EMail" type="text" class="form-control" readonly="readonly" /> | <input id="EMail" type="text" class="form-control" readonly="readonly" /> | ||||
</div> | </div> | ||||
<div class="col-xs-12 lr-form-item" data-table="StuInfoBasic"> | <div class="col-xs-12 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="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" /> | <input id="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" /> | ||||
</div> | </div> | ||||
<div class="col-xs-12 lr-form-item" data-table="StuInfoBasic"> | <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic"> | ||||
@@ -408,7 +408,7 @@ var bootstrap = function ($, learun) { | |||||
{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, | { label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, | ||||
{ label: "入学年月", name: "EntranceDate", width: 100, align: "left" }, | { label: "入学年月", name: "EntranceDate", width: 100, align: "left" }, | ||||
{ label: "余额", name: "Balance", width: 100, align: "left" }, | { label: "余额", name: "Balance", width: 100, align: "left" }, | ||||
{ label: "通信地址", name: "MailAddress", width: 100, align: "left" }, | |||||
{ label: "家庭地址", name: "MailAddress", width: 100, align: "left" }, | |||||
{ label: "联系电话", name: "mobile", width: 100, align: "left" }, | { label: "联系电话", name: "mobile", width: 100, align: "left" }, | ||||
{ label: "户口所在地", name: "FatherUnit", width: 100, align: "left" }, | { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" }, | ||||
{ label: "档案所在地", name: "MatherUnit", width: 100, align: "left" }, | { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" }, | ||||
@@ -369,9 +369,9 @@ 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,ProvinceCode | |||||
Stuid,StuNo,StuCode,ClassNo,StuName,GenderNo,DeptNo,MajorNo,IdentityCardNo,ExamScore,ProvinceCode,AdmissionNo | |||||
) | ) | ||||
select newid(),StuNo,'G'+CardNo,ClassNo,StuName,Sex,DeptNo,MajorNo,CardNo,StuScore,ProvinceCode | |||||
select newid(),StuNo,'G'+CardNo,ClassNo,StuName,Sex,DeptNo,MajorNo,CardNo,StuScore,ProvinceCode,ExamNo | |||||
from StuVolunteer t where t.ClassStatus=1 | from StuVolunteer t where t.ClassStatus=1 | ||||
and t.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=t.StuNo) "; | and t.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=t.StuNo) "; | ||||
db.ExecuteBySql(addSql); | db.ExecuteBySql(addSql); | ||||