From 5a33f15ed7d5c11f4c671e540b72e88318fe1ee4 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Thu, 21 Jul 2022 10:06:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E6=8A=A5=E5=90=8D=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuEnroll/EnrollIndex.js | 4 +- .../Views/StuEnrollPhone/SearchResult.cshtml | 47 ++++++++++++------- .../Views/StuEnrollScore/AdmissionForm.js | 2 +- .../StuEnrollScore/AdmissionIndex.cshtml | 2 +- .../Views/StuEnrollScore/AdmissionIndex.js | 16 ++++--- .../Views/StuEnrollScore/Index.js | 28 +++++++---- .../StuEnroll/StuEnrollService.cs | 2 +- .../StuEnrollScore/StuEnrollScoreEntity.cs | 6 +++ .../StuEnrollScore/StuEnrollScoreService.cs | 14 +++--- 9 files changed, 78 insertions(+), 43 deletions(-) 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 0476091bb..b120e0f3f 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 @@ -263,8 +263,10 @@ var bootstrap = function ($, learun) { formatter: function (value) { if (value == 1) { return "是"; - } else { + } else if (value == 0) { return "否"; + } else { + return ""; } } }, 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 6f560f24c..8420fe5f1 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 @@ -17,7 +17,22 @@ +
@@ -47,13 +62,13 @@
- * 是否录取 + * 录取结果信息
-     注：请手机截屏录取成功，保存结果图片，报名时出示此图片换取录取通知书！ -
-
入学须知
+     备注：请手机截屏此录取界面，保存图片。报名时出示此图片换取录取通知书！ +
+
请点击入学须知并仔细阅读
@@ -103,18 +118,18 @@ $('#StuName').val(decodeURI(StuName)); $('#IDCard').val(IDCard); // $('#StuMobile').val(StuMobile); - //$('#ExamLocation').val(data.StuEnroll.ExamLocation); - //if (data.StuEnroll.ExamStartTime) { - // $('#ExamStartTime').val(data.StuEnroll.ExamStartTime + '~' + data.StuEnroll.ExamEndTime); - //} - if (data.StuEnroll.IsAdmission && data.StuEnroll.IsAdmission == 1) { - $('#IsAdmission').val('是'); - if (type == '2') { - //查询录取结果 - $('#admmsg').show(); - } - } else { - $('#IsAdmission').val('否'); + var IsAdmission = data.StuEnroll.IsAdmission; + + if (IsAdmission == 1 || IsAdmission == true) { + var major = data.StuEnroll.MajorName; + $('#IsAdmission').val('恭喜您，已被我校录取' + data.StuEnroll.MajorName + '专业'); + //查询录取结果 + $('#admmsg').show(); + } else if (IsAdmission === false) { + $('#IsAdmission').val('很抱歉，您未被录取'); + } + else { + $('#IsAdmission').val('很抱歉，请您等待录取结果'); } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.js index d2137ce1b..642cfa145 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.js @@ -28,7 +28,7 @@ var bootstrap = function ($, learun) { for (var i = 0; i < data.length; i++) { html += '
'; html += '
' + data[i].SubjectName + '：
'; - html += ''; + html += ''; html += '
'; } $('#form').html(html); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.cshtml index 1683efd84..4d91bb910 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.cshtml @@ -41,7 +41,7 @@
 查看成绩  录取 -  取消录取 +  不录取
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js index ee19b45a6..9d7371526 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js @@ -79,11 +79,11 @@ var bootstrap = function ($, learun) { $('#lr_nolq').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); if (learun.checkrow(keyValue)) { - var IsAdmission = $('#gridtable').jfGridValue('IsAdmission'); - if (IsAdmission == 0) { - return learun.alert.warning('该学生未被录取！'); - } - learun.layerConfirm('是否确认取消录取当前学生！', function (res) { + //var IsAdmission = $('#gridtable').jfGridValue('IsAdmission'); + //if (IsAdmission == 0) { + // return learun.alert.warning('该学生未被录取！'); + //} + learun.layerConfirm('是否确认不录取当前学生！', function (res) { if (res) { learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Admission?keyValue=' + keyValue, { IsAdmission: 0 }, function () { refreshGirdData(); @@ -165,14 +165,16 @@ var bootstrap = function ($, learun) { }); } }, - { label: "总分", name: "ExamScore", width: 100, align: "left" }, + //{ label: "总分", name: "ExamScore", width: 100, align: "left" }, { label: "是否录取", name: "IsAdmission", width: 100, align: "left", formatter: function (value) { if (value == 1) { return "是"; - } else { + } else if (value == 0) { return "否"; + } else { + return ""; } } }, 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 deec20bd0..9b6eb2c19 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 @@ -65,16 +65,27 @@ var bootstrap = function ($, learun) { ]; headDataEdit = [ { - label: '成绩', name: 'Score', width: 100, align: "left", - edit: { - type: 'input', - inputType: 'number', - change: function (row, rownum) { - //row.Score = (parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100)).toFixed(0); - $('#gridtable').jfGridSet('updateRow', rownum); + label: '成绩', name: 'Grade', width: 100, align: 'left' + , edit: { + type: 'select', + init: function (data, $edit) { + }, + datatype: 'dataItem', + code: 'StuScoreGrade' } }, + //{ + // label: '成绩', name: 'Score', width: 100, align: "left", + // edit: { + // type: 'input', + // inputType: 'number', + // change: function (row, rownum) { + // //row.Score = (parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100)).toFixed(0); + // $('#gridtable').jfGridSet('updateRow', rownum); + // }, + // } + //}, { label: '备注', name: 'Remark', width: 100, align: "left", edit: { @@ -83,7 +94,7 @@ var bootstrap = function ($, learun) { }, ]; headDataNoEdit = [ - { label: '成绩', name: 'Score', width: 80, align: "left" }, + { label: '成绩', name: 'Grade', width: 80, align: "left" }, { label: '备注', name: 'Remark', width: 100, align: "left" }, @@ -132,7 +143,6 @@ var bootstrap = function ($, learun) { if (res) { var query = judgeSelect(); if (query) { - //判断是否已审核；判断是否被其他教师占用 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetEntityByJson?queryJson=' + JSON.stringify(query), function (data) { if (data != null) { 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 66e6695ce..709453942 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 @@ -1997,7 +1997,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - return this.BaseRepository("CollegeMIS").FindEntity(x => x.EnrollStatus == 2 && x.StuName == entity.StuName.Trim() && x.IDCard == entity.IDCard); + return this.BaseRepository("CollegeMIS").FindEntity(x => x.StuName == entity.StuName.Trim() && x.IDCard == entity.IDCard); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreEntity.cs index e29dc2cca..06c36b25a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreEntity.cs @@ -51,6 +51,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("SCORE")] public decimal? Score { get; set; } /// + /// 合格/不合格 + /// + /// + [Column("GRADE")] + public string Grade { get; set; } + /// /// 状态 /// /// 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 cc1f79f92..6d28ed6b3 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 @@ -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.subjectNo where a.stuid='{stuid}' "; + string sql = $"select a.Score,b.SubjectName,a.grade from StuEnrollScore a left join ExamSubject b on a.subjectId=b.subjectNo where a.stuid='{stuid}' "; return this.BaseRepository("CollegeMIS").FindList(sql); } @@ -160,10 +160,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()) { @@ -497,9 +497,9 @@ join stuenroll a on t.stuid=a.stuid where 1=1 "); foreach (var item in list) { - item.Score = item.Score.HasValue ? item.Score.Value : 0; - - db.ExecuteBySql($"update StuEnrollScore set Score={item.Score},Remark='{item.Remark}' where Id='{item.Id}' "); + //item.Score = item.Score.HasValue ? item.Score.Value : 0; + //db.ExecuteBySql($"update StuEnrollScore set Score={item.Score},Remark='{item.Remark}' where Id='{item.Id}' "); + db.ExecuteBySql($"update StuEnrollScore set Grade='{item.Grade}',Remark='{item.Remark}' where Id='{item.Id}' "); } db.Commit();