bjquanjiang
/
DigitalScholl
1
0
Форкнуть 0
Код Задачи 0 Pull Request'ы 0 Релизы 0 Вики Активность
Просмотр исходного кода

Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

新疆警官学校中职
ndbs 1 год назад
Родитель
e82bb0e359 ce0f63a78c
Сommit
26b18d0192
6 измененных файлов: 329 добавлений и 13 удалений
Разделённый вид
Опции Diff
Показать статистику Скачать Patch файл Скачать Diff файл
  1. +291
    -5
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.cshtml
  2. +31
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/UserCenterController.cs
  3. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuInfoBasicTranMap.cs
  4. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranEntity.cs
  5. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranService.cs
  6. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs

+ 291
- 5
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.cshtml Просмотреть файл

@@ -1,8 +1,8 @@
@{
ViewBag.Title = "综合查询-基本信息";
Layout = "~/Views/Shared/_Form.cshtml";
Layout = "~/Views/Shared/_Index.cshtml";
}
@Html.AppendCssFile("/Views/UserCenter/user.css")
<style>
#tab2 > .lr-scroll-box,
#tab3 > .lr-scroll-box,
@@ -14,7 +14,7 @@
}
</style>
<script>
</script>
<div class="lr-form-tabs" id="lr_form_tabs">
<ul class="nav nav-tabs">
@@ -27,8 +27,294 @@
</ul>
</div>
<div class="tab-content lr-tab-content" id="lr_tab_content">
<div class="lr-form-wrap tab-pane" id="tab1">
<div>todo</div>
<div class="lr-form-wrap tab-pane" id="tab1" style="height:100%;overflow:auto">
<div id="student" class="user_warpper student_warpper">
<div class="index_sec index_sec1">
@*<div class="userTitle">基本信息</div>*@
<!-- / user_sec1 -->
<div class="user_sec1">
<img src="~/Content/images/Login/user5.png" />
<div class="userSec1Box">
<div class="userSec1L">
<div class="userSec1Img">
@*<img src="~/Content/images/Login/user3.jpg" />*@
<img :src="this.headUrl" />
</div>
<div class="userSec1T">{{studentInfo.StuName}}</div>
</div>
<ul class="userSec1R">
<li>性 &nbsp; &nbsp; &nbsp; 别 : {{studentInfo.GenderNo | sex}}</li>
<li>出生日期 : {{studentInfo.Birthday | date}}</li>
<li>校 &nbsp; &nbsp; &nbsp; 区 : {{studentInfo.F_SchoolId | company}}</li>
</ul>
</div>
</div>
<!-- / user_sec1 -->
<!-- / user_sec2 -->
<div class="user_sec2">
<div class="userSec2Box">
<div class="userSec2T">基本信息 <i class="fa fa-angle-right"></i></div>
<ul class="userSec2List">
<li>民 族 : {{studentInfo.NationalityNo |nationalityNo}}</li>
<li>政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}</li>
<li>身份证号 : {{studentInfo.IdentityCardNo}} </li>
<li>户口所在地 : {{studentInfo.FatherUnit}}</li>
</ul>
</div>

<div class="userSec2Box">
<div class="userSec2T">家庭情况 <i class="fa fa-angle-right"></i></div>
<ul class="userSec2List">
<li>监护人姓名 : {{studentInfo.Guardian}}</li>
<li>监护人联系电话 : {{studentInfo.GuardianPhone}}</li>
<li>与监护人关系 : {{studentInfo.GuardianType |guardiantype}}</li>
<li>邮政编码 : {{studentInfo.PostalCode}}</li>
<li>家庭地址 : {{studentInfo.MailAddress}}</li>
</ul>
</div>

<div class="userSec2Box">
<div class="userSec2T">学籍信息 <i class="fa fa-angle-right"></i></div>
<ul class="userSec2List">
<li>学 &nbsp; 籍 &nbsp; 号 : {{studentInfo.StuCode}}</li>
<li>学 号 : {{studentInfo.StuNo}}</li>
<li>年 &nbsp; &nbsp; &nbsp; 级 : {{studentInfo.Grade}}</li>
<li>系 部 : {{studentInfo.DeptNo | deptNo}} </li>
<li>专 业 : {{studentInfo.MajorNo | majorNo}}</li>
<li>班 级 : {{studentInfo.ClassNo | class}} </li>
<li>入团时间 : {{studentInfo.JoinLeagueDate | date}} </li>
<li>现有学历 : {{studentInfo.GraduateNo | graduateNo}}</li>
<li>报到日期 : {{studentInfo.RegisterDate | date}}</li>
<li>入学年月 : {{studentInfo.EntranceDate | date}}</li>
</ul>
</div>

<div class="userSec2Box">
<div class="userSec2T">联系方式 <i class="fa fa-angle-right"></i></div>
<ul class="userSec2List">
<li>联系电话 : {{studentInfo.mobile}}</li>
<li> QQ : {{studentInfo.QQ}}</li>
<li>E-mail : {{studentInfo.EMail}}</li>
</ul>
</div>
</div>
<!-- / user_sec2 -->
</div>


</div>
<script>
var keyValue = request('keyValue');
var vm = new Vue({
el: "#student",
data: {
headUrl: "",
studentInfo: "",
baseInfo: ""
},
methods: {
getData: function () {
$.get('/UserCenter/GetStudentInfoOfTran?keyValue=' + keyValue,
function (ref) {
this.studentInfo = ref.data.userInfo;
this.baseInfo = ref.data.basicInfo;
this.headUrl = ref.data.userInfo.Photo;

}.bind(this),
"json");
},
getUrl: function () {
var loginInfo = top.learun.clientdata.get(['userinfo']);
this.headUrl = '/LR_OrganizationModule/User/GetImg?userId=' + loginInfo.userId;
}
},
created() {
this.getData();
//this.getUrl();
},
filters: {
sex: function (value) {
return value ? "男" : "女";

},
company: function (value) {
var result;
top.learun.clientdata.getAsync('custmerData',
{
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
key: value,
keyId: 'f_companyid',
callback: function (_data) {
result = _data.f_fullname;
}
});
return result;
},
graduateNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem',
{
key: value,
code: 'CollegeType',
callback: function (_data) {
result = _data.text;
}
});
return result;
},
date: function (value) {
if (value) {

var date = new Date(value);
return date.toLocaleDateString();
} else {
return '';
}
},
nationalityNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem',
{
key: value,
code: 'National',
callback: function (_data) {
result = _data.text;
}
});
return result;
},
partyFaceNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem',
{
key: value,
code: 'PolityStatus',
callback: function (_data) {
result = _data.text;
}
});
return result;
},
guardiantype: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem',
{
key: value,
code: 'GuardianType',
callback: function (_data) {
result = _data.text;
}
});
return result;
},
province: function (value) {
var result;
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
key: value,
keyId: 'pcode',
callback: function (_data) {
result = _data['pname'];
}
});
return result;
},
city: function (value) {
var result;
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
key: value,
keyId: 'ccode',
callback: function (_data) {
result = _data['cname'];
}
});
return result;
},
area: function (value) {
var result;
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
key: value,
keyId: 'acode',
callback: function (_data) {
result = _data['aname'];
}
});
return result;
},
overseasChineseNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
key: value,
code: 'BCdOverseasChinese',
callback: function (_data) {
result = _data.text;
}
});
return result;
},
healthStatusNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
key: value,
code: 'BCdHealthStatus',
callback: function (_data) {
result = _data.text;
}
});
return result;
},
deptNo: function (value) {
var result;
top.learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
key: value,
keyId: 'deptno',
callback: function (_data) {
result = _data.deptname;
}.bind(this)
});
return result;
},
majorNo: function (value) {
var result;
top.learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
key: value,
keyId: 'majorno',
callback: function (_data) {
result = _data.majorname;

}.bind(this)
});
return result;
},
class: function (value) {
var result;
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
key: value,
keyId: 'classno',
callback: function (_data) {
result = _data['classname'];
}
});
return result;
}


}

})
</script>

</div>
<div class="lr-form-wrap tab-pane" id="tab2" style="overflow-y: auto;">
<iframe id="QueryScoreIndex" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>


+ 31
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/UserCenterController.cs Просмотреть файл

@@ -25,6 +25,8 @@ namespace Learun.Application.Web.Controllers
private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
private EmpInfoIBLL empInfoIBLL = new EmpInfoBLL();
private AnnexesFileIBLL annesexFileIBll = new AnnexesFileBLL();
private StuTransferInfoIBLL stuTransferInfoIBLL = new StuTransferInfoBLL();
private StuInfoBasicTranIBLL stuInfoBasicTranIBLL = new StuInfoBasicTranBLL();


#region 视图功能
@@ -224,7 +226,7 @@ namespace Learun.Application.Web.Controllers
}
else
{
photo = Config.GetValue("fileHeadImg") +"/"+ (result.GenderNo==true? "on-boy.jpg" : "on-girl.jpg");
photo = Config.GetValue("fileHeadImg") + "/" + (result.GenderNo == true ? "on-boy.jpg" : "on-girl.jpg");
photo = "/" + photo.Substring(photo.IndexOf("Content"));
}
result.Photo = photo;
@@ -254,6 +256,34 @@ namespace Learun.Application.Web.Controllers
}
return Success(new { basecInfo = baseInfo, userInfo = result, imgUrl = url });
}
/// <summary>
/// 查看学生异动前的学生信息
/// </summary>
/// <param name="keyValue">StuTransferInfo 学籍异动表主键</param>
/// <returns></returns>
public ActionResult GetStudentInfoOfTran(string keyValue)
{
var result = new StuInfoBasicTranEntity();
var StuTransferInfoEntity = stuTransferInfoIBLL.GetEntity(keyValue);
var StuInfoBasicTranEntity = stuInfoBasicTranIBLL.GetEntity(StuTransferInfoEntity?.StuTranId);
if (StuInfoBasicTranEntity != null)
{
var photo = annesexFileIBll.GetEntityByFolderId(StuInfoBasicTranEntity.Photo)?.F_FilePath;
if (photo != null)
{
photo = "/" + photo.Substring(photo.IndexOf("Resource"));
}
else
{
photo = Config.GetValue("fileHeadImg") + "/" + (StuInfoBasicTranEntity.GenderNo == true ? "on-boy.jpg" : "on-girl.jpg");
photo = "/" + photo.Substring(photo.IndexOf("Content"));
}
StuInfoBasicTranEntity.Photo = photo;
result = StuInfoBasicTranEntity;
}
return Success(new { userInfo = result });

}
#endregion

#region 提交数据


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuInfoBasicTranMap.cs Просмотреть файл

@@ -18,7 +18,7 @@ namespace Learun.Application.Mapping
//表
this.ToTable("STUINFOBASICTRAN");
//主键
this.HasKey(t => t.StuId);
this.HasKey(t => t.ID);
#endregion

#region 配置关系


+ 4
- 4
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranEntity.cs Просмотреть файл

@@ -15,11 +15,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
#region 实体成员
/// <summary>
/// Id
/// ID
/// </summary>
/// <returns></returns>
[Column("ID")]
public string Id { get; set; }
public string ID { get; set; }
/// <summary>
/// StuId
/// </summary>
@@ -1081,7 +1081,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// </summary>
public void Create()
{
this.Id = Guid.NewGuid().ToString();
this.ID = Guid.NewGuid().ToString();
}
/// <summary>
/// 编辑调用
@@ -1089,7 +1089,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// <param name="keyValue"></param>
public void Modify(string keyValue)
{
this.Id = keyValue;
this.ID = keyValue;
}
#endregion
}


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranService.cs Просмотреть файл

@@ -117,7 +117,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
try
{
this.BaseRepository("CollegeMIS").Delete<StuInfoBasicTranEntity>(t=>t.Id == keyValue);
this.BaseRepository("CollegeMIS").Delete<StuInfoBasicTranEntity>(t=>t.ID == keyValue);
}
catch (Exception ex)
{


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs Просмотреть файл

@@ -437,7 +437,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration

#region 复制一份学生学籍表
copyStuInfoBasic(upTrua, stulist, InsertStuTran);
upTrua.StuTranId = InsertStuTran.Id;
upTrua.StuTranId = InsertStuTran.ID;
InStuinTran.Add(InsertStuTran);
#endregion



Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить