@@ -103,6 +103,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
{ | { | ||||
return View(); | return View(); | ||||
} | } | ||||
[HttpGet] | |||||
public ActionResult ReinstateIndex() | |||||
{ | |||||
return View(); | |||||
} | |||||
/// <summary> | /// <summary> | ||||
/// 综合查询-基本信息 | /// 综合查询-基本信息 | ||||
/// </summary> | /// </summary> | ||||
@@ -241,7 +246,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
StuTransferInfoEntity entity = strEntity.ToObject<StuTransferInfoEntity>(); | StuTransferInfoEntity entity = strEntity.ToObject<StuTransferInfoEntity>(); | ||||
entity.AnomalousType = "04"; | entity.AnomalousType = "04"; | ||||
entity.ChangeReason = "转入"; | entity.ChangeReason = "转入"; | ||||
entity.StuId= Guid.NewGuid().ToString(); | |||||
entity.StuId = Guid.NewGuid().ToString(); | |||||
stuTransferInfoIBLL.SaveEntity(keyValue, entity); | stuTransferInfoIBLL.SaveEntity(keyValue, entity); | ||||
return Success("保存成功!"); | return Success("保存成功!"); | ||||
} | } | ||||
@@ -2,87 +2,144 @@ | |||||
ViewBag.Title = "学籍异动列表"; | ViewBag.Title = "学籍异动列表"; | ||||
Layout = "~/Views/Shared/_Index.cshtml"; | Layout = "~/Views/Shared/_Index.cshtml"; | ||||
} | } | ||||
<div class="lr-layout "> | |||||
<div class="lr-layout-center"> | |||||
<div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}"> | |||||
<div class="lr-layout-tool"> | |||||
<div class="lr-layout-tool-left"> | |||||
<div class="lr-layout-tool-item"> | |||||
<div id="multiple_condition_query"> | |||||
<div class="lr-query-formcontent"> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">系部</div> | |||||
<div id="DeptNo"></div> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">专业</div> | |||||
<div id="MajorNo"></div> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">年级</div> | |||||
<div id="Grade"></div> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">班级</div> | |||||
<div id="ClassNo"></div> | |||||
</div> | |||||
<div class="col-xs-6 lr-form-item"> | |||||
<div class="lr-form-item-title">姓名</div> | |||||
<input id="StuName" type="text" class="form-control" /> | |||||
</div> | |||||
<div class="col-xs-6 lr-form-item"> | |||||
<div class="lr-form-item-title">身份证号</div> | |||||
<input id="IdentityCardNo" type="text" class="form-control" /> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">学号</div> | |||||
<input id="StuNo" type="text" class="form-control" /> | |||||
<style> | |||||
.navtabwrap { | |||||
} | |||||
.navul { | |||||
display: flex; | |||||
align-items: flex-end; | |||||
border-bottom: 1px solid #ddd; | |||||
height: 38px; | |||||
} | |||||
.navul li { | |||||
width: 80px; | |||||
height: 28px; | |||||
margin-left: 15px; | |||||
line-height: 28px; | |||||
text-align: center; | |||||
border-radius: 4px 4px 0 0; | |||||
cursor: pointer; | |||||
margin-bottom: -1px; | |||||
} | |||||
.navul li:hover { | |||||
background: #eee; | |||||
} | |||||
.active { | |||||
color: #555; | |||||
cursor: default; | |||||
background-color: #fff; | |||||
border: 1px solid #ddd; | |||||
border-bottom-color: transparent; | |||||
} | |||||
.condiv { | |||||
display: none; | |||||
height: 100%; | |||||
} | |||||
.divactive { | |||||
display: block; | |||||
} | |||||
.contabwrap { | |||||
height: calc(100% - 50px); | |||||
} | |||||
</style> | |||||
<div class="navtabwrap" id="navultab"> | |||||
<ul class="navul"> | |||||
<li class="active">退学</li> | |||||
<li>恢复学籍</li> | |||||
</ul> | |||||
</div> | |||||
<div class="contabwrap" id="condivtab"> | |||||
<div class="condiv divactive" id="tab1"> | |||||
<div class="lr-layout "> | |||||
<div class="lr-layout-center"> | |||||
<div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}"> | |||||
<div class="lr-layout-tool"> | |||||
<div class="lr-layout-tool-left"> | |||||
<div class="lr-layout-tool-item"> | |||||
<div id="multiple_condition_query"> | |||||
<div class="lr-query-formcontent"> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">系部</div> | |||||
<div id="DeptNo"></div> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">专业</div> | |||||
<div id="MajorNo"></div> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">年级</div> | |||||
<div id="Grade"></div> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">班级</div> | |||||
<div id="ClassNo"></div> | |||||
</div> | |||||
<div class="col-xs-6 lr-form-item"> | |||||
<div class="lr-form-item-title">姓名</div> | |||||
<input id="StuName" type="text" class="form-control" /> | |||||
</div> | |||||
<div class="col-xs-6 lr-form-item"> | |||||
<div class="lr-form-item-title">身份证号</div> | |||||
<input id="IdentityCardNo" type="text" class="form-control" /> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">学号</div> | |||||
<input id="StuNo" type="text" class="form-control" /> | |||||
</div> | |||||
</div> | |||||
</div> | </div> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
</div> | |||||
@*<div class="lr-layout-tool-item"> | |||||
<div class="lr-query-btn" style="padding:0 10px;" id="listitem"> | |||||
点击 | |||||
<div class="lr-layout-tool-right"> | |||||
<div class=" btn-group btn-group-sm"> | |||||
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a> | |||||
</div> | </div> | ||||
</div>*@ | |||||
</div> | |||||
<div class="lr-layout-tool-right"> | |||||
<div class=" btn-group btn-group-sm"> | |||||
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a> | |||||
</div> | |||||
</div> | </div> | ||||
</div> | |||||
</div> | |||||
<div class="lr-layout-body" style="height:50%;border-bottom:1px solid #ccc;" id="gridtable"></div> | |||||
<div class="lr-layout-body" style="height:50%;border-bottom:1px solid #ccc;" id="gridtable"></div> | |||||
<div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div> | |||||
<div class="lr-form-wrap" style="height:30%;" id="form"> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">异动类型<font face="宋体">*</font></div> | |||||
<div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div> | |||||
</div> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">注销账号<font face="宋体">*</font></div> | |||||
<div id="F_WriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div> | |||||
</div> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div> | |||||
<div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div> | |||||
</div> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">离班日期<font face="宋体">*</font></div> | |||||
<input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" /> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">异动原因</div> | |||||
<textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea> | |||||
<div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div> | |||||
<div class="lr-form-wrap" style="height:30%;" id="form"> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">异动类型<font face="宋体">*</font></div> | |||||
<div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div> | |||||
</div> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">注销账号<font face="宋体">*</font></div> | |||||
<div id="F_WriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div> | |||||
</div> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div> | |||||
<div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div> | |||||
</div> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">离班日期<font face="宋体">*</font></div> | |||||
<input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" /> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">异动原因</div> | |||||
<textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea> | |||||
</div> | |||||
</div> | |||||
<div id="subbtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;"> | |||||
提交 | |||||
</div> | |||||
</div> | </div> | ||||
</div> | </div> | ||||
<div id="subbtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;"> | |||||
提交 | |||||
</div> | |||||
</div> | </div> | ||||
</div> | </div> | ||||
<div class="condiv" id="tab2"> | |||||
<iframe id="EducationExperienceReturn" width="100%" scrolling="no" height="100%" frameborder="0"></iframe> | |||||
</div> | |||||
</div> | </div> | ||||
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js") | @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js") |
@@ -10,6 +10,52 @@ var bootstrap = function ($, learun) { | |||||
page.bind(); | page.bind(); | ||||
}, | }, | ||||
bind: function () { | bind: function () { | ||||
$('#navultab li').on('click', function () { | |||||
if (!$(this).hasClass('active')) { | |||||
$(this).parent().find('.active').removeClass('active'); | |||||
$(this).addClass('active'); | |||||
$('#condivtab .condiv').eq($(this).index()).siblings().hide() | |||||
$('#condivtab .condiv').eq($(this).index()).show() | |||||
} | |||||
}) | |||||
$('#SubmitBtn').on('click', function () { | |||||
if (!$('body').lrValidform()) { | |||||
return false; | |||||
} | |||||
var entity = $('body').lrGetFormData(); | |||||
let starttime = new Date(entity.SuspensionBeginTime).getTime(); | |||||
let endtime = new Date(entity.SuspensionEndTime).getTime(); | |||||
if (endtime < starttime) { | |||||
learun.alert.warning("起始日期不能大于终止日期!"); | |||||
return false; | |||||
} | |||||
if (parseInt(Math.abs(endtime - starttime) / 1000 / 60 / 60 / 24) < 183) { | |||||
learun.alert.warning("起始时间与终止时间不能小于半年!"); | |||||
return false; | |||||
} | |||||
var selgridtab = $('#selgridtab').jfGridGet('rowdatas'); | |||||
$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) }, | |||||
function (res) { | |||||
//console.log(res) | |||||
if (res.code == 200) { | |||||
setTimeout(function () { | |||||
location.reload(); | |||||
}, 100) | |||||
} | |||||
// 保存成功后才回调 | |||||
//if (!!callBack) { | |||||
// callBack(res); | |||||
//} | |||||
} | |||||
); | |||||
}) | |||||
$("#EducationExperienceReturn").attr("src", "/EducationalAdministration/StuTransferInfo/ReinstateIndex"); | |||||
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) { | $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { | ||||
page.search(queryJson); | page.search(queryJson); | ||||
}, 280, 400); | }, 280, 400); | ||||
@@ -59,9 +59,9 @@ | |||||
</div> | </div> | ||||
<div class="lr-layout-tool-item"> | <div class="lr-layout-tool-item"> | ||||
<div id="changeDrop" class="lr-query-wrap" style="width:80px;"> | |||||
<div id="changeDrop" class="lr-query-wrap" style="width:140px;"> | |||||
<div class="lr-query-btn"> | <div class="lr-query-btn"> | ||||
添加退学异动 | |||||
添加退学异动/恢复学籍 | |||||
</div> | </div> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -0,0 +1,101 @@ | |||||
@{ | |||||
ViewBag.Title = "学籍异动列表"; | |||||
Layout = "~/Views/Shared/_Index.cshtml"; | |||||
} | |||||
<div class="lr-layout "> | |||||
<div class="lr-layout-center"> | |||||
<div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}"> | |||||
<div class="lr-layout-tool"> | |||||
<div class="lr-layout-tool-left"> | |||||
<div class="lr-layout-tool-item"> | |||||
<div id="multiple_condition_query"> | |||||
<div class="lr-query-formcontent"> | |||||
<div class="col-xs-6 lr-form-item"> | |||||
<div class="lr-form-item-title">姓名</div> | |||||
<input id="StuName" type="text" class="form-control" /> | |||||
</div> | |||||
<div class="col-xs-6 lr-form-item"> | |||||
<div class="lr-form-item-title">学籍状态</div> | |||||
<div id="AnomalousType"></div> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">原系部</div> | |||||
<div id="DeptNo"></div> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">原专业</div> | |||||
<div id="MajorNo"></div> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">原年级</div> | |||||
<div id="Grade"></div> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">原班级</div> | |||||
<div id="ClassNo"></div> | |||||
</div> | |||||
</div> | |||||
</div> | |||||
</div> | |||||
@*<div class="lr-layout-tool-item"> | |||||
<div class="lr-query-btn" style="padding:0 10px;" id="listitem"> | |||||
点击 | |||||
</div> | |||||
</div>*@ | |||||
</div> | |||||
<div class="lr-layout-tool-right"> | |||||
<div class=" btn-group btn-group-sm"> | |||||
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a> | |||||
</div> | |||||
</div> | |||||
</div> | |||||
<div class="lr-layout-body" style="height:50%;border-bottom:1px solid #ccc;" id="gridtable"></div> | |||||
<div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom:1px solid #ccc;margin-top:50px;" id="selgridtab"></div> | |||||
<div class="lr-form-wrap" style="height:40%;" id="form"> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">异动类型<font face="宋体">*</font></div> | |||||
<div id="NewAnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div> | |||||
</div> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">恢复学籍<font face="宋体">*</font></div> | |||||
<div id="RecoverStuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div> | |||||
</div> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">恢复账号<font face="宋体">*</font></div> | |||||
<div id="RecoverWriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div> | |||||
</div> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">入班日期<font face="宋体">*</font></div> | |||||
<input id="LeaveDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#LeaveDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" /> | |||||
</div> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">系部<font face="宋体">*</font></div> | |||||
<div id="NewDeptNo" isvalid="yes" checkexpession="NotNull"></div> | |||||
</div> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">专业<font face="宋体">*</font></div> | |||||
<div id="NewMajorNo" isvalid="yes" checkexpession="NotNull"></div> | |||||
</div> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">年级<font face="宋体">*</font></div> | |||||
<div id="NewGrade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div> | |||||
</div> | |||||
<div class="col-xs-3 lr-form-item"> | |||||
<div class="lr-form-item-title">班级<font face="宋体">*</font></div> | |||||
<div id="NewClassNo" isvalid="yes" checkexpession="NotNull"></div> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">异动原因</div> | |||||
<textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea> | |||||
</div> | |||||
</div> | |||||
<div id="SubmitBtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;"> | |||||
提交 | |||||
</div> | |||||
</div> | |||||
</div> | |||||
</div> | |||||
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/ReinstateIndex.js") |
@@ -0,0 +1,518 @@ | |||||
var refreshGirdData; | |||||
var StuId; | |||||
var tempdatra = new Array(); | |||||
var list = []; | |||||
var bootstrap = function ($, learun) { | |||||
"use strict"; | |||||
var page = { | |||||
init: function () { | |||||
page.initGird(); | |||||
page.bind(); | |||||
}, | |||||
bind: function () { | |||||
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) { | |||||
page.search(queryJson); | |||||
}, 280, 400); | |||||
$('#SubmitBtn').on('click', function () { | |||||
if (!$('body').lrValidform()) { | |||||
return false; | |||||
} | |||||
var entity = $('body').lrGetFormData(); | |||||
entity.AnomalousType = entity.NewAnomalousType; | |||||
var selgridtab = $('#selgridtab').jfGridGet('rowdatas'); | |||||
$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveAgainEntity', { entity: entity, strStuTranEntity: JSON.stringify(selgridtab) }, | |||||
function (res) { | |||||
//console.log(res) | |||||
if (res.code == 200) { | |||||
setTimeout(function () { | |||||
location.reload(); | |||||
}, 100) | |||||
} | |||||
// 保存成功后才回调 | |||||
//if (!!callBack) { | |||||
// callBack(res); | |||||
//} | |||||
} | |||||
); | |||||
}) | |||||
$('#DeptNo').lrselect({ | |||||
allowSearch: true, | |||||
value: "deptno", | |||||
text: "deptname", | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', | |||||
select: function (item) { | |||||
if (item) { | |||||
$('#MajorNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', | |||||
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" } | |||||
}); | |||||
} else { | |||||
$('#MajorNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', | |||||
param: { strWhere: "1=1 AND CheckMark=1" } | |||||
}); | |||||
} | |||||
} | |||||
}); | |||||
$('#MajorNo').lrselect({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', | |||||
value: "majorno", | |||||
text: "majorname", | |||||
param: { strWhere: "1=1 AND CheckMark=1" }, | |||||
select: function (item) { | |||||
var Grades = $("#Grade").lrselectGet(); | |||||
if (Grades != null && Grades != "" && Grades != "undefined") { | |||||
if (item) { | |||||
$('#ClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } | |||||
}); | |||||
} else { | |||||
$('#ClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } | |||||
}); | |||||
} | |||||
} else { | |||||
if (item) { | |||||
$('#ClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" } | |||||
}); | |||||
} else { | |||||
$('#ClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } | |||||
}); | |||||
} | |||||
} | |||||
} | |||||
}); | |||||
$('#Grade').lrselect({ | |||||
url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', | |||||
value: "value", | |||||
text: "text", | |||||
select: function (item) { | |||||
var MajorNos = $("#MajorNo").lrselectGet(); | |||||
if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") { | |||||
if (item) { | |||||
$('#ClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { | |||||
strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc" | |||||
} | |||||
}); | |||||
} else { | |||||
$('#ClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } | |||||
}); | |||||
} | |||||
} else { | |||||
if (item) { | |||||
$('#ClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { | |||||
strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc" | |||||
} | |||||
}); | |||||
} else { | |||||
$('#ClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } | |||||
}); | |||||
} | |||||
} | |||||
} | |||||
}); | |||||
$('#ClassNo').lrselect({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, | |||||
value: "classno", | |||||
text: "classname" | |||||
}); | |||||
//提交下拉框 | |||||
$('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); | |||||
$('#NewDeptNo').lrselect({ | |||||
allowSearch: true, | |||||
value: "deptno", | |||||
text: "deptname", | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', | |||||
select: function (item) { | |||||
if (item) { | |||||
$('#NewMajorNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', | |||||
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" } | |||||
}); | |||||
} else { | |||||
$('#NewMajorNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', | |||||
param: { strWhere: "1=1 AND CheckMark=1" } | |||||
}); | |||||
} | |||||
} | |||||
}); | |||||
$('#NewMajorNo').lrselect({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', | |||||
value: "majorno", | |||||
text: "majorname", | |||||
param: { strWhere: "1=1 AND CheckMark=1" }, | |||||
select: function (item) { | |||||
var Grades = $("#NewGrade").lrselectGet(); | |||||
if (Grades != null && Grades != "" && Grades != "undefined") { | |||||
if (item) { | |||||
$('#NewClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } | |||||
}); | |||||
} else { | |||||
$('#NewClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } | |||||
}); | |||||
} | |||||
} else { | |||||
if (item) { | |||||
$('#NewClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" } | |||||
}); | |||||
} else { | |||||
$('#NewClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } | |||||
}); | |||||
} | |||||
} | |||||
} | |||||
}); | |||||
$('#NewGrade').lrselect({ | |||||
url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', | |||||
value: "value", | |||||
text: "text", | |||||
select: function (item) { | |||||
var MajorNos = $("#NewMajorNo").lrselectGet(); | |||||
if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") { | |||||
if (item) { | |||||
$('#NewClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { | |||||
strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc" | |||||
} | |||||
}); | |||||
} else { | |||||
$('#NewClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } | |||||
}); | |||||
} | |||||
} else { | |||||
if (item) { | |||||
$('#NewClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { | |||||
strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc" | |||||
} | |||||
}); | |||||
} else { | |||||
$('#NewClassNo').lrselectRefresh({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } | |||||
}); | |||||
} | |||||
} | |||||
} | |||||
}); | |||||
$('#NewClassNo').lrselect({ | |||||
allowSearch: true, | |||||
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', | |||||
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, | |||||
value: "classno", | |||||
text: "classname" | |||||
}); | |||||
$('#RecoverWriteMark').lrDataItemSelect({ code: 'YesOrNoInt' }); | |||||
$('#RecoverStuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); | |||||
$('#NewAnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); | |||||
$('#NewAnomalousType').lrselectSet("16"); | |||||
// 刷新 | |||||
$('#lr_refresh').on('click', function () { | |||||
location.reload(); | |||||
}); | |||||
//查看 | |||||
$('#lr_view').on('click', function () { | |||||
var keyValue = $('#gridtable').jfGridValue('StuId'); | |||||
if (learun.checkrow(keyValue)) { | |||||
if (keyValue.indexOf(',') != -1) { | |||||
learun.alert.warning("只能选择一条记录进行查看!"); | |||||
return; | |||||
} | |||||
learun.layerForm({ | |||||
id: 'form', | |||||
title: '查看', | |||||
url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/FormView?keyValue=' + keyValue, | |||||
width: 1162, | |||||
height: 600, | |||||
btn: null | |||||
}); | |||||
} | |||||
}); | |||||
$('#selgridtab').jfGrid({ | |||||
headData: [ | |||||
{ label: "学号", name: "StuNo", width: 100, align: "left" }, | |||||
{ label: "姓名", name: "StuName", width: 100, align: "left" }, | |||||
{ | |||||
label: "性别", name: "GenderNo", width: 80, align: "left", | |||||
formatter: function (cellvalue) { | |||||
return cellvalue == true ? "男" : "女"; | |||||
} | |||||
}, | |||||
{ | |||||
label: "出生日期", name: "Birthday", width: 100, align: "left", ishide: true, | |||||
formatter: function (value) { | |||||
return learun.formatDate(value, 'yyyy-MM-dd'); | |||||
} | |||||
}, | |||||
{ label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" }, | |||||
{ | |||||
label: "民族", name: "NationalityNo", width: 100, align: "left", | |||||
formatterAsync: function (callback, value, row, op, $cell) { | |||||
learun.clientdata.getAsync('dataItem', { | |||||
key: value, | |||||
code: 'National', | |||||
callback: function (_data) { | |||||
callback(_data.text); | |||||
} | |||||
}); | |||||
} | |||||
}, | |||||
{ label: "年级", name: "Grade", width: 100, align: "left" }, | |||||
{ | |||||
label: "系所", name: "DeptNo", width: 100, align: "left", | |||||
formatterAsync: function (callback, value, row, op, $cell) { | |||||
learun.clientdata.getAsync('custmerData', { | |||||
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', | |||||
key: value, | |||||
keyId: 'deptno', | |||||
callback: function (_data) { | |||||
callback(_data['deptname']); | |||||
} | |||||
}); | |||||
} | |||||
}, | |||||
{ | |||||
label: "专业", name: "MajorNo", width: 100, align: "left", | |||||
formatterAsync: function (callback, value, row, op, $cell) { | |||||
learun.clientdata.getAsync('custmerData', { | |||||
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', | |||||
key: value, | |||||
keyId: 'majorno', | |||||
callback: function (_data) { | |||||
callback(_data['majorname']); | |||||
} | |||||
}); | |||||
} | |||||
}, | |||||
{ | |||||
label: "班级", name: "ClassNo", width: 100, align: "left", | |||||
formatterAsync: function (callback, value, row, op, $cell) { | |||||
learun.clientdata.getAsync('custmerData', { | |||||
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', | |||||
key: value, | |||||
keyId: 'classno', | |||||
callback: function (_data) { | |||||
callback(_data['classname']); | |||||
} | |||||
}); | |||||
} | |||||
}, | |||||
{ | |||||
label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { | |||||
learun.clientdata.getAsync('dataItem', { | |||||
key: value, | |||||
code: 'EduSystem', | |||||
callback: function (_data) { | |||||
callback(_data.text); | |||||
} | |||||
}); | |||||
} | |||||
}, | |||||
{ label: "家庭地址", name: "MailAddress", width: 100, align: "left" }, | |||||
{ label: "联系电话", name: "Mobile", width: 100, align: "left" }, | |||||
{ label: "户口所在地", name: "ResidencePlace", width: 100, align: "left" }, | |||||
{ label: "档案所在地", name: "LocationFile", width: 100, align: "left" }, | |||||
{ | |||||
label: "操作", name: "Delete", width: 100, align: "center", | |||||
formatter: function (callback, cellvalue, row, op, $cell) { | |||||
var $div = $('<div></div>'); | |||||
var $hbtn = $('<span class="label label-info" style="cursor: pointer;margin-right:8px;"> 移除</span>'); | |||||
$hbtn.on('click', function () { | |||||
tempdatra.map((item, index) => { | |||||
if (item.StuNo == cellvalue.StuNo) { | |||||
tempdatra.splice(index, 1) | |||||
} | |||||
}); | |||||
//console.log(tempdatra) | |||||
$('#selgridtab').jfGridSet('refreshdata', tempdatra); | |||||
}); | |||||
$div.append($hbtn); | |||||
return $div; | |||||
} | |||||
}, | |||||
], | |||||
mainId: 'AAIId', | |||||
}); | |||||
}, | |||||
// 初始化列表 | |||||
initGird: function () { | |||||
$('#gridtable').lrAuthorizeJfGridLei({ | |||||
url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/GetPageList', | |||||
headData: [ | |||||
{ label: "学号", name: "StuNo", width: 100, align: "left" }, | |||||
{ label: "姓名", name: "StuName", width: 100, align: "left" }, | |||||
{ | |||||
label: "性别", name: "Gender", width: 80, align: "left", | |||||
formatter: function (cellvalue) { | |||||
return cellvalue == true ? "男" : "女"; | |||||
} | |||||
}, | |||||
{ | |||||
label: "出生日期", name: "Birthday", width: 100, align: "left", ishide: true, | |||||
formatter: function (value) { | |||||
return learun.formatDate(value, 'yyyy-MM-dd'); | |||||
} | |||||
}, | |||||
{ label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" }, | |||||
{ | |||||
label: "民族", name: "NationalityNo", width: 100, align: "left", | |||||
formatterAsync: function (callback, value, row, op, $cell) { | |||||
learun.clientdata.getAsync('dataItem', { | |||||
key: value, | |||||
code: 'National', | |||||
callback: function (_data) { | |||||
callback(_data.text); | |||||
} | |||||
}); | |||||
} | |||||
}, | |||||
{ label: "年级", name: "Grade", width: 100, align: "left" }, | |||||
{ | |||||
label: "系所", name: "DeptNo", width: 100, align: "left", | |||||
formatterAsync: function (callback, value, row, op, $cell) { | |||||
learun.clientdata.getAsync('custmerData', { | |||||
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', | |||||
key: value, | |||||
keyId: 'deptno', | |||||
callback: function (_data) { | |||||
callback(_data['deptname']); | |||||
} | |||||
}); | |||||
} | |||||
}, | |||||
{ | |||||
label: "专业", name: "MajorNo", width: 100, align: "left", | |||||
formatterAsync: function (callback, value, row, op, $cell) { | |||||
learun.clientdata.getAsync('custmerData', { | |||||
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', | |||||
key: value, | |||||
keyId: 'majorno', | |||||
callback: function (_data) { | |||||
callback(_data['majorname']); | |||||
} | |||||
}); | |||||
} | |||||
}, | |||||
{ | |||||
label: "班级", name: "ClassNo", width: 100, align: "left", | |||||
formatterAsync: function (callback, value, row, op, $cell) { | |||||
learun.clientdata.getAsync('custmerData', { | |||||
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', | |||||
key: value, | |||||
keyId: 'classno', | |||||
callback: function (_data) { | |||||
callback(_data['classname']); | |||||
} | |||||
}); | |||||
} | |||||
}, | |||||
{ | |||||
label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { | |||||
learun.clientdata.getAsync('dataItem', { | |||||
key: value, | |||||
code: 'EduSystem', | |||||
callback: function (_data) { | |||||
callback(_data.text); | |||||
} | |||||
}); | |||||
} | |||||
}, | |||||
{ label: "家庭地址", name: "MailAddress", width: 100, align: "left" }, | |||||
{ label: "联系电话", name: "Mobile", width: 100, align: "left" }, | |||||
{ label: "户口所在地", name: "ResidencePlace", width: 100, align: "left" }, | |||||
{ label: "档案所在地", name: "LocationFile", width: 100, align: "left" }, | |||||
], | |||||
mainId: 'StuId', | |||||
isPage: true, | |||||
rows: 100, | |||||
isMultiselect: true, | |||||
onSelectRow: function (rowdata, type) { | |||||
if (type) { | |||||
list.push(rowdata) | |||||
let temp = {} | |||||
list = list.reduce((prev, curv) => { | |||||
if (temp[curv.StuNo]) { } | |||||
else { | |||||
temp[curv.StuNo] = true | |||||
prev.push(curv) | |||||
} | |||||
return prev | |||||
}, []) | |||||
//var selectedRow = $('#gridtable').jfGridGet('rowdata'); | |||||
tempdatra = list | |||||
$('#selgridtab').jfGridSet('refreshdata', tempdatra); | |||||
} | |||||
} | |||||
}); | |||||
page.search(); | |||||
}, | |||||
search: function (param) { | |||||
param = param || {}; | |||||
param.SqlParameter = ' and (AnomalousType=05 or AnomalousType=10 or AnomalousType= 13 or AnomalousType= 14) and IsReturnSchool=0 and F_EnabledMark=1 '; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | |||||
} | |||||
}; | |||||
refreshGirdData = function () { | |||||
page.search(); | |||||
}; | |||||
page.init(); | |||||
} |
@@ -1390,6 +1390,7 @@ | |||||
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryScholarshipIndex.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryScholarshipIndex.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryBasicInfo.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryBasicInfo.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\FormView.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\FormView.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\ReinstateIndex.js" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\RolloffIndex.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\RolloffIndex.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\ReturnIndex.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\ReturnIndex.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\IntoIndex.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\IntoIndex.js" /> | ||||
@@ -8109,6 +8110,7 @@ | |||||
<Content Include="Areas\EducationalAdministration\Views\StuInfoGraduate\printxjk.cshtml" /> | <Content Include="Areas\EducationalAdministration\Views\StuInfoGraduate\printxjk.cshtml" /> | ||||
<Content Include="Areas\PersonnelManagement\Views\MeetingManagement\qrCode.cshtml" /> | <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\qrCode.cshtml" /> | ||||
<Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexAll.cshtml" /> | <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexAll.cshtml" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\ReinstateIndex.cshtml" /> | |||||
<None Include="Properties\PublishProfiles\CustomProfile.pubxml" /> | <None Include="Properties\PublishProfiles\CustomProfile.pubxml" /> | ||||
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" /> | <None Include="Properties\PublishProfiles\FolderProfile.pubxml" /> | ||||
<Content Include="Views\Login\Default-beifen.cshtml" /> | <Content Include="Views\Login\Default-beifen.cshtml" /> | ||||
@@ -207,7 +207,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
[Column("SUSPENSIONENDTIME")] | [Column("SUSPENSIONENDTIME")] | ||||
public DateTime? SuspensionEndTime { get; set; } | public DateTime? SuspensionEndTime { get; set; } | ||||
/// <summary> | /// <summary> | ||||
/// 是否已复学 1是 0否【休学】 | |||||
/// 是否已复学 1是 0否【休学】/是否恢复学籍 退学,开除,注销学籍 | |||||
/// </summary> | /// </summary> | ||||
/// <returns></returns> | /// <returns></returns> | ||||
[Column("ISRETURNSCHOOL")] | [Column("ISRETURNSCHOOL")] | ||||
@@ -373,7 +373,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
InsertEntity.Create(); | InsertEntity.Create(); | ||||
//去重验证 | //去重验证 | ||||
if (InsertEntity.AnomalousType == "03")//复学 | |||||
if (InsertEntity.AnomalousType == "03" || InsertEntity.AnomalousType == "16")//复学 //恢复学籍 | |||||
{ | { | ||||
if (this.BaseRepository("CollegeMIS").FindEntity<StuTransferInfoEntity>(x => | if (this.BaseRepository("CollegeMIS").FindEntity<StuTransferInfoEntity>(x => | ||||
x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.LeaveDate == InsertEntity.LeaveDate && | x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.LeaveDate == InsertEntity.LeaveDate && | ||||
@@ -440,7 +440,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
case "12": //失踪 | case "12": //失踪 | ||||
case "13": //注销 | case "13": //注销 | ||||
case "14": //自动退学 | case "14": //自动退学 | ||||
case "15": //自动退学 | |||||
case "15": //跳级 | |||||
#region 复制一份学生学籍表 | #region 复制一份学生学籍表 | ||||
copyStuInfoBasic(upTrua, stulist, InsertStuTran); | copyStuInfoBasic(upTrua, stulist, InsertStuTran); | ||||
@@ -638,7 +638,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
} | } | ||||
#endregion | #endregion | ||||
} | } | ||||
else if (upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06" || upTrua.AnomalousType == "10" || upTrua.AnomalousType == "11" || upTrua.AnomalousType == "12") | |||||
else if (upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06" || upTrua.AnomalousType == "10" || upTrua.AnomalousType == "11" || upTrua.AnomalousType == "12" || upTrua.AnomalousType == "13") | |||||
{ | { | ||||
if (upTrua.AnomalousType == "06") //休学保存部分基础数据 StuTransferInfo数据? | if (upTrua.AnomalousType == "06") //休学保存部分基础数据 StuTransferInfo数据? | ||||
{ | { | ||||
@@ -894,6 +894,232 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist)); | db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist)); | ||||
} | } | ||||
#endregion | |||||
break; | |||||
case "16": //恢复学籍 | |||||
//学籍异动列表 | |||||
if (upTrua.IsReturnSchool == "0") | |||||
{ | |||||
upTrua.IsReturnSchool = "1"; | |||||
//修改记录为已审核 | |||||
upTrua.F_EnabledMark = 1; | |||||
upTrua.CheckTime = DateTime.Now; | |||||
upTrua.CheckUserId = userInfo.userId; | |||||
//修改关联休学记录的 IsReturnSchool = 1 | |||||
db.ExecuteBySql(" update StuTransferInfo set IsReturnSchool = 1 where ID = '" + upTrua.ReturnSchoolId + "'"); | |||||
//1.basic找,有就改;2.basictran复制并改; | |||||
if (stulist == null) | |||||
{ | |||||
#region 重新生成学籍 | |||||
//复学的学籍 | |||||
var ReturnStu = db.FindEntity<StuInfoBasicTranEntity>(x => x.StuId == upTrua.StuId); | |||||
addTruan.StuId = ReturnStu.StuId; | |||||
addTruan.StuNo = ReturnStu.StuNo; | |||||
addTruan.StuCode = ReturnStu.StuCode; | |||||
addTruan.NoticeNo = ReturnStu.NoticeNo; | |||||
addTruan.GraduateYear = ReturnStu.GraduateYear; | |||||
addTruan.ksh = ReturnStu.ksh; | |||||
addTruan.DeptNo = upTrua.NewDeptNo; | |||||
addTruan.MajorNo = upTrua.NewMajorNo; | |||||
addTruan.MajorDetailNo = ReturnStu.MajorDetailNo; | |||||
addTruan.MajorDetailName = ReturnStu.MajorDetailName; | |||||
addTruan.Grade = upTrua.NewGrade; | |||||
addTruan.ClassNo = upTrua.NewClassNo; | |||||
addTruan.StuName = ReturnStu.StuName; | |||||
addTruan.SpellFull = ReturnStu.SpellFull; | |||||
addTruan.SpellBrief = ReturnStu.SpellBrief; | |||||
addTruan.GenderNo = ReturnStu.GenderNo; | |||||
addTruan.Birthday = ReturnStu.Birthday; | |||||
addTruan.PartyFaceNo = ReturnStu.PartyFaceNo; | |||||
addTruan.FamilyOriginNo = ReturnStu.FamilyOriginNo; | |||||
addTruan.NationalityNo = ReturnStu.NationalityNo; | |||||
addTruan.ProvinceNo = ReturnStu.ProvinceNo; | |||||
addTruan.RegionNo = ReturnStu.RegionNo; | |||||
addTruan.ResidenceNo = ReturnStu.ResidenceNo; | |||||
addTruan.TestStuSortNo = ReturnStu.TestStuSortNo; | |||||
addTruan.HealthStatusNo = ReturnStu.HealthStatusNo; | |||||
addTruan.WillNo = ReturnStu.WillNo; | |||||
addTruan.TestStuSubjectNo = ReturnStu.TestStuSubjectNo; | |||||
addTruan.GraduateNo = ReturnStu.GraduateNo; | |||||
addTruan.PlanFormNo = ReturnStu.PlanFormNo; | |||||
addTruan.IsThreeGood = ReturnStu.IsThreeGood; | |||||
addTruan.IsExcellent = ReturnStu.IsExcellent; | |||||
addTruan.IsNormalCadre = ReturnStu.IsNormalCadre; | |||||
addTruan.IsProvinceFirstThree = ReturnStu.IsProvinceFirstThree; | |||||
addTruan.OverseasChineseNo = ReturnStu.OverseasChineseNo; | |||||
addTruan.MatriculateSort = ReturnStu.MatriculateSort; | |||||
addTruan.ComeProvinceNo = ReturnStu.ComeProvinceNo; | |||||
addTruan.HighSchoolNo = ReturnStu.HighSchoolNo; | |||||
addTruan.HighSchoolName = ReturnStu.HighSchoolName; | |||||
addTruan.EntranceDate = ReturnStu.EntranceDate; | |||||
addTruan.Religion = ReturnStu.Religion; | |||||
addTruan.GoodAt = ReturnStu.GoodAt; | |||||
addTruan.IdentityCardNo = ReturnStu.IdentityCardNo; | |||||
addTruan.JoinPartyDate = ReturnStu.JoinPartyDate; | |||||
addTruan.JoinLeagueDate = ReturnStu.JoinLeagueDate; | |||||
addTruan.InSchoolAddress = ReturnStu.InSchoolAddress; | |||||
addTruan.InSchoolTelephone = ReturnStu.InSchoolTelephone; | |||||
addTruan.AbmormityMoveMark = ReturnStu.AbmormityMoveMark; | |||||
addTruan.AwardMark = ReturnStu.AwardMark; | |||||
addTruan.PunishMark = ReturnStu.PunishMark; | |||||
addTruan.LinkmanMark = ReturnStu.LinkmanMark; | |||||
addTruan.StuNoChangeMark = ReturnStu.StuNoChangeMark; | |||||
addTruan.FinishSchoolMark = ReturnStu.FinishSchoolMark; | |||||
addTruan.CurrentRegisterMark = ReturnStu.CurrentRegisterMark; | |||||
addTruan.FinishSchoolDate = ReturnStu.FinishSchoolDate; | |||||
addTruan.DiplomaNo = ReturnStu.DiplomaNo; | |||||
addTruan.DiplomaRemark = ReturnStu.DiplomaRemark; | |||||
addTruan.Remark = ReturnStu.Remark; | |||||
addTruan.RegisterDate = ReturnStu.RegisterDate; | |||||
addTruan.Photo = ReturnStu.Photo; | |||||
addTruan.TeachPlanNo = ReturnStu.TeachPlanNo; | |||||
addTruan.mobile = ReturnStu.mobile; | |||||
addTruan.EMail = ReturnStu.EMail; | |||||
addTruan.QQ = ReturnStu.QQ; | |||||
addTruan.FatherUnit = ReturnStu.FatherUnit; | |||||
addTruan.FatherName = ReturnStu.FatherName; | |||||
addTruan.FatherPhone = ReturnStu.FatherPhone; | |||||
addTruan.MatherName = ReturnStu.MatherName; | |||||
addTruan.MatherUnit = ReturnStu.MatherUnit; | |||||
addTruan.MatherPhone = ReturnStu.MatherPhone; | |||||
addTruan.username = ReturnStu.username; | |||||
addTruan.password = ReturnStu.password; | |||||
addTruan.MailAddress = ReturnStu.MailAddress; | |||||
addTruan.PostalCode = ReturnStu.PostalCode; | |||||
addTruan.InSchoolStatus = ReturnStu.InSchoolStatus; | |||||
addTruan.TransMark = ReturnStu.TransMark; | |||||
addTruan.ClassTutorNo = ReturnStu.ClassTutorNo; | |||||
addTruan.ResumeCheck = ReturnStu.ResumeCheck; | |||||
addTruan.PracStatus = ReturnStu.PracStatus; | |||||
addTruan.RegisterStatus = ReturnStu.RegisterStatus; | |||||
addTruan.PunishmentDate = ReturnStu.PunishmentDate; | |||||
addTruan.F_CityId = ReturnStu.F_CityId; | |||||
addTruan.F_CountyId = ReturnStu.F_CountyId; | |||||
addTruan.F_ProvinceId = ReturnStu.F_ProvinceId; | |||||
addTruan.F_SchoolId = ReturnStu.F_SchoolId; | |||||
addTruan.EduSystem = ReturnStu.EduSystem; | |||||
addTruan.StudyModality = ReturnStu.StudyModality; | |||||
addTruan.SyncFlag = ReturnStu.SyncFlag; | |||||
addTruan.ChangeStatus = ReturnStu.ChangeStatus; | |||||
addTruan.Balance = ReturnStu.Balance; | |||||
addTruan.HealthStatus = ReturnStu.HealthStatus; | |||||
addTruan.IdCardType = ReturnStu.IdCardType; | |||||
addTruan.EntranceWay = ReturnStu.EntranceWay; | |||||
addTruan.StudyingWay = ReturnStu.StudyingWay; | |||||
addTruan.CountryNo = ReturnStu.CountryNo; | |||||
addTruan.MarriageStatus = ReturnStu.MarriageStatus; | |||||
addTruan.TrainInterval = ReturnStu.TrainInterval; | |||||
addTruan.IsTrailChildren = ReturnStu.IsTrailChildren; | |||||
addTruan.StuPlaceCode = ReturnStu.StuPlaceCode; | |||||
addTruan.BirthPlaceCode = ReturnStu.BirthPlaceCode; | |||||
addTruan.NativePlaceCode = ReturnStu.NativePlaceCode; | |||||
addTruan.ResidencePlaceCode = ReturnStu.ResidencePlaceCode; | |||||
addTruan.BelongPolice = ReturnStu.BelongPolice; | |||||
addTruan.StuLivePlaceType = ReturnStu.StuLivePlaceType; | |||||
addTruan.StuOrigin = ReturnStu.StuOrigin; | |||||
addTruan.RecruitObject = ReturnStu.RecruitObject; | |||||
addTruan.PoorIsRecord = ReturnStu.PoorIsRecord; | |||||
addTruan.RecruitWay = ReturnStu.RecruitWay; | |||||
addTruan.RecruitCooperateType = ReturnStu.RecruitCooperateType; | |||||
addTruan.AdmissionNo = ReturnStu.AdmissionNo; | |||||
addTruan.ExamScore = ReturnStu.ExamScore; | |||||
addTruan.RecruitCooperateForm = ReturnStu.RecruitCooperateForm; | |||||
addTruan.RecruitCooperateSchoolNo = ReturnStu.RecruitCooperateSchoolNo; | |||||
addTruan.SchoolOutsidePlace = ReturnStu.SchoolOutsidePlace; | |||||
addTruan.PieceCultivateWay = ReturnStu.PieceCultivateWay; | |||||
addTruan.EnglishName = ReturnStu.EnglishName; | |||||
addTruan.OneMembership = ReturnStu.OneMembership; | |||||
addTruan.OneIsGuardian = ReturnStu.OneIsGuardian; | |||||
addTruan.OneBirthday = ReturnStu.OneBirthday; | |||||
addTruan.OneIdCardType = ReturnStu.OneIdCardType; | |||||
addTruan.OneIdCardNo = ReturnStu.OneIdCardNo; | |||||
addTruan.OneNationalityNo = ReturnStu.OneNationalityNo; | |||||
addTruan.OnePartyFaceNo = ReturnStu.OnePartyFaceNo; | |||||
addTruan.OneHealthStatus = ReturnStu.OneHealthStatus; | |||||
addTruan.OneJob = ReturnStu.OneJob; | |||||
addTruan.OnePosition = ReturnStu.OnePosition; | |||||
addTruan.TwoMembership = ReturnStu.TwoMembership; | |||||
addTruan.TwoIsGuardian = ReturnStu.TwoIsGuardian; | |||||
addTruan.TwoBirthday = ReturnStu.TwoBirthday; | |||||
addTruan.TwoIdCardType = ReturnStu.TwoIdCardType; | |||||
addTruan.TwoIdCardNo = ReturnStu.TwoIdCardNo; | |||||
addTruan.TwoNationalityNo = ReturnStu.TwoNationalityNo; | |||||
addTruan.TwoPartyFaceNo = ReturnStu.TwoPartyFaceNo; | |||||
addTruan.TwoHealthStatus = ReturnStu.TwoHealthStatus; | |||||
addTruan.TwoJob = ReturnStu.TwoJob; | |||||
addTruan.TwoPosition = ReturnStu.TwoPosition; | |||||
addTruan.ProvinceCode = ReturnStu.ProvinceCode; | |||||
addTruan.Guardian = ReturnStu.Guardian; | |||||
addTruan.GuardianPhone = ReturnStu.GuardianPhone; | |||||
addTruan.GuardianType = ReturnStu.GuardianType; | |||||
addTruan.IsSingle = ReturnStu.IsSingle; | |||||
addTruan.IsLeft = ReturnStu.IsLeft; | |||||
addTruan.IsDisability = ReturnStu.IsDisability; | |||||
addTruan.IsRunSchool = ReturnStu.IsRunSchool; | |||||
addTruan.IsDdifficulty = ReturnStu.IsDdifficulty; | |||||
addTruan.FiveYear = ReturnStu.FiveYear; | |||||
addTruan.InternshipStatus = ReturnStu.InternshipStatus; | |||||
addTruan.IsRestudy = ReturnStu.IsRestudy; | |||||
addTruan.MajorDetailSpell = ReturnStu.MajorDetailSpell; | |||||
addTruan.OneName = ReturnStu.OneName; | |||||
addTruan.TwoName = ReturnStu.TwoName; | |||||
addTruan.OtherContact = ReturnStu.OtherContact; | |||||
addTruan.OneMobile = ReturnStu.OneMobile; | |||||
addTruan.TwoMobile = ReturnStu.TwoMobile; | |||||
addTruan.ReturnBooksStatus = ReturnStu.ReturnBooksStatus; | |||||
addTruan.ReturnBooksDate = ReturnStu.ReturnBooksDate; | |||||
addTruan.EmployAgreeStatus = ReturnStu.EmployAgreeStatus; | |||||
addTruan.EmployAgreeDate = ReturnStu.EmployAgreeDate; | |||||
addTruan.FeeSettleStatus = ReturnStu.FeeSettleStatus; | |||||
addTruan.FeeSettleDate = ReturnStu.FeeSettleDate; | |||||
addTruan.CheckOutStatus = ReturnStu.CheckOutStatus; | |||||
addTruan.CheckOutDate = ReturnStu.CheckOutDate; | |||||
addTruan.CardDeregistrateStatus = ReturnStu.CardDeregistrateStatus; | |||||
addTruan.CardDeregistrateDate = ReturnStu.CardDeregistrateDate; | |||||
addTruan.DiplomaReceiveStatus = ReturnStu.DiplomaReceiveStatus; | |||||
addTruan.DiplomaReceiveDate = ReturnStu.DiplomaReceiveDate; | |||||
addTruan.FileTransferStatus = ReturnStu.FileTransferStatus; | |||||
addTruan.FileTransferDate = ReturnStu.FileTransferDate; | |||||
addTruan.TissueStatus = ReturnStu.TissueStatus; | |||||
addTruan.TissueDate = ReturnStu.TissueDate; | |||||
addTruan.DiplomaReceiveSign = ReturnStu.DiplomaReceiveSign; | |||||
addTruan.DiplomaReceiveIdcard = ReturnStu.DiplomaReceiveIdcard; | |||||
addTruan.DiplomaReceiveRemark = ReturnStu.DiplomaReceiveRemark; | |||||
addTruan.CheckMark = "0"; | |||||
db.Insert(addTruan); | |||||
#endregion | |||||
} | |||||
else | |||||
{ | |||||
stulist.DeptNo = upTrua.NewDeptNo; | |||||
stulist.MajorNo = upTrua.NewMajorNo; | |||||
stulist.ClassNo = upTrua.NewClassNo; | |||||
stulist.Grade = upTrua.NewGrade; | |||||
db.Update(stulist); | |||||
} | |||||
if (upTrua.RecoverWriteMark == "1") //恢复账号 | |||||
{ | |||||
#region 用户表 | |||||
db1.ExecuteBySql(" update LR_Base_User set F_EnabledMark= 1 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' "); | |||||
#endregion | |||||
} | |||||
} | |||||
#region 课表(StuSelectLessonList,旧-写入新班级课表数据;) | |||||
//db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist)); | |||||
// wx修改 2023-3-21 课表空数据报错 ,查找同班同学 如果不为空继续执行 | |||||
if (CreateInsertStuSelectLessonList(upTrua, stulist) != null) | |||||
{ | |||||
db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist)); | |||||
} | |||||
#endregion | #endregion | ||||
break; | break; | ||||
case "04": //转入 | case "04": //转入 | ||||