Merge branch '塔里木分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 塔里木分支

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

@@ -239,7 +239,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetList(string queryJson)
         {
-            var data = stuScoreOnlineIBLL.GetList(queryJson).OrderBy(a => a.StuNo);
+            var data = stuScoreOnlineIBLL.GetList(queryJson).OrderBy(x => x.AcademicYearNo).ThenBy(x => x.Semester).ThenBy(x => x.LessonNo).ThenBy(x => x.StuNo);
             return Success(data);
         }
         [HttpGet]

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

@@ -21,12 +21,11 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="LessonInfoOfElectiveOnline">
         <div class="lr-form-item-title">建课教师<font face="宋体">*</font></div>
-        <div id="EmpNo" isvalid="yes" checkexpession="NotNull"></div>
-        <input id="EmpName" type="text" class="form-control hide"/>
+        <input id="EmpNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="LessonInfoOfElectiveOnline" >
         <div class="lr-form-item-title">建课学校<font face="宋体">*</font></div>
-        <div id="F_SchoolId" isvalid="yes" checkexpession="NotNull" ></div>
+        <input id="F_SchoolId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/LessonInfoOfElectiveOnline/Form.js")

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

@@ -30,14 +30,6 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#EmpNo').lrDataSourceSelect({
-                code: 'EmpInfo', value: 'empno', text: 'empname', select: function (item) {
-                    if (!!item) {
-                        $('#EmpName').val(item.empname);
-                    }
-                }
-            });
-            $('#F_SchoolId').lrDataSourceSelect({ code: 'company',value: 'f_companyid',text: 'f_fullname' });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -28,7 +28,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">建课教师</div>
-                                    <div id="EmpNo"></div>
+                                    <input id="EmpNo" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">是否启用</div>

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

@@ -31,7 +31,6 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
             $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -155,30 +154,10 @@ var bootstrap = function ($, learun) {
                     { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
                     { label: "学期", name: "Semester", width: 100, align: "left" },
                     {
-                        label: "建课教师", name: "EmpNo", width: 150, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
-                                key: value,
-                                keyId: 'empno',
-                                callback: function (_data) {
-                                    callback(_data['empname']);
-                                }
-                            });
-                        }
+                        label: "建课教师", name: "EmpNo", width: 150, align: "left"
                     },
                     {
-                        label: "建课学校", name: "F_SchoolId", width: 150, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
-                                key: value,
-                                keyId: 'f_companyid',
-                                callback: function (_data) {
-                                    callback(_data['f_fullname']);
-                                }
-                            });
-                        }
+                        label: "建课学校", name: "F_SchoolId", width: 150, align: "left"
                     },
                     {
                         label: "是否启用", name: "CheckMark", width: 80, align: "left",
@@ -190,7 +169,7 @@ var bootstrap = function ($, learun) {
                 mainId: 'Id',
                 isPage: true,
                 isMultiselect: true,
-                sidx: 'AcademicYearNo DESC, Semester DESC, LessonNo ASC,EmpNo ASC'
+                sidx: 'AcademicYearNo DESC, Semester DESC, LessonNo ASC'
             });
             page.search();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfoOfElectiveOnline/SetIndex.js

@@ -199,30 +199,10 @@ var bootstrap = function ($, learun) {
                     { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
                     { label: "学期", name: "Semester", width: 100, align: "left" },
                     {
-                        label: "建课教师", name: "EmpNo", width: 150, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
-                                key: value,
-                                keyId: 'empno',
-                                callback: function (_data) {
-                                    callback(_data['empname']);
-                                }
-                            });
-                        }
+                        label: "建课教师", name: "EmpNo", width: 150, align: "left"
                     },
                     {
-                        label: "建课学校", name: "F_SchoolId", width: 150, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
-                                key: value,
-                                keyId: 'f_companyid',
-                                callback: function (_data) {
-                                    callback(_data['f_fullname']);
-                                }
-                            });
-                        }
+                        label: "建课学校", name: "F_SchoolId", width: 150, align: "left"
                     },
                     { label: "人数上限", name: "StuNumMax", width: 60, align: "left" },
                     { label: "已报人数", name: "StuNumOfApply", width: 60, align: "left" },
@@ -261,7 +241,7 @@ var bootstrap = function ($, learun) {
                 mainId: 'Id',
                 isPage: true,
                 isMultiselect: true,
-                sidx: 'AcademicYearNo DESC, Semester DESC, LessonNo ASC,EmpNo ASC'
+                sidx: 'AcademicYearNo DESC, Semester DESC, LessonNo ASC'
             });
             //page.search();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfoOfElectiveOnline/StudentIndex.js

@@ -168,19 +168,9 @@ var bootstrap = function ($, learun) {
                     { label: "学期", name: "Semester", width: 100, align: "left" },
                     { label: "课程编号", name: "LessonNo", width: 150, align: "left" },
                     { label: "课程名称", name: "LessonName", width: 150, align: "left" },
-                    { label: "建课教师", name: "EmpName", width: 100, align: "left" },
+                    { label: "建课教师", name: "EmpNo", width: 100, align: "left" },
                     {
-                        label: "建课学校", name: "F_SchoolId", width: 150, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
-                                key: value,
-                                keyId: 'f_companyid',
-                                callback: function (_data) {
-                                    callback(_data['f_fullname']);
-                                }
-                            });
-                        }
+                        label: "建课学校", name: "F_SchoolId", width: 150, align: "left"
                     },
                     //{ label: "报名人数上限", name: "StuNumMax", width: 100, align: "left" },
                     { label: "已报人数", name: "StuNumOfApply", width: 100, align: "left" },
@@ -201,7 +191,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'Id',
                 isPage: true,
-                sidx: 'AcademicYearNo DESC, Semester DESC, LessonNo ASC,EmpNo ASC'
+                sidx: 'AcademicYearNo DESC, Semester DESC, LessonNo ASC'
             });
             page.search();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/InputScoreIndex.cshtml

@@ -60,21 +60,21 @@
             <div class="lr-layout-tool">
                 <div class="selectRow divRow">
                     <div class="lr-layout-tool-left">
-                        <div class="lr-layout-tool-item">
+                        @*<div class="lr-layout-tool-item">
                             <div id="F_SchoolId" type="lrselect" class="lr-select"></div>
-                        </div>
+                        </div>*@
                         <div class="lr-layout-tool-item">
                             <div id="AcademicYearNo" type="lrselect" class="lr-select lr-selectLittle"></div>
                         </div>
                         <div class="lr-layout-tool-item">
                             <div id="Semester" type="lrselect" class="lr-select lr-selectLittle"></div>
                         </div>
-                        <div class="lr-layout-tool-item">
+                        @*<div class="lr-layout-tool-item">
                             <div id="LessonNo" type="lrselect" class="lr-select"></div>
                         </div>
                         <div class="lr-layout-tool-item">
                             <div id="EmpNo" type="lrselect" class="lr-select"></div>
-                        </div>
+                        </div>*@
 
                         <div class="lr-layout-tool-item">
                             <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/InputScoreIndex.js

@@ -33,17 +33,7 @@ var bootstrap = function ($, learun) {
                 { label: '学期', name: 'Semester', width: 40, align: "left" },
                 { label: '课程名称', name: 'LessonName', width: 150, align: "left" },
                 {
-                    label: "学校名称", name: "F_SchoolId", width: 100, align: "left",
-                    formatterAsync: function (callback, value, row, op, $cell) {
-                        learun.clientdata.getAsync('custmerData', {
-                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
-                            key: value,
-                            keyId: 'f_companyid',
-                            callback: function (_data) {
-                                callback(_data['f_fullname']);
-                            }
-                        });
-                    }
+                    label: "学校名称", name: "F_SchoolId", width: 100, align: "left"
                 },
                 {
                     label: "学院", name: "DeptNo", width: 100, align: "left",
@@ -448,10 +438,10 @@ var bootstrap = function ($, learun) {
         },
         bindSelect: function () {
             //校区
-            $('#F_SchoolId').lrDataSourceSelect({
-                code: 'company', value: 'f_companyid', text: 'f_fullname', select: function (item) { }
-            });
-            $('#F_SchoolId').lrselectSet(learun.clientdata.get(['userinfo']).companyId);
+            //$('#F_SchoolId').lrDataSourceSelect({
+            //    code: 'company', value: 'f_companyid', text: 'f_fullname', select: function (item) { }
+            //});
+            //$('#F_SchoolId').lrselectSet(learun.clientdata.get(['userinfo']).companyId);
             //学年
             $('#AcademicYearNo').lrselect({
                 placeholder: "学年",
@@ -460,11 +450,11 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text',
                 select: function (item) {
-                    if (!!item) {
-                        $("#LessonNo").lrselectRefresh({
-                            url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetLessonNoDataOfAllWithNo?AcademicYearShort=' + item.value + '&Semester=' + $('#Semester').lrselectGet(),
-                        });
-                    }
+                    //if (!!item) {
+                    //    $("#LessonNo").lrselectRefresh({
+                    //        url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetLessonNoDataOfAllWithNo?AcademicYearShort=' + item.value + '&Semester=' + $('#Semester').lrselectGet(),
+                    //    });
+                    //}
                 }
             });
             //学期
@@ -475,36 +465,36 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text',
                 select: function (item) {
-                    if (!!item) {
-                        $("#LessonNo").lrselectRefresh({
-                            url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetLessonNoDataOfAllWithNo?AcademicYearShort=' + $('#AcademicYearNo').lrselectGet() + '&Semester=' + item.value,
-                        });
-                    }
+                    //if (!!item) {
+                    //    $("#LessonNo").lrselectRefresh({
+                    //        url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetLessonNoDataOfAllWithNo?AcademicYearShort=' + $('#AcademicYearNo').lrselectGet() + '&Semester=' + item.value,
+                    //    });
+                    //}
                 }
             });
             //课程
-            $('#LessonNo').lrselect({
-                placeholder: "请选择课程",
-                allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetLessonNoDataOfAllWithNo',
-                value: 'value',
-                text: 'text',
-                select: function (item) {
-                    if (!!item) {
-                        $("#EmpNo").lrselectRefresh({
-                            url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetEmpNoDataOfAll?lessonNo=' + item.value + '&AcademicYearShort=' + $('#AcademicYearNo').lrselectGet() + '&Semester=' + $('#Semester').lrselectGet(),
-                        });
-                    }
-                }
-            });
+            //$('#LessonNo').lrselect({
+            //    placeholder: "请选择课程",
+            //    allowSearch: true,
+            //    url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetLessonNoDataOfAllWithNo',
+            //    value: 'value',
+            //    text: 'text',
+            //    select: function (item) {
+            //        if (!!item) {
+            //            $("#EmpNo").lrselectRefresh({
+            //                url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetEmpNoDataOfAll?lessonNo=' + item.value + '&AcademicYearShort=' + $('#AcademicYearNo').lrselectGet() + '&Semester=' + $('#Semester').lrselectGet(),
+            //            });
+            //        }
+            //    }
+            //});
             //教师
-            $('#EmpNo').lrselect({
-                placeholder: "请选择教师",
-                allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetEmpNoDataOfAll',
-                value: 'value',
-                text: 'text'
-            });
+            //$('#EmpNo').lrselect({
+            //    placeholder: "请选择教师",
+            //    allowSearch: true,
+            //    url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetEmpNoDataOfAll',
+            //    value: 'value',
+            //    text: 'text'
+            //});
             //绑定学年、学期
             $.get('/Home/GetYearAndSemesteResult', function (ref) {
                 if (ref.code == "200") {
@@ -598,10 +588,10 @@ var bootstrap = function ($, learun) {
 
         var $content = $('body').find('.lr-layout-tool-left');
         var query = $content.lrGetFormData();
-        if (query.F_SchoolId == null || query.F_SchoolId == "") {
-            learun.alert.warning("请选择校区！");
-            return false;
-        }
+        //if (query.F_SchoolId == null || query.F_SchoolId == "") {
+        //    learun.alert.warning("请选择校区！");
+        //    return false;
+        //}
         if (query.AcademicYearNo == null || query.AcademicYearNo == "") {
             learun.alert.warning("请选择学年！");
             return false;
@@ -610,14 +600,14 @@ var bootstrap = function ($, learun) {
             learun.alert.warning("请选择学期！");
             return false;
         }
-        if (query.LessonNo == null || query.LessonNo == "") {
-            learun.alert.warning("请选择课程！");
-            return false;
-        }
-        if (query.EmpNo == null || query.EmpNo == "") {
-            learun.alert.warning("请选择教师！");
-            return false;
-        }
+        //if (query.LessonNo == null || query.LessonNo == "") {
+        //    learun.alert.warning("请选择课程！");
+        //    return false;
+        //}
+        //if (query.EmpNo == null || query.EmpNo == "") {
+        //    learun.alert.warning("请选择教师！");
+        //    return false;
+        //}
         return query;
     };
     page.init();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineService.cs

@@ -1771,15 +1771,16 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
             try
             {
                 var queryParam = queryJson.ToJObject();
-                var F_SchoolId = queryParam["F_SchoolId"].ToString();
+                //var F_SchoolId = queryParam["F_SchoolId"].ToString();
                 var AcademicYearNo = queryParam["AcademicYearNo"].ToString();
                 var Semester = queryParam["Semester"].ToString();
-                var LessonNo = queryParam["LessonNo"].ToString();
-                var EmpNo = queryParam["EmpNo"].ToString();
+                //var LessonNo = queryParam["LessonNo"].ToString();
+                //var EmpNo = queryParam["EmpNo"].ToString();
 
                 var now = DateTime.Now;
                 var loginUserInfo = LoginUserInfo.Get();
-                this.BaseRepository("CollegeMIS").ExecuteBySql("update StuScoreOnline set IsEditable='0',EditUserId='" + loginUserInfo.account + "',BeginModifyDate='" + now + "' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and LessonNo='" + LessonNo + "' and EmpNo='" + EmpNo + "' ");
+                //this.BaseRepository("CollegeMIS").ExecuteBySql("update StuScoreOnline set IsEditable='0',EditUserId='" + loginUserInfo.account + "',BeginModifyDate='" + now + "' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and LessonNo='" + LessonNo + "' and EmpNo='" + EmpNo + "' ");
+                this.BaseRepository("CollegeMIS").ExecuteBySql("update StuScoreOnline set IsEditable='0',EditUserId='" + loginUserInfo.account + "',BeginModifyDate='" + now + "' where AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' ");
 
             }
             catch (Exception ex)
@@ -1847,15 +1848,16 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
             try
             {
                 var queryParam = queryJson.ToJObject();
-                var F_SchoolId = queryParam["F_SchoolId"].ToString();
+                //var F_SchoolId = queryParam["F_SchoolId"].ToString();
                 var AcademicYearNo = queryParam["AcademicYearNo"].ToString();
                 var Semester = queryParam["Semester"].ToString();
-                var LessonNo = queryParam["LessonNo"].ToString();
-                var EmpNo = queryParam["EmpNo"].ToString();
+                //var LessonNo = queryParam["LessonNo"].ToString();
+                //var EmpNo = queryParam["EmpNo"].ToString();
 
                 var now = DateTime.Now;
                 var loginUserInfo = LoginUserInfo.Get();
-                this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreOnline set IsEditable='1',EditUserId=null,BeginModifyDate=null,ModifyDate='{now}',ModifyUserId='{loginUserInfo.account}',ModifyUserName='{loginUserInfo.realName}' where F_SchoolId='{F_SchoolId}' and AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and LessonNo='{LessonNo}' and EmpNo='{EmpNo}' ");
+                //this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreOnline set IsEditable='1',EditUserId=null,BeginModifyDate=null,ModifyDate='{now}',ModifyUserId='{loginUserInfo.account}',ModifyUserName='{loginUserInfo.realName}' where F_SchoolId='{F_SchoolId}' and AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and LessonNo='{LessonNo}' and EmpNo='{EmpNo}' ");
+                this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreOnline set IsEditable='1',EditUserId=null,BeginModifyDate=null,ModifyDate='{now}',ModifyUserId='{loginUserInfo.account}',ModifyUserName='{loginUserInfo.realName}' where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' ");
 
             }
             catch (Exception ex)
@@ -1879,11 +1881,11 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
             try
             {
                 var queryParam = queryJson.ToJObject();
-                var F_SchoolId = queryParam["F_SchoolId"].ToString();
+                //var F_SchoolId = queryParam["F_SchoolId"].ToString();
                 var AcademicYearNo = queryParam["AcademicYearNo"].ToString();
                 var Semester = queryParam["Semester"].ToString();
-                var LessonNo = queryParam["LessonNo"].ToString();
-                var EmpNo = queryParam["EmpNo"].ToString();
+                //var LessonNo = queryParam["LessonNo"].ToString();
+                //var EmpNo = queryParam["EmpNo"].ToString();
 
                 var now = DateTime.Now;
                 var loginUserInfo = new
@@ -1891,7 +1893,8 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                     account = name.Split('_')[0],
                     realName = name.Split('_')[1]
                 };
-                this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreOnline set IsEditable='1',EditUserId=null,BeginModifyDate=null,ModifyDate='{now}',ModifyUserId='{loginUserInfo.account}',ModifyUserName='{loginUserInfo.realName}' where F_SchoolId='{F_SchoolId}' and AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and LessonNo='{LessonNo}' and EmpNo='{EmpNo}' ");
+                //this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreOnline set IsEditable='1',EditUserId=null,BeginModifyDate=null,ModifyDate='{now}',ModifyUserId='{loginUserInfo.account}',ModifyUserName='{loginUserInfo.realName}' where F_SchoolId='{F_SchoolId}' and AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and LessonNo='{LessonNo}' and EmpNo='{EmpNo}' ");
+                this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreOnline set IsEditable='1',EditUserId=null,BeginModifyDate=null,ModifyDate='{now}',ModifyUserId='{loginUserInfo.account}',ModifyUserName='{loginUserInfo.realName}' where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' ");
 
             }
             catch (Exception ex)
@@ -1917,13 +1920,14 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
             try
             {
                 var queryParam = queryJson.ToJObject();
-                var F_SchoolId = queryParam["F_SchoolId"].ToString();
+                //var F_SchoolId = queryParam["F_SchoolId"].ToString();
                 var AcademicYearNo = queryParam["AcademicYearNo"].ToString();
                 var Semester = queryParam["Semester"].ToString();
-                var LessonNo = queryParam["LessonNo"].ToString();
-                var EmpNo = queryParam["EmpNo"].ToString();
+                //var LessonNo = queryParam["LessonNo"].ToString();
+                //var EmpNo = queryParam["EmpNo"].ToString();
 
-                this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreOnline set CheckMark='{checkMark}' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and LessonNo='" + LessonNo + "' and EmpNo='" + EmpNo + "' ");
+                //this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreOnline set CheckMark='{checkMark}' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and LessonNo='" + LessonNo + "' and EmpNo='" + EmpNo + "' ");
+                this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreOnline set CheckMark='{checkMark}' where AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' ");
 
             }
             catch (Exception ex)
@@ -2189,11 +2193,11 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                 DataTable failDt = new DataTable();
 
                 var queryParam = queryJson.ToJObject();
-                var F_SchoolId = queryParam["F_SchoolId"].ToString();
+                //var F_SchoolId = queryParam["F_SchoolId"].ToString();
                 var AcademicYearNo = queryParam["AcademicYearNo"].ToString();
                 var Semester = queryParam["Semester"].ToString();
-                var LessonNo = queryParam["LessonNo"].ToString();
-                var EmpNo = queryParam["EmpNo"].ToString();
+                //var LessonNo = queryParam["LessonNo"].ToString();
+                //var EmpNo = queryParam["EmpNo"].ToString();
 
                 //获取成绩比例数据
                 //var stuSelectLessonListEntity = db.FindEntity<StuSelectLessonListOfElectiveOnlineEntity>(x => x.F_SchoolId == F_SchoolId && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester && x.LessonNo == LessonNo && x.EmpNo == EmpNo && x.Status == 2);
@@ -2256,16 +2260,16 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                                     failDt.Rows.Add(dr.ItemArray);
                                     continue;
                                 }
-                                if (!lessonName_dr.Equals(list.FirstOrDefault().LessonName))
-                                {
-                                    dr["导入错误"] = "课程名称与查询条件课程（" + list.FirstOrDefault().LessonName + "）不匹配！";
-                                    failDt.Rows.Add(dr.ItemArray);
-                                    continue;
-                                }
-                                var item = list.FirstOrDefault(x => x.StuNo == stuNo_dr && x.StuName == stuName_dr && x.LessonNo == LessonNo && x.EmpNo == EmpNo);
+                                //if (!lessonName_dr.Equals(list.FirstOrDefault().LessonName))
+                                //{
+                                //    dr["导入错误"] = "课程名称与查询条件课程（" + list.FirstOrDefault().LessonName + "）不匹配！";
+                                //    failDt.Rows.Add(dr.ItemArray);
+                                //    continue;
+                                //}
+                                var item = list.FirstOrDefault(x => x.StuNo == stuNo_dr && x.StuName == stuName_dr && x.LessonName == lessonName_dr && x.AcademicYearNo == academicYearNo_dr && x.Semester == semester_dr);
                                 if (item == null)
                                 {
-                                    dr["导入错误"] = "找不到学生学号为" + stuNo_dr + "，学生姓名为" + stuName_dr + "的学生";
+                                    dr["导入错误"] = "找不到学生学号为" + stuNo_dr + "，学生姓名为" + stuName_dr + "，课程名称为" + lessonName_dr + "的学生";
                                     failDt.Rows.Add(dr.ItemArray);
                                     continue;
                                 }
@@ -2286,7 +2290,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                                     continue;
                                 }
                                 db.ExecuteBySql($"update StuScoreOnline set TermEndScore={TermEndScore},Score={TermEndScore},Remark='{dr["备注"].ToString().Trim()}' where ScoreId='{item.ScoreId}' ");
-                                
+
                             }
                             catch (Exception e)
                             {

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/from.vue

@@ -4,9 +4,9 @@
 		<l-input title="学期" placeholder="请填写学期" :value="data.Semester" disabled right />
 		<l-input title="课程编号" placeholder="请填写课程编号" :value="data.LessonNo" disabled right />
 		<l-input title="课程名称" placeholder="请填写课程名称" :value="data.LessonName" disabled right />
-		<l-input title="建课教师" placeholder="请填写建课教师" :value="data.EmpName" disabled right />
+		<l-input title="建课教师" placeholder="请填写建课教师" :value="data.EmpNo" disabled right />
 		
-		<l-input title="建课学校" placeholder="请填写建课学校" :value="F_SchoolName" disabled right />
+		<l-input title="建课学校" placeholder="请填写建课学校" :value="data.F_SchoolId" disabled right />
 
 		<l-input title="已报人数" placeholder="请填写已报人数" :value="data.StuNumOfApply" disabled right />
 		<view class="btn" @click="fromBtn" v-show="showFlag">报名</view>
@@ -25,7 +25,6 @@
 				dataSource: {
 					F_SchoolId: []
 				},
-				F_SchoolName: '', //建课学校名称
 			}
 		},
 		methods: {
@@ -45,15 +44,6 @@
 				this.HTTP_GET('learun/LessonInfoOfElectiveOnline/form', this.keyValue, '加载数据时出错').then(res => {
 					this.HIDE_LOADING();
 					this.data = res.data;
-					let timer3 = setTimeout(() => {
-						let checkedSchool = this.dataSource.F_SchoolId.find((item) => {
-							return item.value === this.data.F_SchoolId
-						});
-						if (checkedSchool) {
-							this.F_SchoolName = checkedSchool.text;
-						}
-						clearTimeout(timer3);
-					}, 500);
 
 				});
 			},

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/list.vue

@@ -28,11 +28,11 @@
 						</view>
 						<view class="">
 							<text>建课教师：</text>
-							{{ item.EmpName }}
+							{{ item.EmpNo }}
 						</view>
 						<view class="">
 							<text>建课学校：</text>
-							{{ dataSource.F_SchoolId.find(x=>x.value==item.F_SchoolId).text }}
+							{{ item.F_SchoolId }}
 						</view>
 						<view class="">
 							<text>已报人数：</text>
@@ -145,7 +145,7 @@
 					pagination: {
 						rows: this.rows,
 						page: this.page,
-						sidx: 'AcademicYearNo DESC, Semester DESC, LessonNo ASC,EmpNo ASC',
+						sidx: 'AcademicYearNo DESC, Semester DESC, LessonNo ASC',
 						sord: 'asc'
 					},
 					//queryJson: '{}'