From 0bb4f953540673498fc5dbb258c07b9b70b070aa Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Mon, 10 Oct 2022 14:09:43 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=AD=A6?= =?UTF-8?q?=E4=B8=9A=E8=80=83=E6=A0=B8=E6=88=90=E7=BB=A9=E8=AE=B0=E8=BD=BD?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E3=80=81=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=B5=81=E7=A8=8B=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ScoreCheckInfoController.cs | 30 +----- .../Views/ScoreCheckInfo/FormAudit.cshtml | 50 +++++++-- .../Views/ScoreCheckInfo/FormAudit.js | 27 +++-- .../Views/ScoreCheckInfo/FormGene.cshtml | 2 +- .../Views/ScoreCheckInfo/FormGene.js | 2 +- .../Views/ScoreCheckInfo/FormTeach.cshtml | 16 ++- .../Views/ScoreCheckInfo/FormTeach.js | 3 +- .../Views/ScoreCheckInfo/Index.cshtml | 7 +- .../Views/ScoreCheckInfo/Index.js | 102 ++++-------------- .../ScoreCheckInfo/RecordTablePrint.cshtml | 2 +- .../ScoreCheckInfo/ScoreCheckInfoBLL.cs | 47 +------- .../ScoreCheckInfo/ScoreCheckInfoIBLL.cs | 15 ++- .../ScoreCheckInfo/ScoreCheckInfoService.cs | 92 +++------------- 13 files changed, 124 insertions(+), 271 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScoreCheckInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScoreCheckInfoController.cs index 7a864b8e0..893cc89ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScoreCheckInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScoreCheckInfoController.cs @@ -214,7 +214,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success("本次生成" + res + "条数据！"); } /// - /// 评教 + /// 教师评语/教务意见 /// /// /// @@ -225,33 +225,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { ScoreCheckInfoEntity entity = strEntity.ToObject(); scoreCheckInfoIBLL.SaveTeachEntity(keyValue, entity); - return Success("评教成功！"); - } - /// - /// 提交 - /// - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult SubmitFrom(string keyValue) - { - scoreCheckInfoIBLL.SubmitEntity(keyValue); - return Success("提交成功！"); - } - /// - /// 审核 - /// - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult AuditFrom(string keyValue, string strEntity) - { - ScoreCheckInfoEntity entity = strEntity.ToObject(); - scoreCheckInfoIBLL.AuditEntity(keyValue, entity); - return Success("审核成功！"); + return Success("操作成功！"); } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml index 2ceef9f8a..a98693ebb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml @@ -1,15 +1,53 @@ @{ - ViewBag.Title = "学业考核成绩记载审核表单"; + ViewBag.Title = "教务意见"; Layout = "~/Views/Shared/_Form.cshtml"; } -
+
+
+
学年*
+
+
+
+
学期*
+
+
+
+
学号*
+ +
+
+
姓名*
+ +
+
+
专业部*
+
+
+
+
专业*
+
+
+
+
班级*
+
+
+ +
+
教务部门审核意见*
+ +
+
+
意见日期*
+ +
-
审核通过
-
+
意见填写人
+
-
审核意见
- +
意见盖章
+
+ @Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js index 7b69b0b28..428081eb0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js @@ -2,7 +2,7 @@ * Copyright (c) 2013-2018 北京泉江科技有限公司 * 创建人：超级管理员 * 日 期：2019-05-15 10:33 - * 描 述：选修课报名审核表单 + * 描 述：教务意见 */ var acceptClick; var keyValue = request('keyValue'); @@ -15,10 +15,25 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#CheckStatus').lrRadioCheckbox({ - type: 'radio', - code: 'YesOrNoInt', + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', + value: 'value', + text: 'text' + }); + $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorno' }); + $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + $('#FilePath').lrUploader(); }, initData: function () { if (!!keyValue) { @@ -43,7 +58,7 @@ var bootstrap = function ($, learun) { var postData = { strEntity: JSON.stringify($('body').lrGetFormData()) }; - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/AuditFrom?keyValue=' + keyValue, postData, function (res) { + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveTeachForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { callBack(); @@ -51,4 +66,4 @@ var bootstrap = function ($, learun) { }); }; page.init(); -} +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.cshtml index 5b1812e4b..478894994 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.cshtml @@ -1,5 +1,5 @@ @{ - ViewBag.Title = "学业成绩考核记录表"; + ViewBag.Title = "一键生成"; Layout = "~/Views/Shared/_Form.cshtml"; }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.js index de595743c..e4a78e8b8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.js @@ -2,7 +2,7 @@ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 * 创建人：超级管理员 * 日 期：2022-09-19 14:37 - * 描 述：学业成绩考核记录表 + * 描 述：一键生成 */ var acceptClick; var keyValue = request('keyValue'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.cshtml index 094f31980..829a73b18 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.cshtml @@ -1,5 +1,5 @@ @{ - ViewBag.Title = "学业成绩考核记录表"; + ViewBag.Title = "教师评语"; Layout = "~/Views/Shared/_Form.cshtml"; }
@@ -31,18 +31,24 @@
班级*
-
+ +
操作等级*
班主任评语*
- + +
+
+
评语日期*
+
-
意见盖章
-
+
评语填写人*
+
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js index 4b6f497d9..f8ffa23ff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js @@ -2,7 +2,7 @@ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 * 创建人：超级管理员 * 日 期：2022-09-19 14:37 - * 描 述：学业成绩考核记录表 + * 描 述：  教师评语 */ var acceptClick; var keyValue = request('keyValue'); @@ -34,7 +34,6 @@ var bootstrap = function ($, learun) { $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorno' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); $('#OperatingLevel').lrDataItemSelect({ code: 'OperatingLevel' }); - $('#FilePath').lrUploader(); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml index 4d8c623c0..f0d14467d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml @@ -52,10 +52,9 @@  删除
-   一键生成 -   教师评语 -   提交 -   审核 +  一键生成 +  教师评语 +  教务意见  学业成绩考核记载表打印
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js index 00b8c8f8c..2017e0539 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js @@ -105,15 +105,6 @@ var bootstrap = function ($, learun) { $('#lr_edit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - if (keyValue.indexOf(',') != -1) { - learun.alert.warning("只能选择一条记录进行编辑！"); - return; - } - var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - if (CheckMark == "1" || CheckMark == "2") { - learun.alert.warning("当前项目已提交不能编辑！"); - return; - } learun.layerForm({ id: 'form', title: '编辑', @@ -130,11 +121,6 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) { - learun.alert.warning("选中记录中包含已审核项目,不可删除！"); - return; - } learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/DeleteForm', { keyValue: keyValue }, function () { @@ -144,46 +130,34 @@ var bootstrap = function ($, learun) { }); } }); - //  审核 - $('#lr_lock').on('click', function () { + + //教师评语 + $('#lr_Coordinator').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - //if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) { - // learun.alert.warning("选中记录中包含已审核项目,请勿重复提交！"); - // return; - //} learun.layerForm({ id: 'formTeach', - title: '编辑', - url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/FormAudit?keyValue=' + keyValue, - width: 800, - height: 600, + title: '教师评语', + url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/FormTeach?keyValue=' + keyValue, + width: 1000, + height: 800, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } }); } }); - //  教师评语 - $('#lr_Coordinator').on('click', function () { + + //教务意见 + $('#lr_Opinion').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - if (keyValue.indexOf(',') != -1) { - learun.alert.warning("只能选择一条记录进行编辑！"); - return; - } - //var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - //if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) { - // learun.alert.warning("选中记录中包含已审核项目,请勿重复提交！"); - // return; - //} learun.layerForm({ - id: 'formTeach', - title: '编辑', - url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/FormTeach?keyValue=' + keyValue, - width: 800, - height: 600, + id: 'formAudit', + title: '教务意见', + url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/FormAudit?keyValue=' + keyValue, + width: 1000, + height: 800, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -204,24 +178,6 @@ var bootstrap = function ($, learun) { } }); }); - //  提交 - $('#lr_submit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('ID'); - if (learun.checkrow(keyValue)) { - var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) { - learun.alert.warning("选中记录中包含已审核项目,请勿重复提交！"); - return; - } - learun.layerConfirm('是否确认提交选择项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SubmitFrom', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); //学业成绩考核记载表打印 $('#lr_print').on('click', function () { @@ -292,20 +248,10 @@ var bootstrap = function ($, learun) { { label: "班主任评语", name: "TeacherDemo", width: 100, align: "left" }, { - label: "评语日期", name: "TDate", width: 130, align: "left" + label: "评语日期", name: "TDate", width: 90, align: "left" }, { - label: "评语填写人", name: "Signed", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', - key: value, - keyId: 'f_account', - callback: function (_data) { - callback(_data['f_realname']); - } - }); - } + label: "评语填写人", name: "Signed", width: 100, align: "left" }, { label: "操作等级", name: "OperatingLevel", width: 60, align: "left", @@ -321,20 +267,10 @@ var bootstrap = function ($, learun) { }, { label: "学校教务部门审核意见", name: "CheckOpinion", width: 150, align: "left" }, { - label: "意见日期", name: "CheckTime", width: 130, align: "left" + label: "意见日期", name: "CheckTime", width: 90, align: "left" }, { - label: "意见填写人", name: "CheckUser", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', - key: value, - keyId: 'f_userid', - callback: function (_data) { - callback(_data['f_realname']); - } - }); - } + label: "意见填写人", name: "CheckUser", width: 100, align: "left" }, ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/RecordTablePrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/RecordTablePrint.cshtml index b1fb5379f..ee726a169 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/RecordTablePrint.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/RecordTablePrint.cshtml @@ -428,7 +428,7 @@ return; }; GetDataItemStr("OperatingLevel", "@Model.OperatingLevel","#OperatingLevel"); - GetDataSourceStr("BaseUser", "f_account", "f_realname", "@Model.Signed", "#Signed"); + //GetDataSourceStr("BaseUser", "f_account", "f_realname", "@Model.Signed", "#Signed"); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs index 690e778ba..8291fd7c2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs @@ -185,52 +185,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - /// - /// 提交选中项 - /// - /// - public void SubmitEntity(string keyValue) - { - try - { - scoreCheckInfoService.SubmitEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - /// - /// 审核 - /// - /// - /// - public void AuditEntity(string keyValue, ScoreCheckInfoEntity entity) - { - try - { - scoreCheckInfoService.AuditEntity(keyValue, entity); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoIBLL.cs index 06485c722..e322af11d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoIBLL.cs @@ -43,6 +43,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// 实体 void SaveEntity(string keyValue, ScoreCheckInfoEntity entity); + /// + /// 教师评语/教务意见 + /// + /// + /// void SaveTeachEntity(string keyValue, ScoreCheckInfoEntity entity); /// /// 一键生成 @@ -51,15 +56,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// int SaveGeneEntity(string AcademicYearNo, string Semester); - /// - /// 提交 - /// - /// - void SubmitEntity(string keyValue); - /// - /// 审核 - /// - void AuditEntity(string keyValue, ScoreCheckInfoEntity entity); + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs index 0ab04206b..5bbfbdbdf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs @@ -172,21 +172,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - var userlogin = LoginUserInfo.Get(); if (!string.IsNullOrEmpty(keyValue)) { entity.Modify(keyValue); - entity.UpdateTime = DateTime.Now; - entity.UpdateUser = userlogin.userId; this.BaseRepository("CollegeMIS").Update(entity); } else { entity.Create(); - entity.CreateTime = DateTime.Now; - entity.UpdateUser = userlogin.userId; - entity.UpdateTime = DateTime.Now; - entity.UpdateUser = userlogin.userId; this.BaseRepository("CollegeMIS").Insert(entity); } } @@ -202,18 +195,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + /// + /// 教师评语/教务意见 + /// + /// + /// public void SaveTeachEntity(string keyValue, ScoreCheckInfoEntity entity) { try { - var userlogin = LoginUserInfo.Get(); if (!string.IsNullOrEmpty(keyValue)) { entity.Modify(keyValue); - entity.UpdateTime = DateTime.Now; - entity.UpdateUser = userlogin.userId; - entity.Signed = userlogin.account; - entity.TDate = DateTime.Now; this.BaseRepository("CollegeMIS").Update(entity); } } @@ -229,6 +222,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + /// + /// 一键生成 + /// + /// + /// + /// public int SaveGeneEntity(string AcademicYearNo, string Semester) { try @@ -252,74 +251,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - - public void SubmitEntity(string keyValue) - { - var db = this.BaseRepository("CollegeMIS").BeginTrans(); - try - { - //多个提交 - var keyValueArr = keyValue.Split(','); - foreach (var item in keyValueArr) - { - var entity = db.FindEntity(x => x.ID == item); - entity.CheckStatus = "1"; - db.Update(entity); - } - db.Commit(); - } - catch (Exception ex) - { - db.Rollback(); - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - /// - /// 审核 - /// - /// - /// - public void AuditEntity(string keyValue, ScoreCheckInfoEntity entity) - { - var db = this.BaseRepository("CollegeMIS").BeginTrans(); - try - { - var userlogin = LoginUserInfo.Get(); - var keyValueArr = keyValue.Split(','); - foreach (var item in keyValueArr) - { - var model = db.FindEntity(x => x.ID == item); - model.CheckStatus = entity.CheckStatus; - model.CheckOpinion = entity.CheckOpinion; - model.CheckTime = DateTime.Now; - model.CheckUser = userlogin.userId; - model.UpdateTime = DateTime.Now; - model.UpdateUser = userlogin.userId; - db.Update(model); - } - db.Commit(); - } - catch (Exception ex) - { - db.Rollback(); - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - + #endregion }