【修改】必修课成绩管理、毕业生管理、疫情记录下的功能取消系；

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

@@ -26,10 +26,6 @@
                                     <div class="lr-form-item-title">年级</div>
                                     <div id="Grade" type="lrselect" class="lr-select"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo" type="lrselect" class="lr-select"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo" type="lrselect" class="lr-select"></div>

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

@@ -93,7 +93,6 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#LessonNo').lrselect({
                 placeholder: "请选择课程",
@@ -113,8 +112,6 @@ var bootstrap = function ($, learun) {
                     { label: "学年", name: "AcademicYearNo", width: 80, align: "left" },
                     { label: "学期", name: "Semester", width: 80, align: "left" },
                     { label: "年级", name: "Grade", width: 80, align: "left" },
-                    { label: "系编号", name: "DeptNo", width: 100, align: "left" },
-                    { label: "系名称", name: "DeptName", width: 150, align: "left" },
                     { label: "专业编号", name: "MajorNo", width: 100, align: "left" },
                     { label: "专业名称", name: "MajorName", width: 150, align: "left" },
                     { label: "课程编号", name: "LessonNo", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/ClassReport.cshtml

@@ -13,10 +13,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/ClassReport.js

@@ -42,19 +42,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 200, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
-                    }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
                     function (val) {
@@ -82,19 +69,6 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/R_EnterBuilding/ClassReportInfo',
                 headData: [
-                    {
-                        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']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -13,10 +13,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

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

@@ -45,19 +45,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 280, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
-                    }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
                     function (val) {
@@ -85,8 +72,8 @@ var bootstrap = function ($, learun) {
                     })
                 }
             });
-            $('#BId').lrDataSourceSelect({ code: 'ClassroomBuilding',value: 'classroombuildingid',text: 'classroombuildingname' });
-            $('#SId').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuno',text: 'stuname' });
+            $('#BId').lrDataSourceSelect({ code: 'ClassroomBuilding', value: 'classroombuildingid', text: 'classroombuildingname' });
+            $('#SId').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -126,7 +113,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/R_EnterBuilding/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/R_EnterBuilding/DeleteForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -143,37 +130,28 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/R_EnterBuilding/GetPageList',
                 headData: [
-                    { label: "教学楼", name: "BId", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('custmerData', {
-                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ClassroomBuilding',
-                                 key: value,
-                                 keyId: 'classroombuildingid',
-                                 callback: function (_data) {
-                                     callback(_data['classroombuildingname']);
-                                 }
-                             });
-                        }},
-                    { label: "学生名称", name: "SId", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('custmerData', {
-                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
-                                 key: value,
-                                 keyId: 'stuno',
-                                 callback: function (_data) {
-                                     callback(_data['stuname']);
-                                 }
-                             });
-                        }},
                     {
-                        label: "系", name: "DeptNo", width: 100, align: "left",
+                        label: "教学楼", name: "BId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ClassroomBuilding',
+                                key: value,
+                                keyId: 'classroombuildingid',
+                                callback: function (_data) {
+                                    callback(_data['classroombuildingname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学生名称", name: "SId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
                                 key: value,
-                                keyId: 'deptno',
+                                keyId: 'stuno',
                                 callback: function (_data) {
-                                    callback(_data['deptname']);
+                                    callback(_data['stuname']);
                                 }
                             });
                         }
@@ -187,7 +165,7 @@ var bootstrap = function ($, learun) {
                                 callback: function (_data) {
                                     callback(_data['majorname']);
                                 }
-                                
+
                             });
                         }
                     }, {
@@ -203,9 +181,9 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "扫描时间", name: "EnterTime", width: 100, align: "left"},
+                    { label: "扫描时间", name: "EnterTime", width: 100, align: "left" },
                 ],
-                mainId:'ID',
+                mainId: 'ID',
                 sidx: 'EnterTime DESC',
                 isPage: true
             });
@@ -214,7 +192,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/MajorReport.cshtml

@@ -13,10 +13,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/MajorReport.js

@@ -42,19 +42,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 200, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
-                    }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname'
             });
@@ -68,19 +55,6 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/R_EnterBuilding/MajorReportInfo',
                 headData: [
-                    {
-                        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']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterSchool/ClassReport.cshtml

@@ -13,10 +13,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterSchool/ClassReport.js

@@ -42,19 +42,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 200, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
-                    }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
                     function (val) {
@@ -82,19 +69,6 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/R_EnterSchool/ClassReportInfo',
                 headData: [
-                    {
-                        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']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -13,10 +13,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

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

@@ -45,19 +45,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 280, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
-                    }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
                     function (val) {
@@ -168,19 +155,7 @@ var bootstrap = function ($, learun) {
                                 }
                             });
                         }
-                    }, {
-                        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']);
-                                }
-                            });
-                        }
-                    }, {
+                    },{
                         label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterSchool/MajorReport.cshtml

@@ -13,10 +13,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterSchool/MajorReport.js

@@ -42,19 +42,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 200, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
-                    }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname'
             });
@@ -68,19 +55,6 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/R_EnterSchool/MajorReportInfo',
                 headData: [
-                    {
-                        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']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.cshtml

@@ -22,10 +22,6 @@
                                     <div class="lr-form-item-title">第几级</div>
                                     <input id="Grade" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js

@@ -10,19 +10,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 290, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
-                    }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
                     function (val) {
@@ -74,19 +61,6 @@ var bootstrap = function ($, learun) {
                             return cellvalue == true ? "男" : "女";
                         }
                     },
-                    {
-                        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']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.cshtml

@@ -22,10 +22,6 @@
                                     <div class="lr-form-item-title">第几级</div>
                                     <input id="Grade" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js

@@ -10,19 +10,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 290, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
-                    }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
                     function (val) {
@@ -83,19 +70,6 @@ var bootstrap = function ($, learun) {
                             return cellvalue == true ? "男" : "女";
                         }
                     },
-                    {
-                        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']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -27,10 +27,6 @@
         <div class="lr-form-item-title">考生号<font face="宋体">*</font></div>
         <input id="ksh" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">系所<font face="宋体">*</font></div>
-        <input id="DeptNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <input id="MajorNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />

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

@@ -18,10 +18,6 @@
                                     <div class="lr-form-item-title">姓名</div>
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

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

@@ -10,7 +10,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             // 刷新
@@ -49,19 +48,6 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        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']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/GraduateScoreQueryAllIndex.cshtml

@@ -88,9 +88,6 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
-                        <div id="DeptNo" type="lrselect" class="lr-select"></div>
-                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="MajorNo" type="lrselect" class="lr-select"></div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/GraduateScoreQueryAllIndex.js

@@ -20,7 +20,6 @@ var bootstrap = function ($, learun) {
             // 查询
             $('#btn_Search').on('click', function () {
                 var p = {};
-                p.DeptNo = $('#DeptNo').lrselectGet();
                 p.MajorNo = $('#MajorNo').lrselectGet();
                 p.ClassNo = $('#ClassNo').lrselectGet();
                 p.StuNo = $('#StuNo').lrselectGet();
@@ -60,19 +59,6 @@ var bootstrap = function ($, learun) {
            
         },
         bindSelect: function () {
-            $('#DeptNo').lrDataSourceSelect({
-                placeholder: "请选择系", code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
-                    }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({
                 placeholder: "请选择专业", code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
                     function (val) {

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

@@ -47,19 +47,6 @@ var bootstrap = function ($, learun) {
                         });
                     }
                 },
-                {
-                    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']);
-                            }
-                        });
-                    }
-                },
                 {
                     label: "专业", name: "MajorNo", width: 100, align: "left",
                     formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js

@@ -47,19 +47,6 @@ var bootstrap = function ($, learun) {
                         });
                     }
                 },
-                {
-                    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']);
-                            }
-                        });
-                    }
-                },
                 {
                     label: "专业", name: "MajorNo", width: 100, align: "left",
                     formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreInputCancelIndex.js

@@ -145,19 +145,6 @@ var bootstrap = function ($, learun) {
                             return cellvalue == true ? "男" : "女";
                         }
                     },
-                    {
-                        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']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml

@@ -88,9 +88,6 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
-                        <div id="DeptNo" type="lrselect" class="lr-select"></div>
-                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="MajorNo" type="lrselect" class="lr-select"></div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js

@@ -20,7 +20,6 @@ var bootstrap = function ($, learun) {
             // 查询
             $('#btn_Search').on('click', function () {
                 var p = {};
-                p.DeptNo = $('#DeptNo').lrselectGet();
                 p.MajorNo = $('#MajorNo').lrselectGet();
                 p.ClassNo = $('#ClassNo').lrselectGet();
                 p.StuNo = $('#StuNo').lrselectGet();
@@ -69,19 +68,6 @@ var bootstrap = function ($, learun) {
 
         },
         bindSelect: function () {
-            $('#DeptNo').lrDataSourceSelect({
-                placeholder: "请选择系", code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
-                    }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({
                 placeholder: "请选择专业", code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
                     function (val) {

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

@@ -47,19 +47,6 @@ var bootstrap = function ($, learun) {
                         });
                     }
                 },
-                {
-                    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']);
-                            }
-                        });
-                    }
-                },
                 {
                     label: "专业", name: "MajorNo", width: 100, align: "left",
                     formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js

@@ -47,19 +47,6 @@ var bootstrap = function ($, learun) {
                         });
                     }
                 },
-                {
-                    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']);
-                            }
-                        });
-                    }
-                },
                 {
                     label: "专业", name: "MajorNo", width: 100, align: "left",
                     formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -47,19 +47,6 @@ var bootstrap = function ($, learun) {
                         });
                     }
                 },
-                {
-                    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']);
-                            }
-                        });
-                    }
-                },
                 {
                     label: "专业", name: "MajorNo", width: 100, align: "left",
                     formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js

@@ -47,19 +47,6 @@ var bootstrap = function ($, learun) {
                         });
                     }
                 },
-                {
-                    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']);
-                            }
-                        });
-                    }
-                },
                 {
                     label: "专业", name: "MajorNo", width: 100, align: "left",
                     formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -13,10 +13,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

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

@@ -46,19 +46,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 300, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
-                    }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
                     function (val) {
@@ -161,19 +148,6 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/Thermography/GetPageList',
                 headData: [
-                    {
-                        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']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.cshtml

@@ -13,10 +13,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.js

@@ -46,19 +46,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 300, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
-                    }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
                     function (val) {
@@ -100,19 +87,6 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/Thermography/GetPageList',
                 headData: [
-                    {
-                        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']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/StatisticIndex.cshtml

@@ -14,8 +14,8 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorNo"></div>
                                 </div>
                             </div>
                         </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/StatisticIndex.js

@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 200, 400);
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -58,14 +58,14 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/Thermography/GetListOfStatistic',
                 headData: [
                     {
-                        label: "系", name: "DeptNo", width: 100, align: "left",
+                        label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
                                 key: value,
-                                keyId: 'deptno',
+                                keyId: 'majorno',
                                 callback: function (_data) {
-                                    callback(_data['deptname']);
+                                    callback(_data['majorname']);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/SubmitIndex.js

@@ -88,19 +88,6 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/Thermography/GetPageListOfStudent',
                 headData: [
-                    {
-                        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']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicSituationCopyController.cs

@@ -20,7 +20,6 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
     {
         private EpidemicSituationIBLL epidemicSituationIBLL = new EpidemicSituationBLL();
         private DataItemIBLL dataItemIbll = new DataItemBLL();
-        private CdDeptIBLL cdDeptIbll = new CdDeptBLL();
         private CdMajorIBLL cdMajorIbll = new CdMajorBLL();
         private ClassInfoIBLL classInfoIbll = new ClassInfoBLL();
         private StuInfoBasicIBLL stuInfoBasicIbll = new StuInfoBasicBLL();
@@ -107,10 +106,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             var stuEntity = stuInfoBasicIbll.GetStuInfoBasicEntityByStuNo(studentId);
             if (stuEntity != null)
             {
-                var detptName = cdDeptIbll.GetCdDeptEntityByNo(stuEntity.DeptNo)?.DeptName;
                 var majorName = cdMajorIbll.GetCdMajorEntityByMajorNo(stuEntity.MajorNo)?.MajorName;
                 var className = classInfoIbll.GetClassInfoEntityByClassNo(stuEntity.ClassNo)?.ClassName;
-                res = $"{detptName} {majorName} {className}";
+                res = $"{majorName} {className}";
             }
 
             return Success(new { res, Address = stuEntity?.MailAddress });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.cshtml

@@ -19,7 +19,7 @@
                                     <div id="Type"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系|专业|班级</div>
+                                    <div class="lr-form-item-title">专业|班级</div>
                                     <input id="StudentSource" type="text" class="form-control" />
                                 </div>
                             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js

@@ -74,7 +74,6 @@ var bootstrap = function ($, learun) {
                     {
                         label: "所在部门", name: "Department", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            console.log(row);
                             if (row.StudentSource) {
                                 callback(row.StudentSource);
                             } else {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanEntity.cs

@@ -36,11 +36,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("SEMESTER")]
         public string Semester { get; set; }
         /// <summary>
-        /// 系所码
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// 专业码
         /// </summary>
         [Column("MAJORNO")]
@@ -161,11 +156,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("BRIEFINTRO")]
         public string BriefIntro { get; set; }
         /// <summary>
-        /// 负责开课院系代码
-        /// </summary>
-        [Column("TEACHDEPTNO")]
-        public string TeachDeptNo { get; set; }
-        /// <summary>
         /// 修读对象
         /// </summary>
         [Column("WHOSTUDY")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanService.cs

@@ -32,9 +32,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var basedbname = BaseRepository().getDbConnection().Database;
 
                 var strSql = new StringBuilder();
-                strSql.Append("select t.*,c.F_FullName as F_School,d.DeptName,m.MajorName from OpenLessonPlan t ");
+                strSql.Append("select t.*,c.F_FullName as F_School,m.MajorName from OpenLessonPlan t ");
                 strSql.Append(" left join " + basedbname + ".dbo.LR_Base_Company c on t.F_SchoolId=c.f_CompanyId ");
-                strSql.Append(" left join CdDept d on t.DeptNo=d.DeptNo ");
                 strSql.Append(" left join CdMajor m on t.MajorNo=m.MajorNo ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -65,16 +64,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Grade", queryParam["Grade"].ToString(), DbType.String);
                     strSql.Append(" AND t.Grade = @Grade ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.DeptNo = @DeptNo ");
-                }
-                if (!queryParam["DeptName"].IsEmpty())
-                {
-                    dp.Add("DeptName", "%" + queryParam["DeptName"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND d.DeptName Like @DeptName ");
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
@@ -195,10 +184,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             db.Update(model);
 
                             //修改StuSelectLessonList中的比例
-                            db.ExecuteBySql("update StuSelectLessonList set OrdinaryScoreScale=" + entity.OrdinaryScoreScale + ",TermInScoreScale=" + entity.TermInScoreScale + ",TermEndScoreScale=" + entity.TermEndScoreScale + ",OtherScoreScale=" + entity.OtherScoreScale + " where AcademicYearNo='" + model.AcademicYearNo + "' and Semester='" + model.Semester + "' and OpenLessonDeptNo='" + model.DeptNo + "' and OpenLessonMajorNo='" + model.MajorNo + "' and LessonNo='" + model.LessonNo + "' and LessonSortNo='" + model.LessonSortNo + "' and Grade='" + model.Grade + "' ");
+                            db.ExecuteBySql("update StuSelectLessonList set OrdinaryScoreScale=" + entity.OrdinaryScoreScale + ",TermInScoreScale=" + entity.TermInScoreScale + ",TermEndScoreScale=" + entity.TermEndScoreScale + ",OtherScoreScale=" + entity.OtherScoreScale + " where AcademicYearNo='" + model.AcademicYearNo + "' and Semester='" + model.Semester + "' and OpenLessonMajorNo='" + model.MajorNo + "' and LessonNo='" + model.LessonNo + "' and LessonSortNo='" + model.LessonSortNo + "' and Grade='" + model.Grade + "' ");
 
                             //修改StuScore中的成绩
-                            var beforeList = db.FindList<StuScoreEntity>(x => x.AcademicYearNo == model.AcademicYearNo && x.Semester == model.Semester && x.OpenLessonDeptNo == model.DeptNo && x.OpenLessonMajorNo == model.MajorNo && x.LessonNo == model.LessonNo && x.LessonSortNo == model.LessonSortNo && x.Grade == model.Grade);
+                            var beforeList = db.FindList<StuScoreEntity>(x => x.AcademicYearNo == model.AcademicYearNo && x.Semester == model.Semester && x.OpenLessonMajorNo == model.MajorNo && x.LessonNo == model.LessonNo && x.LessonSortNo == model.LessonSortNo && x.Grade == model.Grade);
                             if (beforeList.Any())
                             {
                                 foreach (var stuScoreItem in beforeList)
@@ -262,7 +251,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     return new OpenLessonPlanEntity();
                 }
 
-                return this.BaseRepository("CollegeMIS").FindEntity<OpenLessonPlanEntity>(x => x.F_SchoolId == F_SchoolId && x.Grade == classInfoEntity.Grade && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester && x.DeptNo == classInfoEntity.DeptNo && x.MajorNo == classInfoEntity.MajorNo && x.LessonNo == LessonNo && x.LessonSortNo == "1");
+                return this.BaseRepository("CollegeMIS").FindEntity<OpenLessonPlanEntity>(x => x.F_SchoolId == F_SchoolId && x.Grade == classInfoEntity.Grade && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester && x.MajorNo == classInfoEntity.MajorNo && x.LessonNo == LessonNo && x.LessonSortNo == "1");
             }
             catch (Exception ex)
             {
@@ -299,7 +288,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     return new StuSelectLessonListEntity();
                 }
 
-                return this.BaseRepository("CollegeMIS").FindEntity<StuSelectLessonListEntity>(x => x.F_SchoolId == F_SchoolId && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester && x.OpenLessonDeptNo == classInfoEntity.DeptNo && x.OpenLessonMajorNo == classInfoEntity.MajorNo && x.LessonNo == LessonNo && x.LessonSortNo == "1" && x.ClassNo == ClassNo);
+                return this.BaseRepository("CollegeMIS").FindEntity<StuSelectLessonListEntity>(x => x.F_SchoolId == F_SchoolId && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester && x.OpenLessonMajorNo == classInfoEntity.MajorNo && x.LessonNo == LessonNo && x.LessonSortNo == "1" && x.ClassNo == ClassNo);
             }
             catch (Exception ex)
             {
@@ -334,10 +323,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var classInfoEntity = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == ClassNo);
                 if (classInfoEntity != null)
                 {
-                    db.ExecuteBySql("update StuSelectLessonList set OrdinaryScoreScale=" + entity.OrdinaryScoreScale + ",TermInScoreScale=" + entity.TermInScoreScale + ",TermEndScoreScale=" + entity.TermEndScoreScale + ",OtherScoreScale=" + entity.OtherScoreScale + " where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonDeptNo='" + classInfoEntity.DeptNo + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
+                    db.ExecuteBySql("update StuSelectLessonList set OrdinaryScoreScale=" + entity.OrdinaryScoreScale + ",TermInScoreScale=" + entity.TermInScoreScale + ",TermEndScoreScale=" + entity.TermEndScoreScale + ",OtherScoreScale=" + entity.OtherScoreScale + " where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
 
                     //修改StuScore中的成绩
-                    var beforeList = db.FindList<StuScoreEntity>(x => x.F_SchoolId == F_SchoolId && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester && x.OpenLessonDeptNo == classInfoEntity.DeptNo && x.OpenLessonMajorNo == classInfoEntity.MajorNo && x.LessonNo == LessonNo && x.LessonSortNo == "1" && x.ClassNo == ClassNo);
+                    var beforeList = db.FindList<StuScoreEntity>(x => x.F_SchoolId == F_SchoolId && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester && x.OpenLessonMajorNo == classInfoEntity.MajorNo && x.LessonNo == LessonNo && x.LessonSortNo == "1" && x.ClassNo == ClassNo);
                     if (beforeList.Any())
                     {
                         foreach (var stuScoreItem in beforeList)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/R_EnterBuilding/R_EnterBuildingService.cs

@@ -50,13 +50,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     string sId = queryParam["SId"].ToString();
                     expression = expression.And(a => a.SId == sId);
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    string deptNo = queryParam["DeptNo"].ToString();
-                    var stuList = this.BaseRepository("CollegeMIS")
-                        .FindList<StuInfoBasicEntity>(a => a.DeptNo == deptNo).Select(a => a.StuNo).ToList();
-                    expression = expression.And(a => stuList.Contains(a.SId));
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     string majorNo = queryParam["MajorNo"].ToString();
@@ -68,13 +61,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     string classNo = queryParam["ClassNo"].ToString();
                     var stuList = this.BaseRepository("CollegeMIS")
-                        .FindList<StuInfoBasicEntity>(a => a.DeptNo == classNo).Select(a => a.StuNo).ToList();
+                        .FindList<StuInfoBasicEntity>(a => a.ClassNo == classNo).Select(a => a.StuNo).ToList();
                     expression = expression.And(a => stuList.Contains(a.SId));
                 }
 
 
                 var stuInfo = this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>();
-                var data=this.BaseRepository("CollegeMIS").FindList<R_EnterBuildingEntity>(expression, pagination).Join(stuInfo,a=>a.SId,b=>b.StuNo,(a,b)=>new {a,b}).Select(a=>new{a.a.BId,a.a.SId,a.a.EnterTime,a.b.DeptNo,a.b.MajorNo,a.b.ClassNo}).ToList().ConvertAll(a=>(object)a);
+                var data=this.BaseRepository("CollegeMIS").FindList<R_EnterBuildingEntity>(expression, pagination).Join(stuInfo,a=>a.SId,b=>b.StuNo,(a,b)=>new {a,b}).Select(a=>new{a.a.BId,a.a.SId,a.a.EnterTime,a.b.MajorNo,a.b.ClassNo}).ToList().ConvertAll(a=>(object)a);
                 return data;
 
             }
@@ -229,11 +222,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var stuexpression = LinqExtensions.True<StuInfoBasicEntity>();
                 var queryParam = queryJson.ToJObject();
                 List<object> list = new List<object>();
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    var deptNo = queryParam["DeptNo"].ToString();
-                    stuexpression = stuexpression.And(a => a.DeptNo == deptNo);
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     var majorNo = queryParam["MajorNo"].ToString();
@@ -254,7 +242,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var majorGroup = stuData.Where(a => a.MajorNo != "" && a.MajorNo != null).GroupBy(a => a.MajorNo).Select(a => a.Key).ToList();
                 foreach (var majorNo in majorGroup)
                 {
-                    var deptNo = stuData.FirstOrDefault(a => a.MajorNo == majorNo).DeptNo;
 
                     var stuNoList = stuData.Where(a => a.MajorNo == majorNo).Select(a => a.StuNo).ToList();
                     var stuEnterSchoolList = this.BaseRepository("CollegeMIS")
@@ -264,7 +251,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         .Count(a => a.HealthStatus != "1" && a.HealthStatus != "2");
                     var abnormalNum = stuData.Where(a => stuEnterSchoolList.Contains(a.StuNo))
                         .Count(a => a.HealthStatus == "1" || a.HealthStatus == "2");
-                    list.Add(new { DeptNo = deptNo, MajorNo = majorNo, StuNum = stuNum, Normal = normalNum, Abnormal = abnormalNum });
+                    list.Add(new { MajorNo = majorNo, StuNum = stuNum, Normal = normalNum, Abnormal = abnormalNum });
                 }
 
 
@@ -290,11 +277,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var stuexpression = LinqExtensions.True<StuInfoBasicEntity>();
                 var queryParam = queryJson.ToJObject();
                 List<object> list = new List<object>();
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    var deptNo = queryParam["DeptNo"].ToString();
-                    stuexpression = stuexpression.And(a => a.DeptNo == deptNo);
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     var majorNo = queryParam["MajorNo"].ToString();
@@ -320,7 +302,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var classGroup = stuData.Where(a => a.ClassNo != "" && a.ClassNo != null).GroupBy(a => a.ClassNo).Select(a => a.Key).ToList();
                 foreach (var classNo in classGroup)
                 {
-                    var deptNo = stuData.FirstOrDefault(a => a.ClassNo == classNo).DeptNo;
                     var majorNo = stuData.FirstOrDefault(a => a.ClassNo == classNo).MajorNo;
 
                     var stuNoList = stuData.Where(a => a.ClassNo == classNo).Select(a => a.StuNo).ToList();
@@ -331,7 +312,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         .Count(a => a.HealthStatus != "1" && a.HealthStatus != "2");
                     var abnormalNum = stuData.Where(a => stuEnterSchoolList.Contains(a.StuNo))
                         .Count(a => a.HealthStatus == "1" || a.HealthStatus == "2");
-                    list.Add(new { DeptNo = deptNo, MajorNo = majorNo, ClassNo = classNo, StuNum = stuNum, Normal = normalNum, Abnormal = abnormalNum });
+                    list.Add(new { MajorNo = majorNo, ClassNo = classNo, StuNum = stuNum, Normal = normalNum, Abnormal = abnormalNum });
                 }
 
                 return list;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/R_EnterSchool/R_EnterSchoolService.cs

@@ -50,13 +50,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     string sId = queryParam["SId"].ToString();
                     expression = expression.And(a => a.SId == sId);
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    string deptNo = queryParam["DeptNo"].ToString();
-                    var stuList = this.BaseRepository("CollegeMIS")
-                        .FindList<StuInfoBasicEntity>(a => a.DeptNo == deptNo).Select(a => a.StuNo).ToList();
-                    expression = expression.And(a => stuList.Contains(a.SId));
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     string majorNo = queryParam["MajorNo"].ToString();
@@ -68,12 +61,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     string classNo = queryParam["ClassNo"].ToString();
                     var stuList = this.BaseRepository("CollegeMIS")
-                        .FindList<StuInfoBasicEntity>(a => a.DeptNo == classNo).Select(a => a.StuNo).ToList();
+                        .FindList<StuInfoBasicEntity>(a => a.ClassNo == classNo).Select(a => a.StuNo).ToList();
                     expression = expression.And(a => stuList.Contains(a.SId));
                 }
 
                 var stuInfo = this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>();
-                var data=this.BaseRepository("CollegeMIS").FindList<R_EnterSchoolEntity>(expression, pagination).Join(stuInfo,a=>a.SId,b=>b.StuNo,(a,b)=>new {a,b}).Select(a=>new{a.a.UId,a.a.SId,a.a.EnterTime,a.b.DeptNo,a.b.MajorNo,a.b.ClassNo}).ToList().ConvertAll(a=>(object)a);
+                var data=this.BaseRepository("CollegeMIS").FindList<R_EnterSchoolEntity>(expression, pagination).Join(stuInfo,a=>a.SId,b=>b.StuNo,(a,b)=>new {a,b}).Select(a=>new{a.a.UId,a.a.SId,a.a.EnterTime,a.b.MajorNo,a.b.ClassNo}).ToList().ConvertAll(a=>(object)a);
 
                 return data;
             }
@@ -224,11 +217,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var stuexpression = LinqExtensions.True<StuInfoBasicEntity>();
                 var queryParam = queryJson.ToJObject();
                 List<object> list = new List<object>();
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    var deptNo = queryParam["DeptNo"].ToString();
-                    stuexpression = stuexpression.And(a => a.DeptNo == deptNo);
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     var majorNo = queryParam["MajorNo"].ToString();
@@ -247,7 +235,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var majorGroup = stuData.Where(a => a.MajorNo != "" && a.MajorNo != null).GroupBy(a => a.MajorNo).Select(a => a.Key).ToList();
                 foreach (var majorNo in majorGroup)
                 {
-                    var deptNo = stuData.FirstOrDefault(a => a.MajorNo == majorNo).DeptNo;
 
                     var stuNoList = stuData.Where(a => a.MajorNo == majorNo).Select(a => a.StuNo).ToList();
                     var stuEnterSchoolList = this.BaseRepository("CollegeMIS")
@@ -257,7 +244,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         .Count(a => a.HealthStatus != "1" && a.HealthStatus != "2");
                     var abnormalNum = stuData.Where(a => stuEnterSchoolList.Contains(a.StuNo))
                         .Count(a => a.HealthStatus == "1" || a.HealthStatus == "2");
-                    list.Add(new { DeptNo = deptNo, MajorNo = majorNo, StuNum = stuNum, Normal = normalNum, Abnormal = abnormalNum });
+                    list.Add(new { MajorNo = majorNo, StuNum = stuNum, Normal = normalNum, Abnormal = abnormalNum });
                 }
 
 
@@ -283,11 +270,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var stuexpression = LinqExtensions.True<StuInfoBasicEntity>();
                 var queryParam = queryJson.ToJObject();
                 List<object> list = new List<object>();
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    var deptNo = queryParam["DeptNo"].ToString();
-                    stuexpression = stuexpression.And(a => a.DeptNo == deptNo);
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     var majorNo = queryParam["MajorNo"].ToString();
@@ -313,7 +295,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var classGroup = stuData.Where(a => a.ClassNo != "" && a.ClassNo != null).GroupBy(a => a.ClassNo).Select(a => a.Key).ToList();
                 foreach (var classNo in classGroup)
                 {
-                    var deptNo = stuData.FirstOrDefault(a => a.ClassNo == classNo).DeptNo;
                     var majorNo = stuData.FirstOrDefault(a => a.ClassNo == classNo).MajorNo;
 
                     var stuNoList = stuData.Where(a => a.ClassNo == classNo).Select(a => a.StuNo).ToList();
@@ -324,7 +305,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         .Count(a => a.HealthStatus != "1" && a.HealthStatus != "2");
                     var abnormalNum = stuData.Where(a => stuEnterSchoolList.Contains(a.StuNo))
                         .Count(a => a.HealthStatus == "1" || a.HealthStatus == "2");
-                    list.Add(new { DeptNo = deptNo, MajorNo = majorNo, ClassNo = classNo, StuNum = stuNum, Normal = normalNum, Abnormal = abnormalNum });
+                    list.Add(new { MajorNo = majorNo, ClassNo = classNo, StuNum = stuNum, Normal = normalNum, Abnormal = abnormalNum });
                 }
 
                 return list;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs

@@ -51,12 +51,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("KSH")]
         public string ksh { get; set; }
         /// <summary>
-        /// 系所
-        /// </summary>
-        /// <returns></returns>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// 专业
         /// </summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateService.cs

@@ -29,7 +29,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.NoticeNo,
                 t.GraduateYear,
                 t.ksh,
-                t.DeptNo,
                 t.MajorNo,
                 t.Grade,
                 t.ClassNo,

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs

@@ -34,12 +34,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUNO")]
         public string StuNo { get; set; }
         /// <summary>
-        /// 学生所在系部
-        /// </summary>
-        /// <returns></returns>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// 学生所在专业号
         /// </summary>
         /// <returns></returns>
@@ -76,12 +70,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("SEMESTER")]
         public string Semester { get; set; }
         /// <summary>
-        /// 开课系部码
-        /// </summary>
-        /// <returns></returns>
-        [Column("OPENLESSONDEPTNO")]
-        public string OpenLessonDeptNo { get; set; }
-        /// <summary>
         /// 开课专业码
         /// </summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs

@@ -30,14 +30,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.ScoreId,
                 t.NoticeBookNo,
                 t.StuNo,
-                t.DeptNo,
                 t.MajorNo,
                 t.ClassNo,
                 t.StuName,
                 t.GenderNo,
                 t.AcademicYearNo,
                 t.Semester,
-                t.OpenLessonDeptNo,
                 t.OpenLessonMajorNo,
                 t.LessonNo,
                 t.LessonName,
@@ -901,14 +899,12 @@ where AcademicYearNo='" + strAcademicYear + "' and Semester='" + strSemester + "
                             var insertDatastuselect = new StuSelectLessonListEntity();
                             insertDatastuselect.NoticeBookNo = stu.NoticeNo;
                             insertDatastuselect.StuNo = stu.StuNo;
-                            insertDatastuselect.DeptNo = stu.DeptNo;
                             insertDatastuselect.ClassNo = stu.ClassNo;
                             insertDatastuselect.MajorNo = stu.MajorNo;
                             insertDatastuselect.StuName = stu.StuName;
                             insertDatastuselect.GenderNo = stu.GenderNo != null && stu.GenderNo.Value ? "1" : "0";
                             insertDatastuselect.AcademicYearNo = itemteachclass.AcademicYearNo;
                             insertDatastuselect.Semester = itemteachclass.Semester;
-                            insertDatastuselect.OpenLessonDeptNo = itemteachclass.DeptNo;
                             insertDatastuselect.OpenLessonMajorNo = itemteachclass.MajorNo;
                             insertDatastuselect.LessonNo = itemteachclass.LessonNo;
                             insertDatastuselect.LessonName = lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo)?.LessonName;
@@ -931,19 +927,15 @@ where AcademicYearNo='" + strAcademicYear + "' and Semester='" + strSemester + "
                             if (stuSelectLessonListEntityData.Count(m => m.StuNo == insertDatastuselect.StuNo &&
                                                                          m.AcademicYearNo == insertDatastuselect.AcademicYearNo &&
                                                                          m.Semester == insertDatastuselect.Semester &&
-                                                                         m.DeptNo == insertDatastuselect.DeptNo &&
                                                                          m.MajorNo == insertDatastuselect.MajorNo &&
                                                                          m.LessonNo == insertDatastuselect.LessonNo &&
                                                                          m.Grade == insertDatastuselect.Grade &&
-                                                                         m.OpenLessonDeptNo == insertDatastuselect.OpenLessonDeptNo &&
                                                                          m.OpenLessonMajorNo == insertDatastuselect.OpenLessonMajorNo) == 0 && insertStuSelectLessonListDataList.Count(m => m.StuNo == insertDatastuselect.StuNo &&
                                                                                                                                                                                             m.AcademicYearNo == insertDatastuselect.AcademicYearNo &&
                                                                                                                                                                                             m.Semester == insertDatastuselect.Semester &&
-                                                                                                                                                                                            m.DeptNo == insertDatastuselect.DeptNo &&
                                                                                                                                                                                             m.MajorNo == insertDatastuselect.MajorNo &&
                                                                                                                                                                                             m.LessonNo == insertDatastuselect.LessonNo &&
                                                                                                                                                                                             m.Grade == insertDatastuselect.Grade &&
-                                                                                                                                                                                            m.OpenLessonDeptNo == insertDatastuselect.OpenLessonDeptNo &&
                                                                                                                                                                                             m.OpenLessonMajorNo == insertDatastuselect.OpenLessonMajorNo) == 0)
                             {
                                 insertStuSelectLessonListDataList.Add(insertDatastuselect);
@@ -954,10 +946,10 @@ where AcademicYearNo='" + strAcademicYear + "' and Semester='" + strSemester + "
                 }
                 //重置StuScore
                 var strSql = new StringBuilder();
-                strSql.Append(@"insert into stuscore(NoticeBookNo,StuNo,DeptNo,MajorNo,ClassNo,StuName,GenderNo,AcademicYearNo,Semester,OpenLessonDeptNo,OpenLessonMajorNo,LessonNo,LessonName,LessonNameEn,TeachClassNo,LessonSortNo,StuSortNo,Grade,StudyScore,TotalStudyHour,OrdinaryScore,TermInScore,TermEndScore,OtherScore,IsInEffect,Remark,ConflictLessonNo,IsPitchOn,CheckMark,TechPlanNo,EmpNo,PartCode,ScoreRecordStyleNo,TestModeNo,zysx,TestKindNo,IsEditable)
-select NoticeBookNo,StuNo,DeptNo,MajorNo,ClassNo,StuName,GenderNo,AcademicYearNo,Semester,OpenLessonDeptNo,OpenLessonMajorNo,LessonNo,LessonName,LessonNameEng as LessionNameEn,TeachClassNo,LessonSortNo,StuSortNo,Grade,StudyScore,TotalStudyHour,'0','0','0','0',IsInEffect,Remark,ConflictLessonNo,IsPitchOn,CheckMark,TeachPlanNo as TechPlanNo,EmpNo,PartCode,ScoreRecordStyleNo,TestModeNo,zysx=1,TestKindNo=1,IsEditable=1 from 
+                strSql.Append(@"insert into stuscore(NoticeBookNo,StuNo,MajorNo,ClassNo,StuName,GenderNo,AcademicYearNo,Semester,OpenLessonMajorNo,LessonNo,LessonName,LessonNameEn,TeachClassNo,LessonSortNo,StuSortNo,Grade,StudyScore,TotalStudyHour,OrdinaryScore,TermInScore,TermEndScore,OtherScore,IsInEffect,Remark,ConflictLessonNo,IsPitchOn,CheckMark,TechPlanNo,EmpNo,PartCode,ScoreRecordStyleNo,TestModeNo,zysx,TestKindNo,IsEditable)
+select NoticeBookNo,StuNo,MajorNo,ClassNo,StuName,GenderNo,AcademicYearNo,Semester,OpenLessonMajorNo,LessonNo,LessonName,LessonNameEng as LessionNameEn,TeachClassNo,LessonSortNo,StuSortNo,Grade,StudyScore,TotalStudyHour,'0','0','0','0',IsInEffect,Remark,ConflictLessonNo,IsPitchOn,CheckMark,TeachPlanNo as TechPlanNo,EmpNo,PartCode,ScoreRecordStyleNo,TestModeNo,zysx=1,TestKindNo=1,IsEditable=1 from 
 (
-select s.NoticeBookNo,s.StuNo,s.DeptNo,s.MajorNo,s.ClassNo,s.StuName,s.GenderNo,s.AcademicYearNo,s.Semester,s.OpenLessonDeptNo,s.OpenLessonMajorNo,s.LessonNo,s.LessonName,s.LessonNameEng,s.TeachClassNo,s.LessonSortNo,s.StuSortNo,s.Grade,s.StudyScore,s.TotalStudyHour,s.IsInEffect,s.Remark,s.ConflictLessonNo,s.IsPitchOn,s.CheckMark,s.TeachPlanNo,s.EmpNo,s.PartCode,o.ScoreRecordStyleNo,cs.ScoreRecordName,bc.TestModeNo,bc.TestMode
+select s.NoticeBookNo,s.StuNo,s.MajorNo,s.ClassNo,s.StuName,s.GenderNo,s.AcademicYearNo,s.Semester,s.OpenLessonMajorNo,s.LessonNo,s.LessonName,s.LessonNameEng,s.TeachClassNo,s.LessonSortNo,s.StuSortNo,s.Grade,s.StudyScore,s.TotalStudyHour,s.IsInEffect,s.Remark,s.ConflictLessonNo,s.IsPitchOn,s.CheckMark,s.TeachPlanNo,s.EmpNo,s.PartCode,o.ScoreRecordStyleNo,cs.ScoreRecordName,bc.TestModeNo,bc.TestMode
 from StuSelectLessonList s 
 left join OpenLessonPlan o on s.AcademicYearNo=o.AcademicYearNo and s.Semester=o.Semester and s.LessonNo=o.LessonNo 
 and s.PartCode=o.PartCode and s.OpenLessonMajorNo=o.MajorNo 
@@ -1606,7 +1598,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                 var classInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(x => x.ClassNo == ClassNo);
                 if (classInfoEntity != null)
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuScore set IsEditable='0',EditUserId='" + loginUserInfo.account + "',BeginModifyDate='" + now + "' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonDeptNo='" + classInfoEntity.DeptNo + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuScore set IsEditable='0',EditUserId='" + loginUserInfo.account + "',BeginModifyDate='" + now + "' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
                 }
             }
             catch (Exception ex)
@@ -1686,7 +1678,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                 var classInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(x => x.ClassNo == ClassNo);
                 if (classInfoEntity != null)
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScore 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 OpenLessonDeptNo='{classInfoEntity.DeptNo}' and OpenLessonMajorNo='{classInfoEntity.MajorNo}' and LessonNo='{LessonNo}' and LessonSortNo='1' and ClassNo='{ClassNo}' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScore 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 OpenLessonMajorNo='{classInfoEntity.MajorNo}' and LessonNo='{LessonNo}' and LessonSortNo='1' and ClassNo='{ClassNo}' ");
                 }
             }
             catch (Exception ex)
@@ -1727,7 +1719,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                 var classInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(x => x.ClassNo == ClassNo);
                 if (classInfoEntity != null)
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScore 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 OpenLessonDeptNo='{classInfoEntity.DeptNo}' and OpenLessonMajorNo='{classInfoEntity.MajorNo}' and LessonNo='{LessonNo}' and LessonSortNo='1' and ClassNo='{ClassNo}' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScore 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 OpenLessonMajorNo='{classInfoEntity.MajorNo}' and LessonNo='{LessonNo}' and LessonSortNo='1' and ClassNo='{ClassNo}' ");
                 }
             }
             catch (Exception ex)
@@ -1763,7 +1755,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                 var classInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(x => x.ClassNo == ClassNo);
                 if (classInfoEntity != null)
                 {
-                    db.ExecuteBySql($"update StuScore set CheckMark='{checkMark}' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonDeptNo='" + classInfoEntity.DeptNo + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
+                    db.ExecuteBySql($"update StuScore set CheckMark='{checkMark}' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
                     //教师电子成绩单
                     if (checkMark == 0)//撤销
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs

@@ -33,12 +33,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUNO")]
         public string StuNo { get; set; }
         /// <summary>
-        /// DeptNo
-        /// </summary>
-        /// <returns></returns>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// MajorNo
         /// </summary>
         /// <returns></returns>
@@ -75,12 +69,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("SEMESTER")]
         public string Semester { get; set; }
         /// <summary>
-        /// OpenLessonDeptNo
-        /// </summary>
-        /// <returns></returns>
-        [Column("OPENLESSONDEPTNO")]
-        public string OpenLessonDeptNo { get; set; }
-        /// <summary>
         /// OpenLessonMajorNo
         /// </summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs

@@ -27,14 +27,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.ScoreId,
                 t.NoticeBookNo,
                 t.StuNo,
-                t.DeptNo,
                 t.MajorNo,
                 t.ClassNo,
                 t.StuName,
                 t.GenderNo,
                 t.AcademicYearNo,
                 t.Semester,
-                t.OpenLessonDeptNo,
                 t.OpenLessonMajorNo,
                 t.LessonNo,
                 t.LessonName,
@@ -460,7 +458,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var classInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(x => x.ClassNo == ClassNo);
                 if (classInfoEntity != null)
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuScoreNotPass set IsEditable='0',EditUserId='" + loginUserInfo.account + "',BeginModifyDate='" + now + "' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonDeptNo='" + classInfoEntity.DeptNo + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuScoreNotPass set IsEditable='0',EditUserId='" + loginUserInfo.account + "',BeginModifyDate='" + now + "' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
                 }
             }
             catch (Exception ex)
@@ -535,7 +533,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var classInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(x => x.ClassNo == ClassNo);
                 if (classInfoEntity != null)
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreNotPass 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 OpenLessonDeptNo='{classInfoEntity.DeptNo}' and OpenLessonMajorNo='{classInfoEntity.MajorNo}' and LessonNo='{LessonNo}' and LessonSortNo='1' and ClassNo='{ClassNo}' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreNotPass 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 OpenLessonMajorNo='{classInfoEntity.MajorNo}' and LessonNo='{LessonNo}' and LessonSortNo='1' and ClassNo='{ClassNo}' ");
                 }
             }
             catch (Exception ex)
@@ -576,7 +574,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var classInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(x => x.ClassNo == ClassNo);
                 if (classInfoEntity != null)
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreNotPass 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 OpenLessonDeptNo='{classInfoEntity.DeptNo}' and OpenLessonMajorNo='{classInfoEntity.MajorNo}' and LessonNo='{LessonNo}' and LessonSortNo='1' and ClassNo='{ClassNo}' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreNotPass 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 OpenLessonMajorNo='{classInfoEntity.MajorNo}' and LessonNo='{LessonNo}' and LessonSortNo='1' and ClassNo='{ClassNo}' ");
                 }
             }
             catch (Exception ex)
@@ -611,7 +609,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var classInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(x => x.ClassNo == ClassNo);
                 if (classInfoEntity != null)
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreNotPass set CheckMark='{checkMark}' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonDeptNo='" + classInfoEntity.DeptNo + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreNotPass set CheckMark='{checkMark}' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
                 }
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoEntity.cs

@@ -30,11 +30,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUNO")]
         public string StuNo { get; set; }
         /// <summary>
-        /// DeptNo
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// MajorNo
         /// </summary>
         [Column("MAJORNO")]
@@ -65,11 +60,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("SEMESTER")]
         public string Semester { get; set; }
         /// <summary>
-        /// OpenLessonDeptNo
-        /// </summary>
-        [Column("OPENLESSONDEPTNO")]
-        public string OpenLessonDeptNo { get; set; }
-        /// <summary>
         /// OpenLessonMajorNo
         /// </summary>
         [Column("OPENLESSONMAJORNO")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs

@@ -428,7 +428,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var classInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(x => x.ClassNo == ClassNo);
                 if (classInfoEntity != null)
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuScoreNotPassTwo set IsEditable='0',EditUserId='" + loginUserInfo.account + "',BeginModifyDate='" + now + "' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonDeptNo='" + classInfoEntity.DeptNo + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuScoreNotPassTwo set IsEditable='0',EditUserId='" + loginUserInfo.account + "',BeginModifyDate='" + now + "' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
                 }
             }
             catch (Exception ex)
@@ -503,7 +503,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var classInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(x => x.ClassNo == ClassNo);
                 if (classInfoEntity != null)
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreNotPassTwo 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 OpenLessonDeptNo='{classInfoEntity.DeptNo}' and OpenLessonMajorNo='{classInfoEntity.MajorNo}' and LessonNo='{LessonNo}' and LessonSortNo='1' and ClassNo='{ClassNo}' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreNotPassTwo 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 OpenLessonMajorNo='{classInfoEntity.MajorNo}' and LessonNo='{LessonNo}' and LessonSortNo='1' and ClassNo='{ClassNo}' ");
                 }
             }
             catch (Exception ex)
@@ -544,7 +544,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var classInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(x => x.ClassNo == ClassNo);
                 if (classInfoEntity != null)
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreNotPassTwo 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 OpenLessonDeptNo='{classInfoEntity.DeptNo}' and OpenLessonMajorNo='{classInfoEntity.MajorNo}' and LessonNo='{LessonNo}' and LessonSortNo='1' and ClassNo='{ClassNo}' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreNotPassTwo 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 OpenLessonMajorNo='{classInfoEntity.MajorNo}' and LessonNo='{LessonNo}' and LessonSortNo='1' and ClassNo='{ClassNo}' ");
                 }
             }
             catch (Exception ex)
@@ -579,7 +579,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var classInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(x => x.ClassNo == ClassNo);
                 if (classInfoEntity != null)
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreNotPassTwo set CheckMark='{checkMark}' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonDeptNo='" + classInfoEntity.DeptNo + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreNotPassTwo set CheckMark='{checkMark}' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and OpenLessonMajorNo='" + classInfoEntity.MajorNo + "' and LessonNo='" + LessonNo + "' and LessonSortNo='1' and ClassNo='" + ClassNo + "' ");
                 }
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Thermography/ThermographyEntity.cs

@@ -70,11 +70,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("CREATETIME")]
         public DateTime? CreateTime { get; set; }
         /// <summary>
-        /// 系
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// 专业
         /// </summary>
         [Column("MAJORNO")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Thermography/ThermographyService.cs

@@ -48,11 +48,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
                     strSql.Append(" AND ( t.MeasureDate >= @startTime AND t.MeasureDate <= @endTime ) ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.DeptNo = @DeptNo ");
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
@@ -119,7 +114,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.ProcessingResult,
                 t.Remark,
                 t.MeasureTime,
-                t.DeptNo,
                 t.MajorNo,
                 t.MeasureDate
                 ");
@@ -225,7 +219,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var userInfo = LoginUserInfo.Get();
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.ClassNo,t.DeptNo,t.MajorNo,t.StuNo as PersonBeingMeasured,t.StuName as PersonBeingMeasuredName,'" + userInfo.account + "' as MeasurerID,'1' as Status,c.ClassName ");
+                strSql.Append("SELECT t.ClassNo,t.MajorNo,t.StuNo as PersonBeingMeasured,t.StuName as PersonBeingMeasuredName,'" + userInfo.account + "' as MeasurerID,'1' as Status,c.ClassName ");
                 strSql.Append("  FROM StuInfoBasic t left join StuInfoBasic tt on t.ClassNo=tt.ClassNo left join ClassInfo c on t.ClassNo=c.ClassNo ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -269,7 +263,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var dp = new DynamicParameters(new { });
                 var nowDate = DateTime.Now.Date;
                 var nextDate = DateTime.Now.AddDays(1).Date;
-                strSql.Append("SELECT t.ClassNo,t.DeptNo,t.MajorNo,t.StuNo as PersonBeingMeasured,t.StuName as PersonBeingMeasuredName,'" + userInfo.account + "' as MeasurerID,'1' as Status,c.ClassName ");
+                strSql.Append("SELECT t.ClassNo,t.MajorNo,t.StuNo as PersonBeingMeasured,t.StuName as PersonBeingMeasuredName,'" + userInfo.account + "' as MeasurerID,'1' as Status,c.ClassName ");
                 if (!queryParam["MeasureTime"].IsEmpty() && queryParam["MeasureTime"].ToString() != "-1")
                 {
                     strSql.Append(" ,g.ID,case when g.Status is null then '1' else g.Status end as Status,g.Temperature,g.ProcessingResult,g.Remark,g.MeasureTime ");
@@ -277,7 +271,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append("  FROM StuInfoBasic t left join StuInfoBasic tt on t.ClassNo=tt.ClassNo left join ClassInfo c on t.ClassNo=c.ClassNo ");
                 if (!queryParam["MeasureTime"].IsEmpty() && queryParam["MeasureTime"].ToString() != "-1")
                 {
-                    strSql.Append("  left join Thermography g on t.StuNo=g.PersonBeingMeasured and t.ClassNo=g.ClassNo and t.DeptNo=g.DeptNo and t.MajorNo=g.DeptNo ");
+                    strSql.Append("  left join Thermography g on t.StuNo=g.PersonBeingMeasured and t.ClassNo=g.ClassNo and t.MajorNo=g.MajorNo ");
                     strSql.Append(" and g.MeasureDate >='" + nowDate + "' and g.MeasureDate<'" + nextDate + "' ");
 
                     dp.Add("MeasureTime", queryParam["MeasureTime"].ToString(), DbType.String);
@@ -318,7 +312,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
                 var strSql = new StringBuilder();
-                strSql.Append("select t.DeptNo,CONVERT(varchar(100), t.MeasureDate, 23) as MeasureDate,t.MeasureTime,sum(case when t.Status='0' then 1 else 0 end) as statusNum0,sum(case when t.Status='1' then 1 else 0 end) as statusNum1,sum(case when t.Status='2' then 1 else 0 end) as statusNum2,sum(case when t.Status!='0' then 1 else 0 end) as statusNum12,(select count(s.StuId) from StuInfoBasic s where s.DeptNo=t.DeptNo and s.CheckMark='1') as totalNum ");
+                strSql.Append("select t.MajorNo,CONVERT(varchar(100), t.MeasureDate, 23) as MeasureDate,t.MeasureTime,sum(case when t.Status='0' then 1 else 0 end) as statusNum0,sum(case when t.Status='1' then 1 else 0 end) as statusNum1,sum(case when t.Status='2' then 1 else 0 end) as statusNum2,sum(case when t.Status!='0' then 1 else 0 end) as statusNum12,(select count(s.StuId) from StuInfoBasic s where s.MajorNo=t.MajorNo and s.CheckMark='1') as totalNum ");
                 strSql.Append("  FROM Thermography t ");
                 strSql.Append("  WHERE 1=1 ");
                 if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
@@ -327,11 +321,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
                     strSql.Append(" AND ( t.MeasureDate >= @startTime AND t.MeasureDate <= @endTime ) ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.DeptNo = @DeptNo ");
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
@@ -342,7 +331,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.ClassNo = @ClassNo ");
                 }
-                strSql.Append("  group by t.DeptNo,CONVERT(varchar(100), t.MeasureDate, 23),t.MeasureTime ");
+                strSql.Append("  group by t.MajorNo,CONVERT(varchar(100), t.MeasureDate, 23),t.MeasureTime ");
                 return this.BaseRepository("CollegeMIS").FindList<ThermographyEntity>(strSql.ToString(), dp);
             }
             catch (Exception ex)
@@ -496,7 +485,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 CreateTime = DateTime.Now,
                                 MeasurerID = loginUser.account,
                                 MeasureDate = DateTime.Now,
-                                DeptNo = student.DeptNo,
                                 MajorNo = student.MajorNo,
                                 Status = "0"
                             };
@@ -587,7 +575,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         }
                     }
                 }
-                
+
             }
             catch (Exception ex)
             {