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

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

@@ -19,9 +19,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
     public class StuVolunteerController : MvcControllerBase
     {
         private StuVolunteerIBLL stuVolunteerIBLL = new StuVolunteerBLL();
-        private UserIBLL userIBLL = new UserBLL();
-        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
-
 
         #region 视图功能
 
@@ -131,6 +128,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
 
+        /// <summary>
+        /// 专业注册
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexMajor()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormMajor()
+        {
+            return View();
+        }
+
         #endregion
 
         #region 获取数据
@@ -356,24 +372,30 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("提交成功！");
         }
 
+        /// <summary>
+        /// 专业:审核/去审核
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        public ActionResult MajorForm(string keyValue ,int MajorStatus)
+        {
+            stuVolunteerIBLL.MajorForm(keyValue,MajorStatus);
+            return Success("录取成功！");
+        }
 
-        //public ActionResult Search(string CardNo, string txtPass)
-        //{
-        //    var StuVolunteerData = stuVolunteerIBLL.IsEnrollByCard(CardNo);
-        //    if (StuVolunteerData != null)
-        //    {
-        //        var jsonData = new
-        //        {
-        //            StuVolunteer = StuVolunteerData,
-        //        };
-        //        return Success(jsonData);
-        //    }
-        //    else
-        //    {
-        //        return Success(null);
-        //    }
-        //}
-
+        /// <summary>
+        /// 注册专业 
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="ClassStatus">审核状态</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult SaveMajorForm(string keyValue, string MajorNo)
+        {
+            stuVolunteerIBLL.SaveMajorForm(keyValue, MajorNo);
+            return Success("注册成功！");
+        }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/ClassForm.js

@@ -6,6 +6,7 @@
  */
 var acceptClick;
 var keyValue = request('keyValue');
+var MajorNo = request('MajorNo');
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -15,14 +16,24 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            if (MajorNo != null && MajorNo != "" && MajorNo != undefined) {
+                console.log(MajorNo,321);
+                $('#ClassNo').lrselect({
+                    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                    param: { strWhere: " 1=1 and MajorNo = '" + MajorNo + "'" },
+                    value: "classno",
+                    text: "classname",
+                    maxHeight: 200
+                });
+            }
+            $("#ClassNo").lrselect();
         },
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);

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

@@ -29,7 +29,7 @@
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuVolunteer">
         <div class="lr-form-item-title">中考总分<font face="宋体">*</font></div>
-        <input id="StuScore" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="StuScore" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
         <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormGenerate.js

@@ -19,11 +19,36 @@ var bootstrap = function ($, learun) {
             $('#IsPlan').lrDataItemSelect({ code: 'YesOrNoBit' }); 
             $('#Sex').lrDataItemSelect({ code: 'usersex' }); 
 
-            $('#MajorOne').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
-            $('#MajorThree').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
-            $('#MajorTwo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
-            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            //$('#MajorOne').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
+            //$('#MajorThree').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
+            //$('#MajorTwo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
+            $('#MajorNo').lrselect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                value: 'majorno',
+                text: 'majorname',
+                maxHeight: 200,
+                select: function (item) {
+                    var classNo = $("#MajorNo").lrselectGet();
+                    if (classNo != null && classNo != "" && classNo != undefined) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: " 1=1 and majorno in (" + classNo + ")" },
+                            value: "classno",
+                            text: "classname",
+                            maxHeight: 200
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: " 1=1 and majorno ='' " },
+                            value: "classno",
+                            text: "classname",
+                            maxHeight: 200
+                        });
+                    }
+                }
+            })
+            $("#ClassNo").lrselect();
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormMajor.cshtml

@@ -0,0 +1,11 @@
+@{
+    ViewBag.Title = "分班";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">专业</div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteer/FormMajor.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormMajor.js

@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-12-16 10:14
+ * 描  述：长阳迎新
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var data = $('body').lrGetFormData();
+        var postData = {
+            MajorNo: data.MajorNo
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/SaveMajorForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -86,12 +86,12 @@ var bootstrap = function ($, learun) {
                         label: "性别", name: "Sex", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'usersex',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
+                                    key: value,
+                                    code: 'usersex',
+                                    callback: function (_data) {
+                                        callback(_data.text);
+                                    }
+                                });
                         }
                     },
                     {
@@ -115,6 +115,7 @@ var bootstrap = function ($, learun) {
                     { label: "备注", name: "Demo", width: 100, align: "left" },
                 ],
                 mainId: 'ID',
+                sidx: 'UpdateTime desc',
                 isPage: true,
                 isMultiselect: true
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexDivide.cshtml

@@ -14,17 +14,21 @@
                                     <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="MajorOne"></div>
+                                    </div>
+                                    <div class="col-xs-12 lr-form-item">
+                                        <div class="lr-form-item-title">第二意向</div>
+                                        <div id="MajorTwo"></div>
+                                    </div>
+                                    <div class="col-xs-12 lr-form-item">
+                                        <div class="lr-form-item-title">第三意向</div>
+                                        <div id="MajorThree"></div>
+                                    </div>*@
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">第一意向</div>
-                                    <div id="MajorOne"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">第二意向</div>
-                                    <div id="MajorTwo"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">第三意向</div>
-                                    <div id="MajorThree"></div>
+                                    <div class="lr-form-item-title">注册专业</div>
+                                    <div id="MajorNo"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexDivide.js

@@ -17,10 +17,36 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#Sex').lrDataItemSelect({ code: 'usersex' });
-            $('#MajorOne').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
-            $('#MajorTwo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
-            $('#MajorThree').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            //$('#MajorOne').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
+            //$('#MajorTwo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
+            //$('#MajorThree').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
+            $('#MajorNo').lrselect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                value: 'majorno',
+                text: 'majorname',
+                maxHeight: 200,
+                select: function (item) {
+                    var classNo = $("#MajorNo").lrselectGet();
+                    if (classNo != null && classNo != "" && classNo != undefined) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: " 1=1 and majorno in (" + classNo + ")" },
+                            value: "classno",
+                            text: "classname",
+                            maxHeight: 200
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: " 1=1 and majorno ='' " },
+                            value: "classno",
+                            text: "classname",
+                            maxHeight: 200
+                        });
+                    }
+                }
+            })
+            $("#ClassNo").lrselect();
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -36,18 +62,33 @@ var bootstrap = function ($, learun) {
                     learun.alert.warning("选中记录包含审核通过的数据！");
                     return;
                 }
-                learun.layerForm({
-                    id: 'classform',
-                    title: '选择班级',
-                    url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/ClassForm?keyValue=' + keyValue,
-                    width: 400,
-                    height: 300,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
-                    }
-                });
+                var MajorNos = $('#gridtable').jfGridValue('MajorNo');
+                var arrayList = MajorNos.split(',');
+                var res = true;
+                for (var i = 0; i < arrayList.length; i++) {
+                    if (arrayList[0] == arrayList[i]) {
+                        MajorNos = arrayList[0];
+                        res = true;
+                    } else {
+                        res = false;
+                    } 
+                }
+                if (res) {
+                    learun.layerForm({
+                        id: 'classform',
+                        title: '选择班级',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/ClassForm?keyValue=' + keyValue + '&MajorNo=' + MajorNos,
+                        width: 400,
+                        height: 300,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                } else {
+                    learun.alert.warning("请选择相同专业学生进行分班！");
+                    return;
+                }
             });
-            
         },
         // 初始化列表
         initGird: function () {
@@ -69,13 +110,52 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "中考总分", name: "StuScore", width: 100, align: "left" },
                     { label: "身份证号", name: "CardNo", width: 150, align: "left" },
+                    //{
+                    //    label: "第一意向", name: "MajorOne", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                    //            key: value,
+                    //            keyId: 'id',
+                    //            callback: function (_data) {
+                    //                callback(_data['majorname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: "第二意向", name: "MajorTwo", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                    //            key: value,
+                    //            keyId: 'id',
+                    //            callback: function (_data) {
+                    //                callback(_data['majorname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: "第三意向", name: "MajorThree", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                    //            key: value,
+                    //            keyId: 'id',
+                    //            callback: function (_data) {
+                    //                callback(_data['majorname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
-                        label: "第一意向", name: "MajorOne", width: 100, align: "left",
+                        label: "注册专业", name: "MajorNo", width: 150, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
                                 key: value,
-                                keyId: 'id',
+                                keyId: 'majorno',
                                 callback: function (_data) {
                                     callback(_data['majorname']);
                                 }
@@ -83,29 +163,11 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "第二意向", name: "MajorTwo", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
-                                key: value,
-                                keyId: 'id',
-                                callback: function (_data) {
-                                    callback(_data['majorname']);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "第三意向", name: "MajorThree", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
-                                key: value,
-                                keyId: 'id',
-                                callback: function (_data) {
-                                    callback(_data['majorname']);
-                                }
-                            });
+                        label: "专业审核", name: "MajorStatus", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == 1
+                                ? "<span class=\"label label-success\">已审核</span>"
+                                : "<span class=\"label label-danger\">未审核</span>";
                         }
                     },
                     {
@@ -139,7 +201,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.SqlParameter = " and IsEnroll=1 and EnrollStatus=1";
+            param.SqlParameter = " and IsEnroll=1 and EnrollStatus=1 and MajorStatus=1";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexEnroll.cshtml

@@ -26,6 +26,11 @@
                                     <div class="lr-form-item-title">性别</div>
                                     <div id="Sex"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">分数</div>
+                                    <div id="StuScore"></div>
+                                </div>
+
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexEnroll.js

@@ -7,6 +7,7 @@
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
+    var strsql = '';
     var page = {
         init: function () {
             page.initGird();
@@ -17,11 +18,25 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#Sex').lrDataItemSelect({ code: 'usersex' });
+            $('#StuScore').lrDataItemSelect({
+                code: 'EnrollScore',
+                select: function (item) {
+                    if (item != undefined) {
+                        switch (item.id) {
+                            case item.id:
+                                strsql = " and t.StuScore " + item.id + "";
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                }
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            //// 录取
+            // 录取
             $('#lr_enroll').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
@@ -106,6 +121,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.SqlParameter = strsql + " and MajorOne is null  and IsCYSchool = 'True'  ";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexGenerate.cshtml

@@ -30,7 +30,7 @@
                                     <div class="lr-form-item-title">班级</div>
                                     <div id="ClassNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">分班审核</div>
                                     <select id="ClassStatus">
                                         <option value="">==请选择==</option>
@@ -38,7 +38,7 @@
                                         <option value="0">待审核</option>
                                     </select>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">学籍状态</div>
                                     <select id="StuCodeStatus">
                                         <option value="">==请选择==</option>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexGenerate.js

@@ -15,10 +15,35 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 220, 400);
+            }, 270, 400);
 
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
+            $('#MajorNo').lrselect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                value: 'majorno',
+                text: 'majorname',
+                maxHeight: 200,
+                select: function (item) {
+                    var classNo = $("#MajorNo").lrselectGet();
+                    if (classNo != null && classNo != "" && classNo != undefined) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: " 1=1 and majorno in (" + classNo + ")" },
+                            value: "classno",
+                            text: "classname",
+                            maxHeight: 200
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: " 1=1 and majorno ='' " },
+                            value: "classno",
+                            text: "classname",
+                            maxHeight: 200
+                        });
+                    }
+                }
+            })
+            $("#ClassNo").lrselect();
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -164,6 +189,7 @@ var bootstrap = function ($, learun) {
                     { label: "备注", name: "Demo", width: 100, align: "left" },
                 ],
                 mainId: 'ID',
+                sidx: 'StuNo desc,UpdateTime desc',
                 isPage: true,
                 isMultiselect: true
             });
@@ -171,7 +197,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.SqlParameter = " and ClassNo is not null ";
+            param.SqlParameter = " and MajorNo is not null and ClassNo is not null ";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexMajor.cshtml

@@ -0,0 +1,52 @@
+@{
+    ViewBag.Title = "长阳迎新";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <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="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <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="MajorOne"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">第二意向</div>
+                                    <div id="MajorTwo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">第三意向</div>
+                                    <div id="MajorThree"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">注册专业</div>
+                                    <div id="MajorNo"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_major" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;专业注册</a>
+                        <a id="lr_check" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核</a>
+                        <a id="lr_cancel" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;去审核</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteer/IndexMajor.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexMajor.js

@@ -0,0 +1,192 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-12-16 10:14
+ * 描  述：长阳迎新
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#Sex').lrDataItemSelect({ code: 'usersex' });
+            $('#MajorOne').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
+            $('#MajorTwo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
+            $('#MajorThree').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //注册专业
+            $('#lr_major').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    //状态
+                    var MajorStatus = $('#gridtable').jfGridValue('MajorStatus');
+                    if (MajorStatus.indexOf('1') != -1) {
+                        learun.alert.warning("选中记录包含审核通过的数据！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'FormMajor',
+                        title: '专业注册',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/FormMajor?keyValue=' + keyValue,
+                        width: 400,
+                        height: 300,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 审核
+            $('#lr_check').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+
+                    //专业状态
+                    var MajorStatus = $('#gridtable').jfGridValue('MajorStatus');
+                    if (MajorStatus.indexOf('1') != -1) {
+                        learun.alert.warning("选中记录包含审核通过的数据！");
+                        return;
+                    }
+
+                    learun.layerConfirm('是否确认审核选中记录！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/MajorForm', { keyValue: keyValue, MajorStatus: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 去审核
+            $('#lr_cancel').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+
+                    //专业状态
+                    var MajorStatus = $('#gridtable').jfGridValue('MajorStatus');
+                    if (MajorStatus.indexOf('0') != -1) {
+                        learun.alert.warning("选中记录包含待审核的数据！");
+                        return;
+                    }
+
+                    learun.layerConfirm('是否确认去审选中记录！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/MajorForm', { keyValue: keyValue, MajorStatus: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/GetPageList',
+                headData: [
+                    { label: "学生姓名", name: "StuName", width: 100, align: "left" },
+                    {
+                        label: "性别", name: "Sex", width: 80, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'usersex',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "中考总分", name: "StuScore", width: 100, align: "left" },
+                    { label: "身份证号", name: "CardNo", width: 150, align: "left" },
+                    {
+                        label: "第一意向", name: "MajorOne", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "第二意向", name: "MajorTwo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "第三意向", name: "MajorThree", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "注册专业", name: "MajorNo", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "审核状态", name: "MajorStatus", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == 1
+                                ? "<span class=\"label label-success\">已审核</span>"
+                                : "<span class=\"label label-danger\">未审核</span>";
+                        }
+                    },
+                    { label: "学号", name: "StuNo", width: 150, align: "left" },
+                    { label: "备注", name: "Demo", width: 100, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                isMultiselect: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.SqlParameter = " and IsEnroll=1 and EnrollStatus=1";
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1116,12 +1116,14 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndexTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteerPhone\server.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\FormMajor.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\FormGenerate.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\ClassForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\FormSchool.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexAccount.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexMajor.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexGenerate.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexDivide.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexEnroll.js" />
@@ -7545,6 +7547,8 @@
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\ClassForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexGenerate.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\FormGenerate.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexMajor.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\FormMajor.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

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

@@ -262,7 +262,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)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerBLL.cs

@@ -448,6 +448,54 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
+        /// <summary>
+        /// 专业审核
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="ClassStatus"></param>
+        public void MajorForm(string keyValue, int ClassStatus)
+        {
+            try
+            {
+                stuVolunteerService.MajorForm(keyValue, ClassStatus);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 专业注册
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="ClassNo"></param>
+        public void SaveMajorForm(string keyValue, string MajorNo)
+        {
+            try
+            {
+                stuVolunteerService.SaveMajorForm(keyValue, MajorNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs

@@ -64,17 +64,22 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("CARDNO")]
         public string CardNo { get; set; }
-        /// <summary>
-        /// 系所号
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
+        ///// <summary>
+        ///// 系所号
+        ///// </summary>
+        //[Column("DEPTNO")]
+        //public string DeptNo { get; set; }
         /// <summary>
         /// 专业
         /// </summary>
         [Column("MAJORNO")]
         public string MajorNo { get; set; }
         /// <summary>
+        /// 专业状态
+        /// </summary>
+        [Column("MAJORSTATUS")]
+        public int? MajorStatus { get; set; }
+        /// <summary>
         /// 中考总分
         /// </summary>
         [Column("STUSCORE")]
@@ -214,11 +219,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("CLASSSTATUS")]
         public int? ClassStatus { get; set; }
-        ///// <summary>
-        ///// 是否提交专业
-        ///// </summary>
-        //[Column("ISSUBMIT")]
-        //public bool? IsSubmit { get; set; }
+
         /// <summary>
         /// 报名状态  0 草稿，1提交
         /// </summary>
@@ -251,7 +252,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public void Modify(string keyValue)
         {
             this.ID = keyValue;
-            this.UpdateTime= DateTime.Now;
+            this.UpdateTime = DateTime.Now;
         }
         #endregion
         #region 扩展字段

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerIBLL.cs

@@ -127,6 +127,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         /// <param name="keyValue">主键</param>
         void CanJoin(string keyValue);
+        /// <summary>
+        /// 专业审核
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="MajorStatus"></param>
+        void MajorForm(string keyValue, int MajorStatus);
+        /// <summary>
+        /// 注册专业
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="ClassNo"></param>
+        void SaveMajorForm(string keyValue, string MajorNos);
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs

@@ -88,7 +88,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("StuCodeStatus", queryParam["StuCodeStatus"].ToString(), DbType.String);
                     strSql.Append(" AND t.StuCodeStatus = @StuCodeStatus ");
                 }
-                
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MajorNo = @MajorNo ");
+                }
                 if (!queryParam["MajorOne"].IsEmpty())
                 {
                     dp.Add("MajorOne", queryParam["MajorOne"].ToString(), DbType.String);
@@ -232,9 +236,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     foreach (var id in arr)
                     {
                         var stuNo = GetStuNo();
-                        string sql = $"update StuVolunteer set StuNo='{stuNo}' ,ClassNo='{ClassNo}', DeptNo='{classinfo.DeptNo}',MajorNo='{classinfo.MajorNo}',ClassStatus=0 where ID='{id}' and (StuNo is null or len(StuNo)=0); update StuVolunteer set ClassNo='{ClassNo}', DeptNo='{classinfo.DeptNo}',MajorNo='{classinfo.MajorNo}',ClassStatus=0 where ID='{id}' and (StuNo is not null or len(StuNo)>0)";
+                        string sql = $"update StuVolunteer set StuNo='{stuNo}' ,ClassNo='{ClassNo}',ClassStatus=0 where ID='{id}' and (StuNo is null or len(StuNo)=0); update StuVolunteer set ClassNo='{ClassNo}',ClassStatus=0 where ID='{id}' and (StuNo is not null or len(StuNo)>0)";
                         this.BaseRepository("CollegeMIS").ExecuteBySql(sql);
-
                     }
                 }
 
@@ -668,6 +671,69 @@ and  t.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=t.StuNo) "
                 }
             }
         }
+
+        /// <summary>
+        /// 专业审核
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="ClassStatus">状态</param>
+        public void MajorForm(string keyValue, int ClassStatus)
+        {
+            try
+            {
+                if (keyValue.Contains(","))
+                {
+                    keyValue = string.Join("','", keyValue.Split(','));
+                }
+                string sql = $"update StuVolunteer set MajorStatus={ClassStatus} where ID in ('{keyValue}')";
+                this.BaseRepository("CollegeMIS").ExecuteBySql(sql);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 专业注册
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="ClassNo"></param>
+        public void SaveMajorForm(string keyValue, string MajorNo)
+        {
+            try
+            {
+                var Majorinfo = this.BaseRepository("CollegeMIS").FindEntity<CdMajorEntity>(x => x.MajorNo == MajorNo);
+                if (Majorinfo != null)
+                {
+                    var arr = keyValue.Split(',').ToList();
+                    foreach (var id in arr)
+                    {
+                        string sql = $"update StuVolunteer set MajorNo = '{MajorNo}',ClassNo = '', MajorStatus = 0 ,ClassStatus = 0 where ID='{id}' and (StuNo is null or len(StuNo)=0); update StuVolunteer set MajorNo='{MajorNo}', ClassNo = '', MajorStatus =0,ClassStatus=0 where ID='{id}' and (StuNo is not null or len(StuNo)>0)";
+                        this.BaseRepository("CollegeMIS").ExecuteBySql(sql);
+                    }
+                }
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
     }
 }