bjquanjiang
/
DigitalScholl
1
0
Forka 0
Codice Problemi 0 Pull Requests 0 Rilasci 0 Wiki Attività
Sfoglia il codice sorgente

Merge branches '塔里木分支' and '大厂分支', commit '2dbfa1619b8f6dea2e4aa8e9723f20b741101538' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支new 

# Conflicts:
#	Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml
#	Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Admin.cshtml
#	Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml
新疆影视学院高职
杨晓琪 2 anni fa
parent
247e054af6 fdcdb6c65e 2dbfa1619b
commit
22dd0582d9
23 ha cambiato i file con 298 aggiunte e 101 eliminazioni
Visualizzazione separata
Opzioni Diff
Mostra statistiche Scarica il file Patch Scarica il file Diff
  1. +21
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/VaccinationInfoController.cs
  2. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js
  3. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml
  4. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Index.js
  5. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.cshtml
  6. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.js
  7. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.cshtml
  8. +24
    -11
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.js
  9. +9
    -5
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml
  10. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefaultForDC.cshtml
  11. +1
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-admin.js
  12. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Admin.cshtml
  13. +121
    -64
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml
  14. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.js
  15. +7
    -0
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj
  16. +11
    -0
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs
  17. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml
  18. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config
  19. +26
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoBLL.cs
  20. +3
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoEntity.cs
  21. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoIBLL.cs
  22. +58
    -5
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs
  23. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/WebHelper.cs

+ 21
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/VaccinationInfoController.cs Vedi File

@@ -81,6 +81,27 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
return Success(jsonData);
}
/// <summary>
/// 获取页面显示列表数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetPageListForTeacher(string pagination, string queryJson)
{
Pagination paginationobj = pagination.ToObject<Pagination>();
var data = vaccinationInfoIBLL.GetPageListForTeacher(paginationobj, queryJson);
var jsonData = new
{
rows = data,
total = paginationobj.total,
page = paginationobj.page,
records = paginationobj.records
};
return Success(jsonData);
}
/// <summary>
/// 获取表单数据
/// </summary>
/// <param name="keyValue">主键</param>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js Vedi File

@@ -111,7 +111,7 @@ var bootstrap = function ($, learun) {
},
// 初始化列表
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/EducationalAdministration/PM_EducationExperience/GetPageList',
headData: [
{ label: "开始时间", name: "STime", width: 130, align: "left" },


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml Vedi File

@@ -9,7 +9,7 @@
</div>
<div class="col-xs-6 lr-form-item" data-table="PM_Resume">
<div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
<input id="ETime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#RTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
<input id="Etime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#RTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_Resume">
<div class="lr-form-item-title">工作单位<font face="宋体">*</font></div>


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Index.js Vedi File

@@ -112,11 +112,11 @@ var bootstrap = function ($, learun) {
},
// 初始化列表
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/EducationalAdministration/PM_Resume/GetPageList',
headData: [
{ label: "开始时间", name: "RTime", width: 130, align: "left" },
{ label: "结束时间", name: "ETime", width: 130, align: "left" },
{ label: "结束时间", name: "Etime", width: 130, align: "left" },
{ label: "工作单位", name: "UnitName", width: 100, align: "left" },
{ label: "证明人", name: "Witness", width: 100, align: "left" },
{ label: "部门", name: "DepartmentID", width: 100, align: "left" },


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.cshtml Vedi File

@@ -18,7 +18,7 @@
</div>
<div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
<div class="lr-form-item-title">疫苗类型</div>
<div id="VaccineType"></div>
<input id="VaccineType" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
<div class="lr-form-item-title">第一针时间</div>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.js Vedi File

@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
$('#VaccineType').lrDataItemSelect({ code: 'VaccineType' });
//$('#VaccineType').lrDataItemSelect({ code: 'VaccineType' });
},
initData: function () {
if (!!keyValue) {


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.cshtml Vedi File

@@ -25,7 +25,7 @@
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">接种类型</div>
<div id="VaccineType"></div>
<input id="VaccineType" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">身份证号</div>


+ 24
- 11
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.js Vedi File

@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 220, 400);
$('#VaccineType').lrDataItemSelect({ code: 'VaccineType' });
//$('#VaccineType').lrDataItemSelect({ code: 'VaccineType' });
$('#DepartmentId').lrselect({
type: 'tree',
allowSearch: true,
@@ -139,10 +139,23 @@ var bootstrap = function ($, learun) {
// 初始化列表
initGird: function () {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/GetPageList',
url: top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/GetPageListForTeacher',
headData: [
{ label: "职工编号", name: "EmpNo", width: 100, align: "left" },
{ label: "姓名", name: "EmpName", width: 150, align: "left" },
{
label: "员工状态", name: "IsInActiveStatus", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'JobStatus',
callback: function (_data) {
callback(_data.text);
}
});
}
},

{ label: "身份证", name: "CardId", width: 160, align: "left" },
{
label: "部门", name: "DepartmentId", width: 200, align: "left",
@@ -160,15 +173,15 @@ var bootstrap = function ($, learun) {
{ label: "电话号码", name: "Mobile", width: 120, align: "left" },
{
label: "疫苗类型", name: "VaccineType", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'VaccineType',
callback: function (_data) {
callback(_data.text);
}
});
}
//formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'VaccineType',
// callback: function (_data) {
// callback(_data.text);
// }
// });
//}
},
{ label: "接种地", name: "VaccineAddress", width: 100, align: "left" },
{


+ 9
- 5
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml Vedi File

@@ -16,22 +16,26 @@
<img style="height: 40px;" width="95%" src="~/LR_SystemModule/LogoImg/GetImg?code=headbg" alt="经典风格">
</div>
<div>
<iframe style="position: absolute; top: 18px; right: 150px; height: 25px;" id="fancybox-frame" name="fancybox-frame1591155087436" frameborder="0" scrolling="no" hspace="0" src="http://i.tianqi.com/index.php?c=code&py=akesu&a=getcode&id=34&h=25&w=280"></iframe>
<iframe style="position: absolute; top: 18px; right: 150px; height: 25px;" id="fancybox-frame" name="fancybox-frame1591155087436" frameborder="0" scrolling="no" hspace="0" src="http://i.tianqi.com/index.php?c=code&py=dachang&a=getcode&id=34&h=25&w=280"></iframe>
</div>
</div>
@*<div class="lr-lg-setting" id="lr_lg_setting">
<div class="lr-lg-setting" id="lr_lg_setting">
<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
<ul class="dropdown-menu"></ul>
</div>*@
</div>


@*<div class="lr-lzc-user"><a class="lr-lzca-user" href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown">在线人数 @ViewBag.OnlineUserNum 人</a>
<ul class="dropdown-menu pull-right lr-lzca-user-ul">
</ul></div>*@
<div class="lr-im-bell2" title="消息中心2">
<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown">
<div class="lr-im-bell2" title="消息中心">
<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" style="position: relative;">
<span class="point" style="display:none;"></span>
<i style="font-size: 20px" class="fa fa-bell"></i>
@if (ViewBag.UnreadNum > 0)
{
<span style="font-size: 12px; position: absolute; background: #E54424; color: #fff; line-height: 16px; border-radius: 8px; padding: 0 6px; height: 16px; top: -12px; left: 8px;">@ViewBag.UnreadNum</span>
}
</a>
<ul class="dropdown-menu pull-right">
<li><a href="javascript:void(0);" id="btn_daiban"><i class="fa fa-comment"></i>待办事项 @ViewBag.UnreadTask 条</a></li>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefaultForDC.cshtml Vedi File

@@ -1,6 +1,6 @@
@{
ViewBag.Title = "经典版风格";
Layout = "~/Views/Shared/_Admin.cshtml";
Layout = "~/Views/Shared/_AdminForDC.cshtml.cshtml";
}
@Html.AppendCssFile("/Views/Home/AdminDefault/index.css")
<script>


+ 1
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-admin.js Vedi File

@@ -66,7 +66,7 @@ var loaddfimg;
userInit: function () {
var loginInfo = learun.clientdata.get(['userinfo']);
var _html = '<div class="lr-frame-personCenter"><a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown">';
_html += '<img id="userhead"src="' + top.$.rootUrl + '/LR_OrganizationModule/User/GetImg?userId=' + loginInfo.userId + '" >';
_html += '<img id="userhead"src="' + top.$.rootUrl + '/LR_OrganizationModule/User/GetImgForDC?userId=' + loginInfo.userId + '" >';
_html += '<span>' + loginInfo.realName + '</span>';
_html += '</a>';
_html += '<ul class="dropdown-menu pull-right">';
@@ -215,8 +215,6 @@ var loaddfimg;
//_html += '<div><label><input type="radio" name="ui_theme" value="3" ' + (uitheme == '3' ? 'checked' : '') + '>炫动版</label></div>';
_html += '<div><label><input type="radio" name="ui_theme" value="4" ' + (uitheme == '4' ? 'checked' : '') + '>飞扬版</label></div>';
_html += '<div><label><input type="radio" name="ui_theme" value="5" ' + (uitheme == '5' ? 'checked' : '') + '>导航版</label></div>';
_html += '<div><label><input type="radio" name="ui_theme" value="6" ' + (uitheme == '6' ? 'checked' : '') + '>主题5</label></div>';

_html += '</div>';
$setting.append($btn);
$setting.append(_html);


+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Admin.cshtml Vedi File

@@ -79,8 +79,7 @@

"/Views/LR_Content/plugin/workflow/lr-workflow-api.js",
"/Views/LR_Content/plugin/contextmenu/lr-contextmenu.js",
//"/Views/LR_Content/script/lr-im.js",
//"/Views/LR_Content/script/pushmessage.js",
"/Views/LR_Content/script/lr-im.js",

"/Views/LR_Content/script/lr-admin.js"
)


+ 121
- 64
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml Vedi File

@@ -17,7 +17,7 @@
<ul class="lr-left-list" id="lr_left_list">
<li data-value="1">基本信息</li>
@*<li data-value="2">联系方式</li>*@
<li data-value="3">我的头像</li>
@*<li data-value="3">我的头像</li>*@
<li data-value="4">修改密码</li>
<li data-value="5">我的日志</li>
@if (ViewBag.UserType == "学生")
@@ -223,22 +223,26 @@
},
nationalityNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
key: value,
code: 'National',
keyId: 'nationalityno',
callback: function (_data) {
result = _data.text;
result = _data['nationality'];
}
});
return result;
},
partyFaceNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
key: value,
code: 'PolityStatus',
keyId: 'partyfaceno',
callback: function (_data) {
result = _data.text;
result = _data['partyface'];
}
});
return result;
@@ -284,22 +288,27 @@
},
overseasChineseNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese',
key: value,
code: 'BCdOverseasChinese',
keyId: 'overseaschineseno',
callback: function (_data) {
result = _data.text;
result = _data.overseaschinesename;
}
});

return result;
},
healthStatusNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus',
key: value,
code: 'BCdHealthStatus',
keyId: 'healthstatusno',
callback: function (_data) {
result = _data.text;
result = _data.healthstatus;
}
});

@@ -373,8 +382,7 @@
<li>出生日期 : {{teacherInfo.Birthday | date}}</li>
<li>联系电话 : {{teacherInfo.mobile}}</li>
<li>校 &nbsp; &nbsp; &nbsp; 区 : {{baseInfo.companyId | company}}</li>
<li>教职工类别 : {{teacherInfo.EmpSortNo | empSortNo}}</li>
<li>聘任职称: {{teacherInfo.TitleOfTechPostNo | titleOfTechPostNo}}</li>
<li>部门 : {{teacherInfo.F_DepartmentId | department}}</li>
</ul>
</div>
</div>
@@ -387,41 +395,39 @@
<li>民 族 : {{teacherInfo.NationalityNo | nationalityNo}}</li>
<li>政治面貌 : {{teacherInfo.PartyFaceNo | partyFaceNo}}</li>
<li>身份证号 : {{teacherInfo.IdentityCardNo}} </li>
<li>E-mail : {{teacherInfo.EMail}}</li>
<li>健康状况 : {{teacherInfo.HealthStatusNo | healthStatusNo}}</li>
<li>档案所在地 : {{teacherInfo.LocusOfArchives}} </li>
<li>户口所在地 : {{teacherInfo.LocusOfResidence}} </li>
</ul>
</div>

<div class="userSec2Box">
<div class="userSec2T">家庭情况 <i class="fa fa-angle-right"></i></div>
<div class="userSec2T">学历学位信息 <i class="fa fa-angle-right"></i></div>
<ul class="userSec2List">
<li>港澳台侨 : {{teacherInfo.OverseasChineseNo | overseasChineseNo}} </li>
<li>健康状况 : {{teacherInfo.HealthStatusNo | healthStatusNo}}</li>
<li>家庭出身 : {{teacherInfo.FamilyOriginNo | familyOriginNo}} </li>
<li>外语语种 : {{teacherInfo.ForeignLanguageNo | foreignLanguageNo}} </li>
<li>户籍省份 : {{teacherInfo.ProvinceNo | provinceNo}} </li>
<li>户籍地市 : {{teacherInfo.CityNo | cityNo}} </li>
<li>户籍县区 : {{teacherInfo.RegionNo | regionNo}} </li>
<li>最高学历 : {{teacherInfo.HighestRecord | HighestRecordNo}} </li>
<li>获取方式 : {{teacherInfo.ObtainWayOfHighestRecord | ObtainWayNo}} </li>
<li>取得时间 : {{teacherInfo.HighestRecordGetTime}} </li>
<li>最高学位 : {{teacherInfo.DegreeNo | degreeNo}}</li>
<li>获取方式 : {{teacherInfo.ObtainWayOfHighestDegree | ObtainWayOfHighestDegreeNo}} </li>
<li>取得时间 : {{teacherInfo.HighestDegreeGetTime}} </li>
</ul>
</div>

<div class="userSec2Box">
<div class="userSec2T">其他 <i class="fa fa-angle-right"></i></div>
<div class="userSec2T">其他信息 <i class="fa fa-angle-right"></i></div>
<ul class="userSec2List">
<li>学科门 : {{teacherInfo.SubjectSpeciesNo | subjectSpeciesNo}}</li>
<li>现任职务: {{teacherInfo.Title}}</li>
<li>所在系部 : {{teacherInfo.DeptNo | deptNo}} </li>
<li>文化程度 : {{teacherInfo.CultureDegreeNo | cultureDegreeNo}} </li>
<li>毕业学校 : {{teacherInfo.GraduateSchoolName}} </li>
<li>最高学位 : {{teacherInfo.DegreeNo | degreeNo}}</li>
<li>来校年月 : {{teacherInfo.SchoolDate | date}}</li>
<li>毕业时间 : {{teacherInfo.GraduateDate1}} </li>
<li>是否代课 : {{teacherInfo.IsHasLesson | IsHasLessonNo}}</li>
<li>文化程度 : {{teacherInfo.CultureDegreeNo | cultureDegreeNo}} </li>
<li>现任职务: {{teacherInfo.Title}}</li>
</ul>
</div>

<div class="userSec2Box">
<div class="userSec2T">联系方式 <i class="fa fa-angle-right"></i></div>
<ul class="userSec2List">
<li>手机号码 : {{teacherInfo.mobile}}</li>
<li>紧急联系人 : {{teacherInfo.Linkman}}</li>
<li>紧急联系人电话 : {{teacherInfo.PhoneOfLinkman}}</li>
</ul>
@@ -443,8 +449,6 @@
$.get('/UserCenter/GetTeacherInfo', function (ref) {
this.teacherInfo = ref.data.userInfo;
this.baseInfo = ref.data.basecInfo;
console.log(ref);

}.bind(this), "json");
},
getUrl: function () {
@@ -476,48 +480,71 @@
});
return result;
},
department: function (value) {
var result;
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
keyId: 'f_departmentid',
callback: function (_data) {
result = _data.f_fullname;
}
});
return result;
},
nationalityNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
key: value,
code: 'National',
keyId: 'nationalityno',
callback: function (_data) {
result = _data.text;
result = _data['nationality'];
}
});
return result;
},
partyFaceNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
key: value,
code: 'PolityStatus',
keyId: 'partyfaceno',
callback: function (_data) {
result = _data.text;
result = _data['partyface'];
}
});
return result;
},
overseasChineseNo: function (value) {
HighestRecordNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree',
key: value,
code: 'BCdOverseasChinese',
keyId: 'culturedegreeno',
callback: function (_data) {
result = _data.text;
result = _data.culturedegree;
}
});

return result;
},
healthStatusNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus',
key: value,
code: 'BCdHealthStatus',
keyId: 'healthstatusno',
callback: function (_data) {
result = _data.text;
result = _data.healthstatus;
}
});

return result;
},
deptNo: function (value) {
@@ -534,31 +561,33 @@
},
subjectSpeciesNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
top.learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdSubjectSpecies',
key: value,
code: 'BCdSubjectSpecies',
keyId: 'subjectspeciesno',
callback: function (_data) {
result = _data.text;
}
result = _data.subjectspecies;
}.bind(this)
});
return result;
},
familyOriginNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
top.learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdFamilyOrigin',
key: value,
code: 'BCdFamilyOrigin',
keyId: 'familyoriginno',
callback: function (_data) {
result = _data.text;
}
result = _data.familyorigin;
}.bind(this)
});
return result;
},
foreignLanguageNo: function (value) {
ObtainWayNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
key: value,
code: 'BCdForeignLanguage',
code: 'ObtainWay',
callback: function (_data) {
result = _data.text;
}
@@ -606,20 +635,35 @@
},
cultureDegreeNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree',
key: value,
code: 'RecordInSchool',
keyId: 'culturedegreeno',
callback: function (_data) {
result = _data.text;
result = _data['culturedegree'];
}
});
return result;
},
degreeNo: function (value) {
var result;
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdDegree',
key: value,
keyId: 'degreeno',
callback: function (_data) {
result = _data['degreename'];
}
});
return result;
},
ObtainWayOfHighestDegreeNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
key: value,
code: 'DegreeInSchool',
code: 'ObtainWayOfDegree',
callback: function (_data) {
result = _data.text;
}
@@ -638,10 +682,23 @@
return result;
},
titleOfTechPostNo: function (value) {
var result;
top.learun.clientdata.getAsync('custmerData', {
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdTitleOfTechPost',
key: value,
keyId: 'titleoftechpostno',
callback: function (_data) {
result = _data['titleoftechpost'];
}
});
return result;
},
IsHasLessonNo: function (value) {
var result;
top.learun.clientdata.getAsync('dataItem', {
key: value,
code: 'BCdTitleOfTechPost',
code: 'YesOrNoBit',
callback: function (_data) {
result = _data.text;
}
@@ -685,7 +742,7 @@
@if (ViewBag.UserType == "学生")
{
<div class="lr-layout-wrap-item " id="lr_layout_item6" style="padding: 10;">
<center><h3> 塔里木职业技术学院</h3></center>
<center><h3> 西昌民族幼儿师范高等专科学校</h3></center>
<center>
<h3>
选修课选课流程
@@ -737,7 +794,7 @@

$(function () {
var loginInfo = top.learun.clientdata.get(['userinfo']);
$("#headUrl").attr("src", "/LR_OrganizationModule/User/GetImg?userId=" + loginInfo.userId);
$("#headUrl").attr("src", "/LR_OrganizationModule/User/GetImgForDC?userId=" + loginInfo.userId);

if ('@ViewBag.UserType' == '学生') {
$("#lr_left_list").children('li').eq(4).addClass("active");
@@ -777,4 +834,4 @@
}
});
</script>
@Html.AppendJsFile("/Views/UserCenter/Index.js")
@Html.AppendJsFile("/Views/UserCenter/IndexForDC.js")

+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.js Vedi File

@@ -69,6 +69,8 @@ var bootstrap = function ($, learun) {
learun.alert.error('数据加载失败');
}
}.bind(this));

//console.log("成功");
}
};
refreshGirdData = function () {


+ 7
- 0
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj Vedi File

@@ -165,8 +165,10 @@
<Content Include="favicon.ico" />
<Content Include="index.html" />
<Content Include="packages.config" />
<Content Include="Modules\Feixing\_sgbak\UserApiController.cs.14708.1.2019-11-27.17-54-45.9048" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile2.pubxml" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -190,6 +192,8 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Bootstraper.cs" />
<Compile Include="Modules\AssetManagementSystem\Ass_AssetsInfoItemApi.cs" />
<Compile Include="Modules\AttendanceApi.cs" />
<Compile Include="Modules\EnrollTemplateApi.cs" />
<Compile Include="Modules\AnnexesApiWx.cs" />
<Compile Include="Modules\BaseNoLoginApi.cs" />
@@ -210,8 +214,10 @@
<Compile Include="Modules\ListenClassRecordApi.cs" />
<Compile Include="Modules\MpManagementApi.cs" />
<Compile Include="Modules\PersonnelManagement\EpidemicSituationCopyApi.cs" />
<Compile Include="Modules\StuEnrollApi.cs" />
<Compile Include="Modules\StuInfoBasicApi.cs" />
<Compile Include="Modules\StatisticsApi.cs" />
<Compile Include="Modules\StuScoreApi.cs" />
<Compile Include="Modules\TaiGang\TUserApi.cs" />
<Compile Include="Modules\TeacherWorkloadApi.cs" />
<Compile Include="Modules\PersonnelManagement\DutyScheduleApi.cs" />
@@ -259,6 +265,7 @@
<Compile Include="Modules\LR_Crm\CrmOrder.cs" />
<Compile Include="Modules\LR_Crm\Invoice.cs" />
<Compile Include="Modules\TimeTable.cs" />
<Compile Include="Modules\TransferApi.cs" />
<Compile Include="Modules\UtilityApi.cs" />
<Compile Include="Modules\WeixinApi.cs" />
<Compile Include="Modules\WorkFlowApi.cs" />


+ 11
- 0
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs Vedi File

@@ -175,6 +175,17 @@ namespace Learun.Application.WebApi
/// <returns></returns>
private Response BeforeRequest(NancyContext ctx)
{
ctx.Request.Url.Query = Learun.Util.WebHelper.Formatstr(ctx.Request.Url.Query);
foreach (var p in ctx.Parameters)
{
if (p.ParameterType == typeof(string))
{
if (ctx.Parameters[p.ParameterName] != null)
{
ctx.Parameters[p.ParameterName] = Learun.Util.WebHelper.Formatstr(ctx.Parameters[p.ParameterName].ToString());
}
}
}
string path = ctx.ResolvedRoute.Description.Path;
//验证登录状态
ReqParameter req = this.Bind<ReqParameter>();


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml Vedi File

@@ -13,6 +13,6 @@
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<publishUrl>bin\Release\Publish</publishUrl>
<DeleteExistingFiles>False</DeleteExistingFiles>
<DeleteExistingFiles>True</DeleteExistingFiles>
</PropertyGroup>
</Project>

+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config Vedi File

@@ -25,7 +25,7 @@
<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />-->

<!--西昌-->
<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_娄底;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_娄底;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
</connectionStrings>

+ 26
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoBLL.cs Vedi File

@@ -43,6 +43,32 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}

/// <summary>
/// 获取页面显示列表数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<VaccinationInfoEntity> GetPageListForTeacher(Pagination pagination, string queryJson)
{
try
{
return vaccinationInfoService.GetPageListForTeacher(pagination, queryJson);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 获取VaccinationInfo表实体数据
/// </summary>


+ 3
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoEntity.cs Vedi File

@@ -164,6 +164,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
#endregion
#region 扩展字段
[NotMapped]
public string IsInActiveStatus { get; set; }

#endregion
}
}


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoIBLL.cs Vedi File

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
IEnumerable<VaccinationInfoEntity> GetPageList(Pagination pagination, string queryJson);
IEnumerable<VaccinationInfoEntity> GetPageListForTeacher(Pagination pagination, string queryJson);
/// <summary>
/// 获取VaccinationInfo表实体数据
/// </summary>


+ 58
- 5
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs Vedi File

@@ -33,9 +33,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(@" t.* ");
strSql.Append(@" t.Id,t.StuNo,t.StuName,s.IdentityCardNo as CardId,s.DeptNo,s.MajorNo,s.ClassNo,s.Mobile,t.VaccineType,
t.VaccineAddress,t.FirstNeedle,t.SecondNeedle,t.ThirdNeedle,t.NotReason,t.Remark,t.CreateTime,t.CreateUser,t.LastTime,t.LastUser ");
strSql.Append(" FROM VaccinationInfo t ");
strSql.Append(" left join ClassInfo c on t.classno = c.classno ");
strSql.Append(" left join StuInfoBasic s on s.stuno=t.stuno ");
strSql.Append(" left join ClassInfo c on s.classno = c.classno ");
strSql.Append(" WHERE 1=1 ");
var login = LoginUserInfo.Get();
var queryParam = queryJson.ToJObject();
@@ -103,8 +105,56 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}
}
else if (StuOrTeach == "1")
var data = this.BaseRepository("CollegeMIS").FindList<VaccinationInfoEntity>(strSql.ToString(), dp, pagination);
if (data.Count() > 0 && StuOrTeach == "0")
{
foreach (var item in data)
{
if (!string.IsNullOrEmpty(item.CardId))
{
item.Age = DateTime.Now.Year - Convert.ToInt32(item.CardId.ToString().Substring(6, 4));
}
}
}
return data;
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

/// <summary>
/// 获取页面显示列表数据(老师)
/// </summary>
/// <param name="pagination">查询参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<VaccinationInfoEntity> GetPageListForTeacher(Pagination pagination, string queryJson)
{
try
{
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(@" t.Id,t.EmpNo,s.EmpName,s.IdentityCardNo as CardId,s.F_DepartmentId,s.Mobile,s.IsInActiveStatus,t.VaccineType,
t.VaccineAddress,t.FirstNeedle,t.SecondNeedle,t.ThirdNeedle,t.NotReason,t.Remark,t.CreateTime,t.CreateUser,t.LastTime,t.LastUser ");
strSql.Append(" FROM VaccinationInfo t ");
strSql.Append(" left join empinfo s on s.empno=t.empno ");
strSql.Append(" WHERE 1=1 ");
var login = LoginUserInfo.Get();
var queryParam = queryJson.ToJObject();
// 虚拟参数
var dp = new DynamicParameters(new { });
var StuOrTeach = queryParam["StuOrTeach"].ToString();
if (!queryParam["StuOrTeach"].IsEmpty())
{
dp.Add("StuOrTeach", queryParam["StuOrTeach"].ToString(), DbType.Int32);
@@ -140,14 +190,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String);
strSql.Append(" AND t.EmpName Like @EmpName ");
}
}

var data = this.BaseRepository("CollegeMIS").FindList<VaccinationInfoEntity>(strSql.ToString(), dp, pagination);
if (data.Count() > 0 && StuOrTeach == "0")
{
foreach (var item in data)
{
item.Age = DateTime.Now.Year - Convert.ToInt32(item.CardId.ToString().Substring(6, 4));
if (!string.IsNullOrEmpty(item.CardId))
{
item.Age = DateTime.Now.Year - Convert.ToInt32(item.CardId.ToString().Substring(6, 4));
}
}
}
return data;


+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/WebHelper.cs Vedi File

@@ -345,6 +345,7 @@ namespace Learun.Util
System.Text.RegularExpressions.Regex regex10 = new System.Text.RegularExpressions.Regex(@"select", System.Text.RegularExpressions.RegexOptions.IgnoreCase);
System.Text.RegularExpressions.Regex regex11 = new System.Text.RegularExpressions.Regex(@"update", System.Text.RegularExpressions.RegexOptions.IgnoreCase);
System.Text.RegularExpressions.Regex regex12 = new System.Text.RegularExpressions.Regex(@"delete", System.Text.RegularExpressions.RegexOptions.IgnoreCase);
System.Text.RegularExpressions.Regex regex13 = new System.Text.RegularExpressions.Regex(@"exec", System.Text.RegularExpressions.RegexOptions.IgnoreCase);
html = regex1.Replace(html, ""); //过滤<script></script>标记
html = regex2.Replace(html, ""); //过滤href=javascript: (<A>) 属性
html = regex3.Replace(html, " _disibledevent="); //过滤其它控件的on...事件
@@ -352,6 +353,7 @@ namespace Learun.Util
html = regex10.Replace(html, "s_elect");
html = regex11.Replace(html, "u_pudate");
html = regex12.Replace(html, "d_elete");
html = regex13.Replace(html, "e_xec");
html = html.Replace("'", "’");
html = html.Replace("&nbsp;", " ");
return html;


Scrivi Anteprima
Caricamento…
Annulla
Salva