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

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

@@ -103,6 +103,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 综合查询
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexQuery()
+        {
+            return View();
+        }
+
         #endregion
 
         #region 获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.cshtml

@@ -0,0 +1,54 @@
+@{
+    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>
+                                    <div id="AnomalousType"></div>
+                                </div>
+                                <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="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">申请人</div>
+                                    <div id="CreateUserId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核人</div>
+                                    <div id="CheckUserId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">保留学籍</div>
+                                    <div id="StuStatus"></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">
+                        <a id="lr_views" 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/StuTransferInfo/IndexQuery.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.js

@@ -0,0 +1,323 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-01-04 15:03
+ * 描  述：学籍异动列表
+ */
+var selectedRow;
+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);
+            }, 290, 400);
+            $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
+            });
+            $('#CheckUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
+            $('#CreateUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
+            $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 查看
+            $('#lr_views').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行查看！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/FormView?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 600,
+                        btn: null
+                    });
+                }
+            });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGridLei({
+                url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/GetPageList',
+                headData: [
+                    { label: '姓名', name: 'StuName', width: 100, align: "left" },
+                    { label: '学号', name: 'StuNo', width: 160, align: "left" },
+                    {
+                        label: "性别", name: "GenderNo", width: 80, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    { label: '身份证号', name: 'IdentityCardNo', width: 200, align: "left" },
+                    {
+                        label: '原班级', name: 'ClassNo', width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '原专业', name: 'MajorNo', width: 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: '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: 'Grade', width: 100, align: "left" },
+                    {
+                        label: '学制', name: 'EduSystem', width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EduSystem',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    //{
+                    //    label: '入班日期', name: 'LeaveDate', width: 100, align: "left",
+                    //    formatter: function (cellvalue) {
+                    //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                    //    }
+                    //},
+                    //{
+                    //    label: '离班日期', name: 'EnteDate', width: 100, align: "left",
+                    //    formatter: function (cellvalue) {
+                    //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                    //    }
+                    //},
+                    //{
+                    //    label: '现班级', name: 'NewClassNo', width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                    //            key: value,
+                    //            keyId: 'classno',
+                    //            callback: function (_data) {
+                    //                callback(_data['classname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: '现专业', name: 'NewMajorNo', width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                    //            key: value,
+                    //            keyId: 'majorno',
+                    //            callback: function (_data) {
+                    //                callback(_data['majorname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: '现系部', name: 'NewDeptNo', 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: 'NewGrade', width: 60, align: "left" },
+                    //{
+                    //    label: '创建时间', name: 'CreateTime', width: 100, align: "left",
+                    //    formatter: function (cellvalue) {
+                    //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                    //    }
+                    //},
+                    //{
+                    //    label: '创建用户', name: 'CreateUserId', width: 200, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                    //            key: value,
+                    //            keyId: 'f_userid',
+                    //            callback: function (_data) {
+                    //                callback(_data['f_realname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: '审核时间', name: 'CheckTime', width: 200, align: "left",
+                    //    formatter: function (cellvalue) {
+                    //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                    //    }
+                    //},
+                    //{
+                    //    label: '审核用户', name: 'CheckUserId', width: 200, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                    //            key: value,
+                    //            keyId: 'f_userid',
+                    //            callback: function (_data) {
+                    //                callback(_data['f_realname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    {
+                        label: '审核状态', name: 'F_EnabledMark', width: 200, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">已生效</span>" : "<span class=\"label label-danger\">未生效</span>";
+                        }
+                    },
+                    {
+                        label: '异动类型', name: 'AnomalousType', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuChangeType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    //{ label: '异动原因', name: 'ChangeReason', width: 300, align: "left" },
+                    //{
+                    //    label: '是否保留学籍', name: 'StuStatus', width: 80, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'YesOrNoInt',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: '是否注销账号', name: 'F_WriteMark', width: 80, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'YesOrNoInt',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: '是否恢复学籍', name: 'RecoverStuStatus', width: 80, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'YesOrNoInt',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: '是否恢复账号', name: 'RecoverWriteMark', width: 80, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'YesOrNoInt',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{ label: '修学年限', name: 'SuspensionPeriod', width: 200, align: "left" },
+                    //{
+                    //    label: '休学开始时间', name: 'SuspensionBeginTime', width: 100, align: "left",
+                    //    formatter: function (cellvalue) {
+                    //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                    //    }
+                    //},
+                    //{
+                    //    label: '休学结束时间', name: 'SuspensionEndTime', width: 100, align: "left",
+                    //    formatter: function (cellvalue) {
+                    //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                    //    }
+                    //},
+                    //{ label: '转学前学校', name: 'TransferSchool', width: 150, align: "left" },
+                    //{ label: '转学前学号', name: 'TransferStuNo', width: 100, align: "left" },
+                    //{
+                    //    label: '出身日期', name: 'Birthday', width: 100, align: "left",
+                    //    formatter: function (cellvalue) {
+                    //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                    //    }
+                    //},
+                    //{ label: '民族', name: 'NationalityNo', width: 80, align: "left" },
+                    //{ label: '省', name: 'Province', width: 100, align: "left" },
+                    //{ label: '市', name: 'City', width: 100, align: "left" },
+                    //{ label: '县/区', name: 'County', width: 100, align: "left" },
+                    //{ label: '联系电话', name: 'Mobile', width: 100, align: "left" },
+                    //{ label: '家庭地址', name: 'MailAddress', width: 200, align: "left" },
+                    //{ label: '转出学校', name: 'OutSchool', width: 100, align: "left" },
+                    //{ label: '备注', name: 'Remark', width: 500, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                rows: 100,
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.SqlParameter = ' and F_EnabledMark = 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

@@ -1366,6 +1366,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\CheckIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\FormView.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\IndexQuery.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\RolloffIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\ReturnIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\IntoIndex.js" />
@@ -8074,6 +8075,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\ReturnIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\RolloffIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\FormView.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\IndexQuery.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/StuScoreNotPassTran/StuScoreNotPassTranService.cs

@@ -128,6 +128,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append("SELECT ");
                 strSql.Append(fieldSql);
                 strSql.Append(" FROM StuScoreNotPassTran t ");
+                var userlogin = LoginUserInfo.Get();
+                if (userlogin.Description == "学生")
+                {
+                    strSql.Append(" where 1= 1 and Stuno = '" + userlogin.account + "'");
+                }
+
                 return this.BaseRepository("CollegeMIS").FindList<StuScoreNotPassTranEntity>(strSql.ToString(), pagination);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwoTran/StuScoreNotPassTwoTranService.cs

@@ -128,6 +128,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append("SELECT ");
                 strSql.Append(fieldSql);
                 strSql.Append(" FROM StuScoreNotPassTwoTran t ");
+                var userlogin = LoginUserInfo.Get();
+                if (userlogin.Description == "学生")
+                {
+                    strSql.Append(" where 1= 1 and Stuno = '" + userlogin.account + "'");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<StuScoreNotPassTwoTranEntity>(strSql.ToString(), pagination);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreTran/StuScoreTranService.cs

@@ -130,6 +130,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append("SELECT ");
                 strSql.Append(fieldSql);
                 strSql.Append(" FROM StuScoreTran t ");
+                var userlogin = LoginUserInfo.Get();
+                if (userlogin.Description == "学生")
+                {
+                    strSql.Append(" where 1= 1 and Stuno = '" + userlogin.account + "'");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<StuScoreTranEntity>(strSql.ToString(), pagination);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs

@@ -90,10 +90,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.ClassNo = @ClassNo ");
                 }
-                if (!queryParam["ClassNo"].IsEmpty())
+                if (!queryParam["CreateUserId"].IsEmpty())
                 {
-                    dp.Add("CheckUserId", queryParam["CheckUserId"].ToString(), DbType.String);
-                    strSql.Append(" AND t.CheckUserId = @CheckUserId ");
+                    dp.Add("CreateUserId", queryParam["CreateUserId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CreateUserId = @CreateUserId ");
                 }
                 if (!queryParam["CheckUserId"].IsEmpty())
                 {