From b9b645dd4284e250454ad51ca9f32683fc7e408d Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 19 Jul 2022 15:11:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=A7=91=E7=9B=AE=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CdMajorController.cs | 20 +++--- .../Controllers/StuEnrollController.cs | 6 ++ .../Controllers/StuEnrollPhoneController.cs | 2 +- .../Views/CdMajor/Form.cshtml | 25 ++++---- .../Views/StuEnroll/EnrollForm.cshtml | 13 ++-- .../Views/StuEnroll/EnrollForm.js | 64 +++++++++---------- .../Views/StuEnroll/EnrollFormView.cshtml | 14 ++-- .../Views/StuEnroll/EnrollFormView.js | 7 ++ .../Views/StuEnroll/EnrollIndex.js | 4 +- .../Views/StuEnroll/EnrollSH.cshtml | 9 ++- .../Views/StuEnroll/EnrollSH.js | 18 ++++++ .../Views/StuEnrollPhone/SearchResult.cshtml | 2 +- .../Views/StuEnrollScore/Index.js | 2 +- .../StuEnroll/StuEnrollBLL.cs | 4 +- .../StuEnroll/StuEnrollEntity.cs | 8 ++- .../StuEnroll/StuEnrollIBLL.cs | 2 +- .../StuEnroll/StuEnrollService.cs | 23 ++----- .../StuEnrollScore/StuEnrollScoreService.cs | 10 +-- 18 files changed, 135 insertions(+), 98 deletions(-) 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 f5a00aa06..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 @@ -73,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("您已报名，请耐心等待结果！"); 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/SearchResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml index 85a2bc5a5..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 @@ -51,7 +51,7 @@
-     注：录取成功，请手机截屏，保存结果图片，报名时出示此图片！ +     注：请手机截屏录取成功，保存结果图片，报名时出示此图片换取录取通知书！
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.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; }