diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdMajorController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdMajorController.cs index caea2b776..a02d01306 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdMajorController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdMajorController.cs @@ -200,16 +200,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Fail("不能修改关联学科"); } cdMajorIBLL.SaveEntity(keyValue, entity); - #region 给关联表添加科目 - MajorAndSubjectEntity majorAndSubjectEntity = new MajorAndSubjectEntity(); - string[] SubNo = entity.SubjectNo.Split(','); - for (int i = 0; i < SubNo.Length; i++) - { - majorAndSubjectEntity.MajorId = entity.ID;//关联专业主键 - majorAndSubjectEntity.SubId = SubNo[i];//考试科目的主键 - majorAndSubjectIBLL.SaveEntity("", majorAndSubjectEntity); - } - #endregion + //#region 给关联表添加科目 + //MajorAndSubjectEntity majorAndSubjectEntity = new MajorAndSubjectEntity(); + //string[] SubNo = entity.SubjectNo.Split(','); + //for (int i = 0; i < SubNo.Length; i++) + //{ + // majorAndSubjectEntity.MajorId = entity.ID;//关联专业主键 + // majorAndSubjectEntity.SubId = SubNo[i];//考试科目的主键 + // majorAndSubjectIBLL.SaveEntity("", majorAndSubjectEntity); + //} + //#endregion return Success("保存成功！"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs index 89e5b88b9..d1adbd88e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs @@ -948,6 +948,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// public ActionResult UpdateEnrollStatus(string keyValue, string strEntity) { + var StuEnrollData = stuEnrollIBLL.GetStuEnrollEntity(keyValue); + if (string.IsNullOrEmpty(StuEnrollData.SubjectNo) ) + { + return Fail("考试科目不能为空！"); + } + stuEnrollIBLL.UpdateEnrollStatus(keyValue, 2); return Success("保存成功"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs index fe1805a70..78b3935d2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs @@ -15,14 +15,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { private StuEnrollIBLL stuEnrollIBLL = new StuEnrollBLL(); + #region 视图 public ActionResult Link() { return View(); } + public ActionResult Form() { return View(); } + public ActionResult Search(int type) { if (type == 1) @@ -37,11 +40,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } return View(); } + public ActionResult SearchResult() { return View(); } + /// + /// 招生简章 + /// + /// + public ActionResult StuRecruitmentBrochure() + { + return View(); + } + + #endregion + + /// /// 报名 /// @@ -57,7 +73,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers List scoreData = scoreList.ToObject>(); if (string.IsNullOrEmpty(keyValue)) { - var model = stuEnrollIBLL.GetEntityByPersonalData(entity.IDCard, entity.StuMobile); + var model = stuEnrollIBLL.GetEntityByPersonalData(entity.IDCard, entity.StuName); if (model != null) { return Fail("您已报名，请耐心等待结果！"); @@ -99,20 +115,20 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(jsonData); } /// - /// 下载入学须知 + /// 下载 /// + /// 文件名称 + /// 原文件名称 /// - [HttpPost] - [AjaxOnly] - public ActionResult FileDownLoad() + public ActionResult FileDownLoad(string name, string pathName) { FileStreamResult result = null; try { var path = Server.MapPath("~/Content/otherFile/"); - var pathoffull = path + "入学须知.pdf"; - FileStream fsread = fsread = new FileStream(pathoffull, FileMode.OpenOrCreate, FileAccess.ReadWrite); - result = File(fsread, "application/pdf", "入学须知.pdf"); + var pathoffull = path + pathName; + FileStream fsread = new FileStream(pathoffull, FileMode.OpenOrCreate, FileAccess.ReadWrite); + result = File(fsread, "application/pdf", name + ".pdf"); return result; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml index c35a6aa7d..4c54dde0e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml @@ -23,11 +23,12 @@
校区*
-
-
考试科目*
-
- -
+ @*考试科目在报名管理下维护 +
+
考试科目*
+
+ +
*@
年度*
@@ -45,13 +46,13 @@
@*
-
名称缩写
- -
-
-
英文名称
- -
*@ +
名称缩写
+ + +
+
英文名称
+ +
*@
教委专业代码
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.cshtml index 647322a22..a82eba669 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.cshtml @@ -47,22 +47,25 @@
县区*
- @* *@
-
+
专业*
+
+
考试科目*
+
+
-
身份证正面照片*
+
身份证正面照*
-
身份证反面照片*
+
身份证反面照*
-
初中毕业证照片*
+
初中毕业证照*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js index 01787dfaf..62b7c668a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js @@ -23,7 +23,13 @@ var bootstrap = function ($, learun) { $('#MidAchievementPto').lrUploader(); $('#Gender').lrDataItemSelect({ code: 'usersexbit' }); $('#Nationals').lrDataItemSelect({ code: 'National' }); - + $('#SubjectNo').lrselect({ + type: 'multiple', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ExamSubject', + value: 'subjectno', + text: 'subjectname', + maxHeight: 200 + }); //地市 $('#City').lrselect({ allowSearch: true, @@ -58,42 +64,33 @@ var bootstrap = function ($, learun) { value: "acode", text: "aname", maxHeight: 200, - select: function (item) { - if (item) { - var countyCode = $("#County").lrselectGet(); + //select: function (item) { + // if (item) { + // var countyCode = $("#County").lrselectGet(); - //专业 - $('#MajorNo').lrselectRefresh({ - url: top.$.rootUrl + - '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', - param: { - //strWhere: "1=1 and Area='" + countyCode + "'" - strWhere: "1=1" - }, - value: "id", - text: "majorname", - maxHeight: 200, - }); - if (MajorNo) { - $('#MajorNo').lrselectSet(MajorNo); - MajorNo = ''; - } - } + // //专业 + // $('#MajorNo').lrselectRefresh({ + // url: top.$.rootUrl + + // '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + // param: { + // //strWhere: "1=1 and Area='" + countyCode + "'" + // strWhere: "1=1" + // }, + // value: "id", + // text: "majorname", + // maxHeight: 200, + // }); + // if (MajorNo) { + // $('#MajorNo').lrselectSet(MajorNo); + // MajorNo = ''; + // } + // } - } + //} }); //专业 $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' }); - //$('#MajorNo').lrselectRefresh({ - // url: top.$.rootUrl + - // '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', - // param: { - // strWhere: "1=1" - // }, - // value: "id", - // text: "majorname", - // maxHeight: 200, - //}); + $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); @@ -146,7 +143,8 @@ var bootstrap = function ($, learun) { acceptClick = function (callBack) { if (!$('body').lrValidform()) { return false; - } var scoreList = []; + } + var scoreList = []; $.each($("#scoreDiv .SEMidExamScore"), function (i, item) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.cshtml index 1240a8a86..f05b81ebe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.cshtml @@ -57,20 +57,24 @@
县区*
-
+
专业*
-
+
+
+
+
考试科目*
+
-
身份证正面照片*
+
身份证正面照*
-
身份证反面照片*
+
身份证反面照*
-
初中毕业证照片*
+
初中毕业证照*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js index 6d2fe7bb1..b7f2f7472 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js @@ -32,6 +32,13 @@ var bootstrap = function ($, learun) { $('#Nationals').lrDataItemSelect({ code: 'National' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' }); $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); + $('#SubjectNo').lrselect({ + type: 'multiple', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ExamSubject', + value: 'subjectno', + text: 'subjectname', + maxHeight: 200 + }); //地市 $('#City').lrselect({ allowSearch: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollIndex.js index 2f3967c22..0476091bb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollIndex.js @@ -89,7 +89,7 @@ var bootstrap = function ($, learun) { id: 'form', title: '查看', url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/EnrollFormView?keyValue=' + keyValue, - width: 800, + width: 900, height: 700, btn: null }); @@ -108,7 +108,7 @@ var bootstrap = function ($, learun) { id: 'form', title: '审核', url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/EnrollSH?keyValue=' + keyValue, - width: 700, + width: 900, height: 700, btn: ['确认审核', '取消'], callBack: function (id) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollSH.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollSH.cshtml index c7ad0787d..431dd281c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollSH.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollSH.cshtml @@ -40,6 +40,7 @@
中考总分*
+
毕业学校*
@@ -56,9 +57,13 @@
县区*
-
+
专业*
-
+
+
+
+
考试科目*
+
身份证正面照片*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollSH.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollSH.js index f2bde2911..ccf81131f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollSH.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollSH.js @@ -22,6 +22,13 @@ var bootstrap = function ($, learun) { type: 'radio', code: 'YesOrNoBit', }); + $('#SubjectNo').lrselect({ + type: 'multiple', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ExamSubject', + value: 'subjectno', + text: 'subjectname', + maxHeight: 200 + }); $('#IdCardPto1').lrUploader(); $('#IdCardPto2').lrUploader(); $('#MidDiplomaPto').lrUploader(); @@ -96,6 +103,17 @@ var bootstrap = function ($, learun) { } } MajorNo = data.StuEnroll.MajorNo; + var str = ''; + if (!!data.StuEnrollMidExamScore) { + $.each(data.StuEnrollMidExamScore, + function (i, item) { + str += '
'; + str += '
' + item.subjectName + '
'; + str += ''; + str += '
'; + }); + $('#scoreDiv').html(str); + } }); learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetExamDataByStuId?keyValue=' + keyValue, function (res) { var html = ''; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Link.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Link.cshtml index fdbdd8740..1a412c3f3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Link.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Link.cshtml @@ -32,6 +32,8 @@
查询考试地点及时间
查询录取结果
+
招生简章
+
专业介绍
@@ -45,7 +47,14 @@ $('#loc').attr('href', '/EducationalAdministration/StuEnrollPhone/Search?type=1'); //查询录取结果 $('#res').attr('href', '/EducationalAdministration/StuEnrollPhone/Search?type=2'); - }) + //招生简章 + $('#stuRecruitmentBrochure').attr('href', '/EducationalAdministration/StuEnrollPhone/StuRecruitmentBrochure'); + + $('.major').find('a').on('click', + function () { + location.href = "/EducationalAdministration/StuEnrollPhone/FileDownLoad?name=" + '2022年各专业介绍'+'&pathName='+'各专业介绍.pdf'; + }); + }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml index 68a3ad432..7ea8a53f9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml @@ -61,42 +61,9 @@ var form = layui.form; //按钮点击 form.on('submit(*)', function (data) { - //var strEntity = JSON.stringify(data.field); - location.href = '/EducationalAdministration/StuEnrollPhone/SearchResult?type=' + type + '&StuName=' + encodeURI(encodeURI($('#StuName').val())) + '&IDCard=' + $('#IDCard').val(); - //$.ajax({ - // url: '/EducationalAdministration/StuEnrollPhone/SearchForm?type=' + type, - // data: { strEntity: strEntity }, - // type: "GET", - // dataType: "json", - // async: true, - // cache: false, - // success: function (data) { - // if (data.code == 200) { - // alert("报名成功，请等待考试通知！"); - // } else { - // alert(data.info); - // } - // }, - // error: function (XMLHttpRequest, textStatus, errorThrown) { - // }, - // beforeSend: function () { - // }, - // complete: function () { - // } - //}); - //return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。 - + }); - - //var laydate = layui.laydate; - - //时间选择 - //laydate.render({ - // elem: '#Birthday', - // min: today.y + '-' + today.m + '-' + today.d - //}); - }); $(window).load(function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml index 5283b9fe5..6f560f24c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml @@ -37,9 +37,9 @@
@*
- * 手机号 - -
*@ + * 手机号 + +
*@
* 考试信息
@@ -51,11 +51,12 @@
- 录取成功，请手机截屏，保存结果图片，报名时出示此图片！ - +     注：请手机截屏录取成功，保存结果图片，报名时出示此图片换取录取通知书！ +
+
- +
@@ -76,8 +77,6 @@ //var StuMobile = request('StuMobile'); layui.use(['form', 'laydate', 'upload'], function () { var form = layui.form; - - }); $(window).load(function () { $('#admmsg').hide(); @@ -103,7 +102,7 @@ if (data.StuEnroll) { $('#StuName').val(decodeURI(StuName)); $('#IDCard').val(IDCard); - // $('#StuMobile').val(StuMobile); + // $('#StuMobile').val(StuMobile); //$('#ExamLocation').val(data.StuEnroll.ExamLocation); //if (data.StuEnroll.ExamStartTime) { // $('#ExamStartTime').val(data.StuEnroll.ExamStartTime + '~' + data.StuEnroll.ExamEndTime); @@ -119,7 +118,8 @@ } } else { - $('#app').html(''); + $('#app').html( + ''); } if (data.examData) { var examData = data.examData; @@ -129,11 +129,15 @@ var etime = examData[i].BeginTime + '~' + examData[i].EndTime; html += '
'; html += ' 科目'; - html += ''; + html += ''; html += '
'; html += '
'; html += ' 时间'; - html += ''; + html += ''; html += '
'; html += '
'; @@ -155,42 +159,12 @@ }); $('#fileDownLoad').find('a').on('click', - function() { + function () { //下载入学须知 - //var url = ""; - //var a = document.createElement('a'); - //a.download = 'text.zip'; - //a.href = url; - //a.target = '_bank'; - //document.appendChild(a); - //a.click(); - //document.removeChild(); - $.ajax({ - url: '/EducationalAdministration/StuEnrollPhone/FileDownLoad', - type: "Post", - dataType: "json", - async: true, - cache: false, - success: function (data) { - if (data.code == 200) { - - - } else { - alert(data.info); - } - }, - error: function (XMLHttpRequest, textStatus, errorThrown) { - }, - beforeSend: function () { - }, - complete: function () { - } - }); + location.href = "/EducationalAdministration/StuEnrollPhone/FileDownLoad?name=" + '2022年新生入学须知' + '&pathName=' + '新生入学须知.pdf';; }); - renderForm(); - - }) + }); //重新渲染表单 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/StuRecruitmentBrochure.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/StuRecruitmentBrochure.cshtml new file mode 100644 index 000000000..d4f548940 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/StuRecruitmentBrochure.cshtml @@ -0,0 +1,67 @@ +@{ + + Layout = null; +} + + + + + + + + + + 招生简章 + + + + + + + + + + +
+ +
+
+ @*
招生简章
*@ + +
+
+
+ +
Copyright © 2019 数字化智慧校园 版权所有
+ + + + + + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js index cbd956220..deec20bd0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js @@ -54,7 +54,7 @@ var bootstrap = function ($, learun) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ExamSubject', key: value, - keyId: 'id', + keyId: 'subjectno', callback: function (_data) { callback(_data['subjectname']); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/StuRecruitmentBrochure.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/StuRecruitmentBrochure.jpg new file mode 100644 index 000000000..46b72076b Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/StuRecruitmentBrochure.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/入学须知.pdf b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/入学须知.pdf deleted file mode 100644 index 139f6b9e6..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/入学须知.pdf +++ /dev/null @@ -1,55 +0,0 @@ - 数字化智慧校园 -统一身份认证补充接口 - - V1.0 - 概述 - - 根据特定需求开发补充接口 - -登录接口 - - 采用标准 Http GET 请求发送用户名、密码到认证接口，接口实现用户名密码判定后返 -回标准 json； - -请求地址：http://10.30.0.10:8000/Login/CheckLoginForSSOBC -请求方式：发送标准 Http GET 请求到认证地址 - -接口请求参数 说明 - 参数 - 用户名 -u 密码 -p - -认证接口返回参数 - - 参数 说明 - -code 状态码 返回 200 成功、其他失败 - -info 状态消息 返回 login success 表示登录成功、其他失败 - -data 保留 暂时无用 - -登录成功后，认证服务器将在用户浏览器 cookies 中写入数字化智慧校园系统数据，第三方 -系统可直接跳转到 http://10.30.0.10:8000/Home/Index 进入数字化智慧校园系统。 - -退出登录接口 - - 第三方系统退出时，需要主动调用退出登录接口以同步数字化智慧校园系统退出状态。 - 采用标准 Http POST 请求，返回标准 json； - -请求地址：http://10.30.0.10:8000/Login/OutLoginForSSOBC -请求方式：发送标准 Http POST 请求到认证地址 - -接口请求参数：无 - -认证接口返回参数 - - 参数 说明 - -code 状态码 返回 200 成功、其他失败 - -info 状态消息 返回 logout success 表示退出成功、其他失败 - -data 保留 暂时无用 - \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/各专业介绍.pdf b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/各专业介绍.pdf new file mode 100644 index 000000000..fb597b4c7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/各专业介绍.pdf @@ -0,0 +1,175 @@ +新疆广播电视学校2022年招生 + 专业代码：760202 + 培养目标 + + 培养具有工匠精神和信息素养、掌握扎实的科 +学文化基础和摄影摄像、音视频编辑、短视频制作 +等知识、德智体美劳全面发展的社会主义建设者和 +接班人。面向影视制作公司、广告公司、音像制作 +公司、网络公司、婚庆礼仪公司、企事业单位等行 +业企业,培养从事影视节目摄影、摄像人员、后期制 +作人员、策划人员以及基层广播电视台从事新闻工 +作的德智体美全面发展的技能型应用人才。 + 就业单位 就业面向 + 就业岗位 + 专业课程介绍 + + 电视选题与策划 + 影视作品赏析 + 影视摄像 + 电视音乐音响 + 视听语言 + 影视剪辑 + 非线性编辑 + 影视后期合成 + 电视专题节目制作 + 数字特技制作（AE） + 音频编辑 + 摄影构图 + 电视照明 + 电视文案写作 + 升学专业 + +高职：电视节目制作专业 影 +视多媒体、摄影与摄像技术 + +本科：广播电视编导专业 数 +字媒体艺术 广播电视新闻专 +业 + 职业资格证 + 专业代码：760201 + 培养目标 + + 培养具有工匠精神和信息素养、掌握 +扎实的科学文化基础和播音主持基本知识 +及传媒行业相关法律法规、德智体美劳全 +面发展的社会主义建设者和接班人。面向 +广播电台、电视台、影视制作公司、广告 +公司、婚庆礼仪公司、企事业单位等行业 +企业,培养从事播音主持、现场报道、少 +数民族语言影视配音、公关礼仪工作的德 +智体美全面发展的技能型应用人才。 + 就业单位 就业面向 + 就业岗位 + 专业课程介绍 + +播音发声 影视化妆 +普通话语音 口语述评与模拟主持 +播音作品欣赏 客户呼叫服务 +播音主持语言表达 新闻播音 +播音主持训练 专题播音 +广播播音主持 新闻直播 +电视播音主持 庆典类节目主持 + 升学专业 + 职业资格证书 + + 呼叫中心客户服务与管理 + 电商直播 + 新媒体技术 + 播音员与节目主持 + 专业代码：710204 + 培养目标 + + 培养具有工匠精神和信息素养、掌握扎实的 +科学文化基础和视听语言基本规律、图形与动 +画技术、数字媒体技术等知识德智体美劳全面 +发展的社会主义建设者和接班人。面向数字媒 +体技术应用领域，培养从事数字影像处理、新 +媒体技术、无人机拍摄、融媒体内容制作、数 +字音像设备使用与维护等工作，德智体美劳全 +面发展的高素质劳动者和技能型人才。 + 专业面向 + + 面向数字媒 数字图像处理人员 +体技术应用领域，培 新媒体技术人员 +养从事数字影像处理、 融媒体技术人员 +新媒体技术、无人机 摄影摄像人员 +拍摄、融媒体内容制 数字视影视后期处理 +作、数字音像设备使 人员 +用与维护等工作的专 录音师、音响调音员 +业技术人员 + 专业课程介绍 + 升学专业与职业资格证书 + +升学专业: 职业资格证书 + +影视多媒体技术 数字影像处理 +音像技术 新媒体技术 +摄影摄像技术 融媒体内容制作 +融媒体技术与运营 无人机驾驶 +网络直播与运营 +数字媒体设备应用与管理 + 专业代码：710202 + 培养目标 + + 培养具有工匠精神和信息素养、掌握扎实 +的科学文化基础和网络规划、网络技术、程序 +设计等知识，德智体美劳全面发展的社会主义 +建设者和接班人。面向计算机网络技术的集成 +与应用领域，培养从事网络组建、网络设备安 +装与调试、网络系统维护与管理、网络产品营 +销以及相关产品销售等工作，德智体美全面发 +展的高素质劳动者和技能型人才。 + 专业面向 + + 就业面向 就业岗位 + + 面向计算机网络技术的集 网络设备调试员 +成与应用领域，培养从事网络 算机网络管理员 +组建、网络设备安装与调试、 网络编辑员 +网络系统维护与管理、网络产 电子商务师 +品营销以及相关产品销售等工 +作 + 专业课程介绍 + +常用工具软件 网页设计与制作 +电工电子技能与技术 网络安全技术 +计算机网络技术基础 计算机网络设备应用 +计算机组装与维护 电子商务应用 +网络设计方案 +综合布线设计与设工 +计算机图像处理/photoshop +计算机图形处理/CAD + 升学专业与职业资格 + + 升学专业 职业资格证书 + +计算机应用技术 网络设备安装与调试 +计算机网络技术 5G网络运营与维护 +计算机网络与安全管理 电子商务 +网络系统管理 +网络工程 + 专业代码：710103 + 培养目标 + + 掌握电工技术、电子技术、电子装配工艺、电子线路设计 +等知识，具备电子产品装配与调试、仪器仪表装配与维修等 +能力，主要面向电子产品生产和各类广播电视发射台、网络 +公司等行业企业，培养从事电子整机生产、安装、服务和管 +理以及电子设备装配、调试、维修与售后等工作；数字广播 +电视技术设备的维护和机房值班等工作，具有一定可持续发 +展和创新能力，理论知识和实践技能相结合，德智体美劳全 +面发展的高素质劳动者和技能型人才。 + 专业面向 +就业面向： + + 面向电子产品生产和 就业岗位： +各类广播电视发射台、网 +络公司等行业企业，培养 电子产品装配工 +从事电子整机生产、安装、 电子产品检验员 +服务和管理以及电子设备 数字广播电视机线员 +装配、调试、维修与售后 +等工作及数字广播电视技 +术设备的维护和机房值班 +等工作的专业人员。 + 专业课程介绍 + +电工技术基础与技能 数字卫星技术 +电子测量仪器 数字广播电视发送与接收技术 +数字电视技术 数字视听设备使用与维修 +光纤通信技术 电子产品检验技术 +有线电视系统设计与施工 + 升学专业与职业资格证书 + + 职业资格证书: + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/新生入学须知.pdf b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/新生入学须知.pdf new file mode 100644 index 000000000..df7934d80 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/新生入学须知.pdf @@ -0,0 +1,66 @@ + 新疆广播电视学校 2022 年普通中专 + 新生入学须知 + + 祝贺你已被我校录取、欢迎你来我校学习！现将入学有关事宜通知如下： + 一、请你持录取通知书于 9 月 5 日至 7 日来我校报到。 + 温馨提示： + 新生来学校报到时请提前准备好“7 日通信大数据行程码”、“新疆政务服务 +码”或“乌鲁木齐畅行码”（绿码）及 48 小时有效的核酸检测报告（阴性），学 +校要进行身份核验和体温检测。 + 疫情期间，请予理解和配合。 + 二、新生报到时，需携带以下物品： + １、录取通知书。 + ２、初中毕业证书的原件和复印件（要求复印到同一张 A4 纸面上）一份以 +及初中纸质档案。 + ３、户口复印件（要求将户口首页、户主页和本人页复印到同一张 A4 纸面 +上）四份、身份证复印件（要求将身份证正反面复印到同一张 A4 纸面上）四份。 + ４、近期一寸免冠证件照片四张，团员证或团组织关系。 + ５、学校实行准军事化管理，被褥在学校统一购买（被褥预计 365 元，含 +被子、褥子、枕头各一个，被套、床单、枕巾各两个，盆子两个等），其余生活、 +学习用品以及伙食费自备。 + 三、凡被我校录取有正式学籍的在校生可按现行国家规定享受以下政策。 + １、所有学生全部享受免学费政策。 +免学费标准: + 播音与主持：3300 元/学年； 广播影视节目制作：3300 元/学年； + 电子技术应用：2200 元/学年； 数字媒体技术应用：2200 元/学年； + 计算机网络技术：2200 元/学年。 + 2、南疆四地州以及 23 个边境县户籍的学生全部享受免教材费、免住宿费 +政策。 +23 个边境县： + 伊 犁 州：昭苏县、察布查尔锡伯自治县、霍城县、尼勒克县 + 博 州：温泉县、博乐市 + 塔城地区：托里县、裕民县、塔城市、额敏县、和布克赛尔县 + 阿 勒 泰：吉木乃县、哈巴河县、布尔津县、阿勒泰市、福海县、富蕴县、青河县 + 昌 吉 州：奇台县、木垒县、 + 哈密地区：巴里坤县、伊吾县、哈密市 +免教材、住宿费标准：教材费—300 元/每生/学年；住宿费—600 元/每生/学年。 + ３、南疆四地州户籍、脱贫家庭、脱贫不稳定家庭、边缘易致贫家庭、城 +乡低保家庭、特困供养家庭、孤儿和残疾等学生全部享受国家助学金，其他地 +区家庭经济困难的学生凭困难证明材料按在校其他地区户籍学生的 20%比例享 +受助学金（家庭经济困难的学生要在开学报到时提供父母所在单位或家庭住址 +所在街道办事处出具的家庭困难证明和县以上民政局的证明）。 + 助学金标准——2000 元/每生/学年（初中中专学生享受两年） + ４、德、智、体、美、劳全面发展且优秀的学生有机会获得国家奖学金、 +学校奖学金的奖励。 + 国 家 奖 学 金：6000 元/每生/学年； + 学校一等奖学金：2000 元/每生/学年； + 学校二等奖学金：1200 元/每生/学年； + 学校三等奖学金： 800 元/每生/学年。 + 四、除现行国家政策外，我校将免除每位新生的军训费，体检费和实习保 +险费合计 282 元。 + 五、新生报到后十日内，确因特殊原因可以根据本人实际情况向学校招生 +与就业指导办公室提出书面申请，经批准后重新调整专业学习。 + 六、学生毕业后，均有机会报考我校相应的成人大专专业继续学习，直至 +本科毕业；20%的应届优秀毕业生可以按照自治区教育厅的文件精神直升疆内普 +通高等专科院校继续学习；中专学生第三年可以报名参加普通高考和三校生考 +试。 + 七、报到地址：乌鲁木齐市天山区团结路 620 号（乘 10 路、60 路、61 路、 +70 路、301 路、920 路、4103 路公交车在陶瓷厂下车即到） + 联系电话：0991-6552258、6530980 + 特别提示：我校招生不收取任何咨询、报名、考试等费用。 + + 新疆广播电视学校 + 招生与就业指导办公室 + + 二 0 二二年七月八日 + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index f877ff7b5..703f9b418 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -2406,6 +2406,7 @@ + @@ -7926,6 +7927,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs index fd7074251..9adcd368b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs @@ -200,11 +200,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// /// - public StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuMobile) + public StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuName) { try { - return stuEnrollService.GetEntityByPersonalData(IDCard, StuMobile); + return stuEnrollService.GetEntityByPersonalData(IDCard, StuName); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs index 734a3732b..c2b2a0989 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs @@ -495,8 +495,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("YEAR")] public string Year { get; set; } + + /// + /// 考试科目 + /// + [Column("SUBJECTNO")] + public string SubjectNo { get; set; } #endregion - + #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs index 84ee75d1e..51682ff25 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs @@ -35,7 +35,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// StuEnrollEntity GetStuEnrollEntity(string keyValue); IEnumerable GetMidExamScoreData(string keyValue); - StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuMobile); + StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuName); StuEnrollEntity SearchForm(int type, StuEnrollEntity strEntity); IEnumerable GetExamDataByStuId(string keyValue); #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs index 0e7796fb1..66e6695ce 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs @@ -1969,12 +1969,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// /// - public StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuMobile) + public StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuName) { try { var year = DateTime.Now.Year; - return this.BaseRepository("CollegeMIS").FindEntity(x => (x.IDCard == IDCard || x.StuMobile == StuMobile) && x.AddTime.Value.Year == year); + return this.BaseRepository("CollegeMIS").FindEntity(x => (x.IDCard == IDCard && x.StuName == StuName.Trim()) && x.AddTime.Value.Year == year); } catch (Exception ex) { @@ -2021,16 +2021,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - string sql = $"select majorno from stuenroll where stuid='{keyValue}'"; - var majorId = ""; - var majorDt = this.BaseRepository("CollegeMIS").FindTable(sql); - if (majorDt != null) - { - majorId = majorDt.Rows[0]["majorno"].ToString(); - } - - string subSql = - $"select s.* from [dbo].[MajorAndSubject] m join ExamSubject s on m.SubId=s.Id where m.Majorid='{majorId}' and s.IsFlag=1 "; + string subSql = $"select * from ExamSubject where SubjectNo in (select SubjectNo from StuEnroll where stuid='{keyValue}')"; return this.BaseRepository("CollegeMIS").FindList(subSql); } catch (Exception ex) @@ -2517,17 +2508,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration if (list.Where(x => x.YearNo == enrollData.Year && x.StuId == enrollData.StuId).Count() <= 0) { //新生成绩表不存在当前新生 添加 - //循环报名的专业所关联的学科 - //专业学科关联表 - var MajorAndSubjectList = db.FindList(x => x.MajorId == enrollData.MajorNo); - foreach (var sub in MajorAndSubjectList) + var subNos = enrollData.SubjectNo.Split(',').ToList(); + foreach (var subno in subNos) { StuEnrollScoreEntity model = new StuEnrollScoreEntity(); model.Create(); model.YearNo = enrollData.Year; model.MajorId = enrollData.MajorNo; model.StuId = enrollData.StuId; - model.SubjectId = sub.SubId; + model.SubjectId = subno; model.Score = 0; db.Insert(model); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreService.cs index ad7ce8991..cc1f79f92 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreService.cs @@ -47,10 +47,10 @@ join stuenroll a on t.stuid=a.stuid where 1=1 "); var queryParam = queryJson.ToJObject(); var dp = new DynamicParameters(new { }); - if (!queryParam["YearNo"].IsEmpty()) + if (!queryParam["Year"].IsEmpty()) { - strSql.Append(" and t.YearNo=@YearNo "); - dp.Add("YearNo", queryParam["YearNo"].ToString(), DbType.String); + strSql.Append(" and t.YearNo=@Year "); + dp.Add("Year", queryParam["Year"].ToString(), DbType.String); } if (!queryParam["MajorId"].IsEmpty()) { @@ -86,7 +86,7 @@ join stuenroll a on t.stuid=a.stuid where 1=1 "); { try { - string sql = $"select a.Score,b.SubjectName from StuEnrollScore a left join ExamSubject b on a.subjectId=b.Id where a.stuid='{stuid}' "; + string sql = $"select a.Score,b.SubjectName from StuEnrollScore a left join ExamSubject b on a.subjectId=b.subjectNo where a.stuid='{stuid}' "; return this.BaseRepository("CollegeMIS").FindList(sql); } @@ -284,7 +284,7 @@ join stuenroll a on t.stuid=a.stuid where 1=1 "); { try { - var data = this.BaseRepository("CollegeMIS").FindList("select distinct s.subjectId as value,a.SubjectName as text from StuEnrollScore s left join ExamSubject a on s.subjectId=a.id"); + var data = this.BaseRepository("CollegeMIS").FindList("select distinct s.subjectId as value,a.SubjectName as text from StuEnrollScore s left join ExamSubject a on s.subjectId=a.SubjectNo"); data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value); return data; }