Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScoreCheckInfoController.cs

@@ -165,6 +165,20 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("本次生成" + res + "条数据！");
         }
         /// <summary>
+        /// 评教
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="strEntity"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult SaveTeachForm(string keyValue, string strEntity)
+        {
+            ScoreCheckInfoEntity entity = strEntity.ToObject<ScoreCheckInfoEntity>();
+            scoreCheckInfoIBLL.SaveTeachEntity(keyValue, entity);
+            return Success("评教成功！");
+        }
+        /// <summary>
         /// 提交
         /// </summary>
         /// <param name="keyValue"></param>

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

@@ -2,7 +2,7 @@
     ViewBag.Title = "学业成绩考核记录表";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
-<div class="lr-form-wrap" id="form">
+<div class="lr-form-wrap">
     <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
         <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
         <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>
@@ -15,9 +15,9 @@
         <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
         <div id="StuNo"></div>
         <input id="StuName" type="text" style="display: none;" />
-        <input id="DeptNo" type="text" style="display: none;"  />
-        <input id="MajorNo" type="text" style="display: none;" />
-        <input id="ClassNo" type="text" style="display: none;" />
+        <input id="ClassNo" hidden="hidden" />
+        <input id="MajorNo" hidden="hidden" />
+        <input id="DeptNo" hidden="hidden" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js

@@ -31,65 +31,62 @@ var bootstrap = function ($, learun) {
                 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' });
             $('#StuNo').lrGirdSelect({
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
                 selectWord: 'stuname',
                 value: 'stuno',
                 text: 'stuname',
                 headData:
-                [
-                    { label: "学号", name: "stuno", width: 100, align: "left" },
-                    { label: "姓名", name: "stuname", width: 100, align: "left" },
-                    {
-                        label: "班级", name: "classno", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
-                                key: value,
-                                keyId: 'classno',
-                                callback: function (_data) {
-                                    callback(_data['classname']);
-                                }
-                            });
-                        }
-                        },
-                    {
-                        label: "专业", name: "majorno", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
-                                key: value,
-                                keyId: 'majorno',
-                                callback: function (_data) {
-                                    callback(_data['majorname']);
-                                }
-                            });
-                        }
+                    [
+                        { label: "学号", name: "stuno", width: 140, align: "left" },
+                        { label: "姓名", name: "stuname", width: 100, align: "left" },
+                        {
+                            label: "班级", name: "classno", width: 100, align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('custmerData', {
+                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                    key: value,
+                                    keyId: 'classno',
+                                    callback: function (_data) {
+                                        callback(_data['classname']);
+                                    }
+                                });
+                            }
                         },
-                    {
-                        label: "专业部",name: "deptno",width: 100,align: "left",
-                        formatterAsync: function(callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData',
-                                {
-                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                        {
+                            label: "专业", name: "majorno", width: 100, align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('custmerData', {
+                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
                                     key: value,
-                                    keyId: 'deptno',
-                                    callback: function(_data) {
-                                        callback(_data['deptname']);
+                                    keyId: 'majorno',
+                                    callback: function (_data) {
+                                        callback(_data['majorname']);
                                     }
                                 });
+                            }
+                        },
+                        {
+                            label: "专业部", name: "deptno", width: 100, align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('custmerData',
+                                    {
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                        key: value,
+                                        keyId: 'deptno',
+                                        callback: function (_data) {
+                                            callback(_data['deptname']);
+                                        }
+                                    });
+                            }
                         }
-                    }
-                ],
+                    ],
                 select: function (item) {
                     $("#StuNo").val(item.stuno);
                     $("#StuName").val(item.stuname);
+                    $("#ClassNo").val(item.classno);
                     $("#MajorNo").val(item.majorno);
                     $("#DeptNo").val(item.deptno);
-                    $("#ClassNo").val(item.classno);
                 }
             });
         },
@@ -98,7 +95,7 @@ var bootstrap = function ($, learun) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
@@ -116,7 +113,6 @@ var bootstrap = function ($, learun) {
         var postData = {
             strEntity: JSON.stringify($('body').lrGetFormData())
         };
-        console.log(postData,"postData")
         $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {

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

@@ -8,8 +8,8 @@
         <div id="CheckStatus"></div>
     </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:100px;"></textarea>
+        <div class="lr-form-item-title">审核意见</div>
+        <textarea id="CheckOpinion" type="text" class="form-control" style="height:80px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js

@@ -43,7 +43,6 @@ var bootstrap = function ($, learun) {
         var postData = {
             strEntity: JSON.stringify($('body').lrGetFormData())
         };
-        console.log(keyValue,"keyValue")
         $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/AuditFrom?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js

@@ -58,7 +58,7 @@ var bootstrap = function ($, learun) {
         var postData = {
             strEntity: JSON.stringify($('body').lrGetFormData())
         };
-        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveTeachForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
                 callBack();

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

@@ -50,14 +50,14 @@
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></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_unlock" 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>
+                        @*<a id="lr_unlock" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 去审核</a>*@
                     </div>
                 </div>
             </div>

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

@@ -110,8 +110,8 @@ var bootstrap = function ($, learun) {
                         return;
                     }
                     var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckMark === "1") {
-                        learun.alert.warning("当前项目已审核不能编辑！");
+                    if (CheckMark == "1" || CheckMark == "2") {
+                        learun.alert.warning("当前项目已提交不能编辑！");
                         return;
                     }
                     learun.layerForm({
@@ -131,8 +131,8 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
                     var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckMark.indexOf('1') != -1) {
-                        learun.alert.warning("选中记录中包含已审核项目，已审核不能删除！");
+                    if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) {
+                        learun.alert.warning("选中记录中包含已审核项目,不可删除！");
                         return;
                     }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
@@ -152,13 +152,9 @@ var bootstrap = function ($, learun) {
             $('#lr_lock').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") {
-                        learun.alert.warning("当前项不可审核！");
+                    if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) {
+                        learun.alert.warning("选中记录中包含已审核项目,请勿重复提交！");
                         return;
                     }
                     learun.layerForm({
@@ -182,8 +178,8 @@ var bootstrap = function ($, learun) {
                         return;
                     }
                     var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckMark === "1") {
-                        learun.alert.warning("当前项目已审核不能编辑！");
+                    if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) {
+                        learun.alert.warning("选中记录中包含已审核项目,请勿重复提交！");
                         return;
                     }
                     learun.layerForm({
@@ -217,8 +213,8 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
                     var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckMark.indexOf('1') != -1) {
-                        learun.alert.warning("选中记录中包含已提交项目，不可重复提交！");
+                    if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) {
+                        learun.alert.warning("选中记录中包含已审核项目,请勿重复提交！");
                         return;
                     }
                     learun.layerConfirm('是否确认提交选择项！', function (res) {
@@ -295,11 +291,11 @@ var bootstrap = function ($, learun) {
                         label: "评语填写人", name: "Signed", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
                                 key: value,
-                                keyId: 'classno',
+                                keyId: 'empno',
                                 callback: function (_data) {
-                                    callback(_data['classname']);
+                                    callback(_data['empname']);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js

@@ -42,7 +42,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
-            $('#F_NewsImage').lrUploader();
+            $('#F_NewsImage').lrUploader({ extensions:'gif,jpeg,jpg,png,bmp'});
             $('#F_IsSendFX').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#F_SendDeptId').lrDepartmentSelect({ type: 'treemultiple' });
             $('#F_SendPostId').lrPostSelect({ type: 'treemultiple' });

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs

@@ -113,7 +113,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
+        
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveTeachEntity(string keyValue, ScoreCheckInfoEntity entity)
+        {
+            try
+            {
+                scoreCheckInfoService.SaveTeachEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>
@@ -138,7 +162,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
         /// <summary>
         /// 一键生成
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoIBLL.cs

@@ -43,6 +43,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         void SaveEntity(string keyValue, ScoreCheckInfoEntity entity);
+        void SaveTeachEntity(string keyValue, ScoreCheckInfoEntity entity);
         /// <summary>
         /// 一键生成
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs

@@ -114,7 +114,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindEntity<ScoreCheckInfoEntity>(x => x.StuName == keyValue && x.Semester == Semester && x.AcademicYearNo == AcademicYearNo);
+                return this.BaseRepository("CollegeMIS").FindEntity<ScoreCheckInfoEntity>(x => x.StuNo == keyValue && x.Semester == Semester && x.AcademicYearNo == AcademicYearNo);
             }
             catch (Exception ex)
             {
@@ -202,7 +202,32 @@ 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;
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         public int SaveGeneEntity(string AcademicYearNo, string Semester)
         {
             try
@@ -270,7 +295,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 foreach (var item in keyValueArr)
                 {
                     var model = db.FindEntity<ScoreCheckInfoEntity>(x => x.ID == item);
-                    model.CheckStatus = "2";
+                    model.CheckStatus = entity.CheckStatus;
                     model.CheckTime = DateTime.Now;
                     model.CheckUser = userlogin.userId;
                     model.UpdateTime = DateTime.Now;

Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/App.config

@@ -13,7 +13,11 @@
     <add name="YKTDBString" connectionString="Data Source=xcykt;Persist Security Info=True;User ID=xcysdata;Password=xcysdata2019;Unicode=True" providerName="System.Data.OracleClient" />
     <add name="mjDBString" connectionString="Server=112.45.152.8,17049;Initial Catalog=mjxtjh;User ID=mjxtjh;Password=s1RKFzJvIG7KfcNRtntZ" providerName="System.Data.SqlClient" />
     <add name="tsDBString" connectionString="Server=112.45.152.8,17049;Initial Catalog=tsgxtjh;User ID=tsgxtjh;Password=Qs6cYOzFoQupbr12MFZm" providerName="System.Data.SqlClient" />
+    <add name="bachuJavaDBString" connectionString="Data Source=127.0.0.1;Database=oa;User ID=root;Password=123456;Command Logging=false;" providerName="MySql.Data.MySqlClient" />
+    <add name="TLMZYMiddleDBString" connectionString="Data Source=TLMZYMIDDLE;Persist Security Info=True;User ID=digitalschool;Password=digitalschool;Unicode=True" providerName="System.Data.OracleClient" />
     <add name="CYZJMiddleDBString" connectionString="Data Source=CYZJMIDDLE;Persist Security Info=True;User ID=digitalschool;Password=digitalschool;Unicode=True" providerName="System.Data.OracleClient" />
+    <add name="YongyouDb" connectionString="Server=.;Password=1;User ID=sa; Initial Catalog=u8gx" providerName="System.Data.SqlClient" />
+    <add name="XCMiddleDBString" connectionString="Data Source=FSZJK;Persist Security Info=True;User ID=fszjk;Password=fszjk20220705;Unicode=True" providerName="System.Data.OracleClient" />
 
   </connectionStrings>
   <startup>