【修改】学业考核成绩记载：修改提交、审批流程；

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 + "条数据！");
         }
         /// <summary>
-        /// 评教
+        /// 教师评语/教务意见
         /// </summary>
         /// <param name="keyValue"></param>
         /// <param name="strEntity"></param>
@@ -225,33 +225,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             ScoreCheckInfoEntity entity = strEntity.ToObject<ScoreCheckInfoEntity>();
             scoreCheckInfoIBLL.SaveTeachEntity(keyValue, entity);
-            return Success("评教成功！");
-        }
-        /// <summary>
-        /// 提交
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [AjaxOnly]
-        public ActionResult SubmitFrom(string keyValue)
-        {
-            scoreCheckInfoIBLL.SubmitEntity(keyValue);
-            return Success("提交成功！");
-        }
-        /// <summary>
-        /// 审核
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [AjaxOnly]
-        public ActionResult AuditFrom(string keyValue, string strEntity)
-        {
-            ScoreCheckInfoEntity entity = strEntity.ToObject<ScoreCheckInfoEntity>();
-            scoreCheckInfoIBLL.AuditEntity(keyValue, entity);
-            return Success("审核成功！");
+            return Success("操作成功！");
         }
+       
         #endregion
 
     }

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";
 }
-<div class="lr-form-wrap">
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
+        <input id="StuNo" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+        <input id="StuName" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">专业部<font face="宋体">*</font></div>
+        <div id="DeptNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    
+    <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">教务部门审核意见<font face="宋体">*</font></div>
+        <textarea id="CheckOpinion" type="text" class="form-control" style="height:80px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">意见日期<font face="宋体">*</font></div>
+        <input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#CheckTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
-        <div class="lr-form-item-title">审核通过</div>
-        <div id="CheckStatus"></div>
+        <div class="lr-form-item-title">意见填写人</div>
+        <input id="CheckUser" type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
-        <div class="lr-form-item-title">审核意见</div>
-        <textarea id="CheckOpinion" type="text" class="form-control" style="height:80px;"></textarea>
+        <div class="lr-form-item-title">意见盖章</div>
+        <div id="FilePath"></div>
     </div>
 </div>
+
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js")

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();
-}
+}

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";
 }
 <div class="lr-form-wrap" id="form">

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');

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";
 }
 <div class="lr-form-wrap" id="form">
@@ -31,18 +31,24 @@
         <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
         <div id="ClassNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+
+    <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
         <div class="lr-form-item-title">操作等级<font face="宋体">*</font></div>
         <div id="OperatingLevel" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
         <div class="lr-form-item-title">班主任评语<font face="宋体">*</font></div>
-        <textarea id="TeacherDemo" class="form-control" style="height: 100px;"></textarea>
+        <textarea id="TeacherDemo" class="form-control" style="height: 100px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">评语日期<font face="宋体">*</font></div>
+        <input id="TDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
-        <div class="lr-form-item-title">意见盖章</div>
-        <div id="FilePath"></div>
+        <div class="lr-form-item-title">评语填写人<font face="宋体">*</font></div>
+        <input id="Signed" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    
 </div>
 
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js")

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) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml

@@ -52,10 +52,9 @@
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_generate" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 一键生成</a>
-                        <a id="lr_Coordinator" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 教师评语</a>
-                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 提交</a>
-                        <a id="lr_lock" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 审核</a>
+                        <a id="lr_generate" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;一键生成</a>
+                        <a id="lr_Coordinator" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;教师评语</a>
+                        <a id="lr_Opinion" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;教务意见</a>
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;学业成绩考核记载表打印</a>
                     </div>
                 </div>

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"
                     },
                    
                 ],

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");
 
 
     </script>

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
                 }
             }
         }
-        /// <summary>
-        /// 提交选中项
-        /// </summary>
-        /// <param name="keyValue"></param>
-        public void SubmitEntity(string keyValue)
-        {
-            try
-            {
-                scoreCheckInfoService.SubmitEntity(keyValue);
-            }
-            catch (Exception ex)
-            {
-                if (ex is ExceptionEx)
-                {
-                    throw;
-                }
-                else
-                {
-                    throw ExceptionEx.ThrowBusinessException(ex);
-                }
-            }
-        }
-        /// <summary>
-        /// 审核
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <param name="entity"></param>
-        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
 
     }

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
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         void SaveEntity(string keyValue, ScoreCheckInfoEntity entity);
+        /// <summary>
+        /// 教师评语/教务意见
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="entity"></param>
         void SaveTeachEntity(string keyValue, ScoreCheckInfoEntity entity);
         /// <summary>
         /// 一键生成
@@ -51,15 +56,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="Semester"></param>
         /// <returns></returns>
         int SaveGeneEntity(string AcademicYearNo, string Semester);
-        /// <summary>
-        /// 提交
-        /// </summary>
-        /// <param name="keyValue"></param>
-        void SubmitEntity(string keyValue);
-        /// <summary>
-        /// 审核
-        /// </summary>
-        void AuditEntity(string keyValue, ScoreCheckInfoEntity entity);
+        
         #endregion
 
     }

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
                 }
             }
         }
+        /// <summary>
+        /// 教师评语/教务意见
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="entity"></param>
         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
                 }
             }
         }
+        /// <summary>
+        /// 一键生成
+        /// </summary>
+        /// <param name="AcademicYearNo"></param>
+        /// <param name="Semester"></param>
+        /// <returns></returns>
         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<ScoreCheckInfoEntity>(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);
-                }
-            }
-        }
-        /// <summary>
-        /// 审核
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <param name="entity"></param>
-        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<ScoreCheckInfoEntity>(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
 
     }