【修改】缴费管理模块：查询条件优化；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs

@@ -112,9 +112,9 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
 
         [HttpGet]
         [AjaxOnly]
-        public ActionResult GetClassByEmpNo()
+        public ActionResult GetClassByEmpNo(string MajorNo)
         {
-            var data = classInfoIbll.GetClassByEmpNo(LoginUserInfo.Get().account);
+            var data = classInfoIbll.GetClassByEmpNo(LoginUserInfo.Get().account, MajorNo);
             return Success(data);
         }
         [HttpGet]
@@ -126,9 +126,9 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         }
         [HttpGet]
         [AjaxOnly]
-        public ActionResult GetMajorByEmpNo()
+        public ActionResult GetMajorByEmpNo(string DeptNo)
         {
-            var data = classInfoIbll.GetMajorByEmpNo(LoginUserInfo.Get().account);
+            var data = classInfoIbll.GetMajorByEmpNo(LoginUserInfo.Get().account, DeptNo);
             return Success(data);
         }
         /// <summary>
@@ -363,7 +363,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
                 logEntity.WriteLog();
                 return Fail("缴费机器暂停缴费！");
             }
-            
+
             return Success(imgUrl);
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.cshtml

@@ -17,7 +17,7 @@
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">缴费年度</div>
-                                    <input id="YearNo" type="text" class="form-control" />
+                                    <div id="YearNo"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">学号</div>
@@ -39,6 +39,22 @@
                                     <div class="lr-form-item-title">银行订单号</div>
                                     <input id="BankOrder" 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>
+                                </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>
+                                    <input id="Grade" type="text" class="form-control" />
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.js

@@ -5,6 +5,7 @@
  * 描  述：缴费订单管理
  */
 var refreshGirdData;
+var sYear;
 var bootstrap = function ($, learun) {
     "use strict";
     var startTime;
@@ -15,6 +16,68 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 330, 400);
+            $('#Status').lrDataItemSelect({ code: 'PayStatus' });
+            $('#PayMode').lrDataItemSelect({ code: 'PayMode' });
+            $('#OrderType').lrDataItemSelect({ code: 'OrderType' });
+            $('#YearNo').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GenerateNearByYear',
+                value: 'value',
+                text: 'text'
+            });
+            var now = new Date();
+            sYear = now.getFullYear();
+            $('#YearNo').lrselectSet(sYear);
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                param: { strWhere: "1=1 order by deptno" },
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1 order by majorno" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1 order by majorno" }
+                        });
+                    }
+
+                }
+            });
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1 order by majorno" },
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "MajorNo='" + item.majorno + "' AND CheckMark=1 order by ClassNo" }
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 AND CheckMark=1 order by ClassNo" },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                value: "classno",
+                text: "classname",
+                param: { strWhere: "1=1 AND CheckMark=1 order by ClassNo" },
+            });
             // 时间搜索框
             $('#datesearch').lrdate({
                 dfdata: [
@@ -42,12 +105,6 @@ var bootstrap = function ($, learun) {
                     page.search();
                 }
             });
-            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
-                page.search(queryJson);
-            }, 220, 400);
-            $('#Status').lrDataItemSelect({ code: 'PayStatus' });
-            $('#PayMode').lrDataItemSelect({ code: 'PayMode' });
-            $('#OrderType').lrDataItemSelect({ code: 'OrderType' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -230,6 +287,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.YearNo = $('#YearNo').lrselectGet();
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/Index.cshtml

@@ -43,6 +43,10 @@
                                     <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>
+                                    <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="STU_STATE_CODE"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/Index.js

@@ -24,10 +24,55 @@ var bootstrap = function ($, learun) {
             });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 350, 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' });
+            }, 380, 400);
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                param: { strWhere: "1=1 order by deptno" },
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1 order by majorno" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1 order by majorno" }
+                        });
+                    }
+
+                }
+            });
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1 order by majorno" },
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "MajorNo='" + item.majorno + "' AND CheckMark=1 order by ClassNo" }
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 AND CheckMark=1 order by ClassNo" },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                value: "classno",
+                text: "classname",
+                param: { strWhere: "1=1 AND CheckMark=1 order by ClassNo" },
+            });
             $('#PayFeeStatus').lrDataItemSelect({ code: 'PayStatus' });
             $('#STU_STATE_CODE').lrDataItemSelect({ code: 'StuStateCode' });
             $('#STU_ROLL_CODE').lrDataItemSelect({ code: 'StuRollCode' });
@@ -222,7 +267,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.fSYear = fSYear;
+            param.FSYear = fSYear;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForTeacher.cshtml

@@ -21,13 +21,13 @@
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">学号</div>
-                                    <input id="StuNo" type="text" class="form-control"/>
+                                    <input id="StuNo" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">姓名</div>
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
+                                <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">身份证号</div>
                                     <input id="IdentityCardNo" type="text" class="form-control" />
                                 </div>
@@ -43,6 +43,10 @@
                                     <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>
+                                    <input id="Grade" type="text" class="form-control" />
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForTeacher.js

@@ -24,19 +24,44 @@ var bootstrap = function ($, learun) {
             });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 250, 400);
+            }, 280, 400);
             $('#DeptNo').lrselect({
-                url: "/ReceiveSendFeeManagement/FinaChargeStuYear/GetDeptByEmpNo",
+                allowSearch: true,
+                url: top.$.rootUrl + "/ReceiveSendFeeManagement/FinaChargeStuYear/GetDeptByEmpNo",
                 value: "DeptNo",
-                text: "DeptName"
+                text: "DeptName",
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            param: { DeptNo: item.DeptNo }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            param: { DeptNo: "" }
+                        });
+                    }
+                }
             });
             $('#MajorNo').lrselect({
-                url: "/ReceiveSendFeeManagement/FinaChargeStuYear/GetMajorByEmpNo",
+                allowSearch: true,
+                url: top.$.rootUrl + "/ReceiveSendFeeManagement/FinaChargeStuYear/GetMajorByEmpNo",
                 value: "MajorNo",
-                text: "MajorName"
+                text: "MajorName",
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            param: { MajorNo: item.MajorNo }
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            param: { MajorNo: "" }
+                        });
+                    }
+                }
             });
             $('#ClassNo').lrselect({
-                url:"/ReceiveSendFeeManagement/FinaChargeStuYear/GetClassByEmpNo",
+                allowSearch: true,
+                url: top.$.rootUrl + "/ReceiveSendFeeManagement/FinaChargeStuYear/GetClassByEmpNo",
                 value: "ClassNo",
                 text: "ClassName"
             });
@@ -158,7 +183,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.fSYear = fSYear;
+            param.FSYear = fSYear;
             param.Teacher = 1;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.cshtml

@@ -38,6 +38,10 @@
                                     <div class="lr-form-item-title">项目类型</div>
                                     <div id="ChargeItemType"></div>
                                 </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>
@@ -46,6 +50,10 @@
                                     <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>
+                                    <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="STU_STATE_CODE"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.js

@@ -20,7 +20,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 380, 400);
+            }, 440, 400);
             $('#FSYear').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GenerateNearByYear',
                 value: 'value',
@@ -29,8 +29,54 @@ var bootstrap = function ($, learun) {
             var now = new Date();
             sYear = now.getFullYear();
             $('#FSYear').lrselectSet(sYear);
-            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                param: { strWhere: "1=1 order by deptno" },
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1 order by majorno" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1 order by majorno" }
+                        });
+                    }
+
+                }
+            });
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1 order by majorno" },
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "MajorNo='" + item.majorno + "' AND CheckMark=1 order by ClassNo" }
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 AND CheckMark=1 order by ClassNo" },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                value: "classno",
+                text: "classname",
+                param: { strWhere: "1=1 AND CheckMark=1 order by ClassNo" },
+            });
             $('#PayFeeStatus').lrDataItemSelect({ code: 'PayStatus' });
             $('#ChargeItemType').lrDataItemSelect({ code: 'ChargeItemType' });
             $('#STU_STATE_CODE').lrDataItemSelect({ code: 'StuStateCode' });
@@ -103,6 +149,19 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    {
+                        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) {
@@ -129,6 +188,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "年级", name: "Grade", width: 80, align: "left" },
                     { label: "缴费年度", name: "FSYear", width: 100, align: "left" },
                     { label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left" },
                     { label: "收费项名称", name: "ChargeItemName", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStudent/Index.cshtml

@@ -34,6 +34,10 @@
                                     <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>
+                                    <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="STU_STATE_CODE"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStudent/Index.js

@@ -15,10 +15,55 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 350, 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' });
+            }, 380, 400);
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                param: { strWhere: "1=1 order by deptno" },
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1 order by majorno" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1 order by majorno" }
+                        });
+                    }
+
+                }
+            });
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1 order by majorno" },
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "MajorNo='" + item.majorno + "' AND CheckMark=1 order by ClassNo" }
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 AND CheckMark=1 order by ClassNo" },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                value: "classno",
+                text: "classname",
+                param: { strWhere: "1=1 AND CheckMark=1 order by ClassNo" },
+            });
             $('#STU_STATE_CODE').lrDataItemSelect({ code: 'StuStateCode' });
             $('#STU_ROLL_CODE').lrDataItemSelect({ code: 'StuRollCode' });
             // 刷新
@@ -39,7 +84,7 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 learun.layerConfirm('是否确认更新！', function (res) {
                     if (res) {
-                        learun.postForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStudent/UpdateForm',  {},function () {
+                        learun.postForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStudent/UpdateForm', {}, function () {
                             refreshGirdData();
                         });
                     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoBLL.cs

@@ -256,11 +256,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-        public IEnumerable<ClassInfoEntity> GetClassByEmpNo(string EmpNo)
+        public IEnumerable<ClassInfoEntity> GetClassByEmpNo(string EmpNo, string MajorNo)
         {
             try
             {
-                return classInfoService.GetClassByEmpNo(EmpNo);
+                return classInfoService.GetClassByEmpNo(EmpNo, MajorNo);
             }
             catch (Exception ex)
             {
@@ -292,11 +292,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-        public IEnumerable<CdMajorEntity> GetMajorByEmpNo(string EmpNo)
+        public IEnumerable<CdMajorEntity> GetMajorByEmpNo(string EmpNo, string DeptNo)
         {
             try
             {
-                return classInfoService.GetMajorByEmpNo(EmpNo);
+                return classInfoService.GetMajorByEmpNo(EmpNo, DeptNo);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoIBLL.cs

@@ -62,8 +62,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         IEnumerable<ClassInfoEntity> GetAllClass();
         IEnumerable<ClassInfoEntity> GetClassByMajorNo(string majorNo);
-        IEnumerable<ClassInfoEntity> GetClassByEmpNo(string EmpNo);
+        IEnumerable<ClassInfoEntity> GetClassByEmpNo(string EmpNo, string MajorNo);
         IEnumerable<CdDeptEntity> GetDeptByEmpNo(string EmpNo);
-        IEnumerable<CdMajorEntity> GetMajorByEmpNo(string EmpNo);
+        IEnumerable<CdMajorEntity> GetMajorByEmpNo(string EmpNo, string DeptNo);
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs

@@ -349,11 +349,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-        public IEnumerable<ClassInfoEntity> GetClassByEmpNo(string EmpNo)
+        public IEnumerable<ClassInfoEntity> GetClassByEmpNo(string EmpNo, string MajorNo)
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<ClassInfoEntity>(m => m.CheckMark == true && m.ClassDiredctorNo == EmpNo);
+                var list = this.BaseRepository("CollegeMIS").FindList<ClassInfoEntity>(m => m.CheckMark == true && m.ClassDiredctorNo == EmpNo).OrderBy(x => x.ClassNo);
+                if (!string.IsNullOrEmpty(MajorNo))
+                {
+                    list = list.Where(x => x.MajorNo == MajorNo).OrderBy(x => x.ClassNo);
+                }
+                return list;
             }
             catch (Exception ex)
             {
@@ -371,7 +376,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<CdDeptEntity>("select b.* from ClassInfo a left join cddept b on a.deptno=b.deptno where a.ClassDiredctorNo='"+EmpNo+ "' and a.CheckMark=1");
+                return this.BaseRepository("CollegeMIS").FindList<CdDeptEntity>("select distinct b.deptno,b.deptname from ClassInfo a left join cddept b on a.deptno=b.deptno where a.ClassDiredctorNo='" + EmpNo + "' and a.CheckMark=1 order by deptno ");
             }
             catch (Exception ex)
             {
@@ -386,11 +391,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-        public IEnumerable<CdMajorEntity> GetMajorByEmpNo(string EmpNo)
+        public IEnumerable<CdMajorEntity> GetMajorByEmpNo(string EmpNo, string DeptNo)
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<CdMajorEntity>("select b.* from ClassInfo a left join cdmajor b on a.majorno=b.majorno where a.ClassDiredctorNo='" + EmpNo + "' and a.checkmark=1 and b.checkmark=1");
+                if (!string.IsNullOrEmpty(DeptNo))
+                {
+                    return this.BaseRepository("CollegeMIS").FindList<CdMajorEntity>("select distinct b.majorno,b.majorname from ClassInfo a left join cdmajor b on a.majorno=b.majorno where a.ClassDiredctorNo='" + EmpNo + "' and a.checkmark=1 and b.checkmark=1 and b.deptno='" + DeptNo + "' order by majorno ");
+                }
+                else
+                {
+                    return this.BaseRepository("CollegeMIS").FindList<CdMajorEntity>("select distinct b.majorno,b.majorname from ClassInfo a left join cdmajor b on a.majorno=b.majorno where a.ClassDiredctorNo='" + EmpNo + "' and a.checkmark=1 and b.checkmark=1 order by majorno");
+                }
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrder/FinaChargeStuOrderService.cs

@@ -59,6 +59,26 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                     dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.StuNo Like @StuNo ");
                 }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND b.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
+                    strSql.Append(" AND b.MajorNo = @MajorNo ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND b.ClassNo = @ClassNo ");
+                }
+                if (!queryParam["Grade"].IsEmpty())
+                {
+                    dp.Add("Grade", "%" + queryParam["Grade"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND b.Grade Like @Grade ");
+                }
                 if (!queryParam["Status"].IsEmpty())
                 {
                     dp.Add("Status", queryParam["Status"].ToString(), DbType.String);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearService.cs

@@ -43,39 +43,48 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["StuNo"].IsEmpty())
                 {
-                    dp.Add("StuNo", "" + queryParam["StuNo"].ToString() + "", DbType.String);
-                    strSql.Append(" AND b.StuNo = @StuNo ");
+                    dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND b.StuNo like @StuNo ");
                 }
                 if (!queryParam["StuName"].IsEmpty())
                 {
                     dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND b.StuName Like @StuName ");
                 }
+                if (!queryParam["Grade"].IsEmpty())
+                {
+                    dp.Add("Grade", "%" + queryParam["Grade"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND b.Grade Like @Grade ");
+                }
                 if (!queryParam["DeptNo"].IsEmpty())
                 {
-                    dp.Add("DeptNo", "" + queryParam["DeptNo"].ToString() + "", DbType.String);
+                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
                     strSql.Append(" AND b.DeptNo = @DeptNo ");
                 }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
-                    dp.Add("MajorNo", "" + queryParam["MajorNo"].ToString() + "", DbType.String);
+                    dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
                     strSql.Append(" AND b.MajorNo = @MajorNo ");
                 }
                 if (!queryParam["ClassNo"].IsEmpty())
                 {
-                    dp.Add("ClassNo", "" + queryParam["ClassNo"].ToString() + "", DbType.String);
+                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
                     strSql.Append(" AND b.ClassNo = @ClassNo ");
                 }
                 if (!queryParam["IdentityCardNo"].IsEmpty())
                 {
-                    dp.Add("IdentityCardNo", "" + queryParam["IdentityCardNo"].ToString() + "", DbType.String);
+                    dp.Add("IdentityCardNo", queryParam["IdentityCardNo"].ToString(), DbType.String);
                     strSql.Append(" AND b.IdentityCardNo = @IdentityCardNo ");
                 }
                 if (!queryParam["FSYear"].IsEmpty())
                 {
-                    dp.Add("FSYear", "" + queryParam["FSYear"].ToString() + "", DbType.String);
+                    dp.Add("FSYear", queryParam["FSYear"].ToString(), DbType.String);
                     strSql.Append(" AND t.FSYear = @FSYear ");
                 }
+                else
+                {
+                    strSql.Append(" and t.FSYear = (select distinct top 1 FSYear from FinaChargeStuYear order by FSYear desc) ");
+                }
                 if (!queryParam["PayFeeStatus"].IsEmpty())
                 {
                     dp.Add("PayFeeStatus", queryParam["PayFeeStatus"].ToString(), DbType.String);
@@ -99,7 +108,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                 if (!queryParam["Teacher"].IsEmpty())
                 {
                     var userinfo = LoginUserInfo.Get();
-                    strSql.Append(" and classno in(select classno from classinfo where ClassDiredctorNo='"+ userinfo.account+ "') ");
+                    strSql.Append(" and b.classno in(select classno from classinfo where ClassDiredctorNo='" + userinfo.account + "') ");
                 }
                 return this.BaseRepository("CollegeMIS").FindList<FinaChargeStuYearEntity>(strSql.ToString(), dp, pagination);
             }
@@ -278,7 +287,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             var finaChargesStandardList = BaseRepository("CollegeMIS").FindList<FinaChargesStandardEntity>("select a.Grade,a.DeptNo,a.MajorNo,a.Standard,a.SYear,b.ChargeItemName,b.ChargeItemCode,b.ChargeItemType,b.priority from [dbo].[FinaChargesStandard] a left join [dbo].[FinaChargeItem] b on a.ChargeItemID=b.[ChargeItemID] where b.ChargeItemType=1 and a.SYear='" + entity.FSYear + "' and a.F_DeleteMark=0 and a.CheckMark=1 and b.CheckMark=1 and b.F_DeleteMark=0");
             var finaChargesStandardListGroup = BaseRepository("CollegeMIS").FindList<FinaChargesStandardEntity>(@"select a.Grade,a.DeptNo,a.MajorNo,sum(isnull(a.Standard,0)) as YJAmount,a.SYear
                                                                          from[dbo].[FinaChargesStandard] a left join[dbo].[FinaChargeItem] b on a.ChargeItemID = b.[ChargeItemID] where b.ChargeItemType=1 and a.SYear='" + entity.FSYear + "' and a.F_DeleteMark=0 and a.CheckMark=1 and b.CheckMark=1 and b.F_DeleteMark=0 group by a.Grade, a.DeptNo, a.MajorNo, a.SYear");
-           
+
             //线程池优化生成速度
             ThreadPool.SetMaxThreads(10, 10);
             foreach (var stuitem in stulist)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemEntity.cs

@@ -135,6 +135,8 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         public string ClassNo { get; set; }
         [NotMapped]
         public string DeptNo { get; set; }
+        [NotMapped]
+        public string Grade { get; set; }
         /// <summary>
         /// 中间库对接的学生状态
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemService.cs

@@ -35,7 +35,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.*,b.StuNo,b.StuName,b.MajorNo,b.ClassNo,b.DeptNo,b.IdentityCardNo,sb.STU_STATE_CODE,sb.STU_ROLL_CODE ");
+                strSql.Append("SELECT t.*,b.StuNo,b.StuName,b.MajorNo,b.ClassNo,b.DeptNo,b.Grade,b.IdentityCardNo,sb.STU_STATE_CODE,sb.STU_ROLL_CODE ");
                 strSql.Append("  FROM FinaChargeStuYearItem t left join FinaChargeStuYear a on t.FSYId=a.FSYId left join FinaChargeStudent b on a.StuNo=b.StuNo left join StuInfoBasic sb on a.StuNo=sb.StuNo ");
                 strSql.Append("  WHERE 1=1 and b.F_CheckMark=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -43,22 +43,37 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["StuNo"].IsEmpty())
                 {
-                    dp.Add("StuNo", "" + queryParam["StuNo"].ToString() + "", DbType.String);
-                    strSql.Append(" AND b.StuNo = @StuNo ");
+                    dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND b.StuNo like @StuNo ");
                 }
                 if (!queryParam["StuName"].IsEmpty())
                 {
                     dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND b.StuName Like @StuName ");
                 }
+                if (!queryParam["Grade"].IsEmpty())
+                {
+                    dp.Add("Grade", "%" + queryParam["Grade"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND b.Grade Like @Grade ");
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND b.DeptNo = @DeptNo ");
+                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
-                    dp.Add("MajorNo", "" + queryParam["MajorNo"].ToString() + "", DbType.String);
+                    dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
                     strSql.Append(" AND b.MajorNo = @MajorNo ");
                 }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND b.ClassNo = @ClassNo ");
+                }
                 if (!queryParam["FSYear"].IsEmpty())
                 {
-                    dp.Add("FSYear", "" + queryParam["FSYear"].ToString() + "", DbType.String);
+                    dp.Add("FSYear", queryParam["FSYear"].ToString(), DbType.String);
                     strSql.Append(" AND a.FSYear = @FSYear ");
                 }
                 if (!queryParam["ChargeItemCode"].IsEmpty())

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStudent/FinaChargeStudentService.cs

@@ -46,6 +46,11 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                     dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.StuName Like @StuName ");
                 }
+                if (!queryParam["Grade"].IsEmpty())
+                {
+                    dp.Add("Grade", "%" + queryParam["Grade"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Grade Like @Grade ");
+                }
                 if (!queryParam["IdentityCardNo"].IsEmpty())
                 {
                     dp.Add("IdentityCardNo", "%" + queryParam["IdentityCardNo"].ToString() + "%", DbType.String);