算法整改

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

@@ -87,11 +87,59 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuOrder/GetPageList',
                 headData: [
-                    { label: "缴费年度", name: "YearNo", width: 80, align: "left"},
-                    { label: "学号", name: "StuNo", width: 100, align: "left"},
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    {
+                        label: "性别", name: "GenderNo", width: 80, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    { label: "身份证号", name: "IdentityCardNo", width: 150, 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) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", 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: "Grade", width: 80, align: "left" },
+                    { label: "缴费年度", name: "YearNo", width: 80, align: "left" },
                     { label: "订单编号", name: "orderid", width: 150, align: "left"},
                     { label: "收费标准", name: "YJAmount", width: 100, align: "left"},
                     { label: "缴费金额", name: "SJAmount", width: 100, align: "left"},

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

@@ -2442,7 +2442,6 @@
     <Content Include="Content\images\SsoSystem\noLogin.png" />
     <Content Include="Content\images\SsoSystem\search.png" />
     <Content Include="Content\images\SsoSystem\user.jpg" />
-    <Content Include="Content\images\wsbsdt.png" />
     <Content Include="Content\jquery\plugin\jqprint\jqprint.css" />
     <Content Include="Content\jquery\plugin\jqprint\jQuery.print.js" />
     <Content Include="Content\jquery\plugin\jSignature.min.js" />

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

@@ -110,6 +110,22 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         }
         #endregion
         #region 扩展字段
+        [NotMapped]
+        public string StuName { get; set; }
+        [NotMapped]
+        public bool? GenderNo { get; set; }
+        [NotMapped]
+        public string IdentityCardNo { get; set; }
+        [NotMapped]
+        public string DeptNo { get; set; }
+        [NotMapped]
+        public string MajorNo { get; set; }
+        [NotMapped]
+        public string ClassNo { get; set; }
+        [NotMapped]
+        public string Grade { get; set; }
+        [NotMapped]
+        public string Mobile { get; set; }
         #endregion
     }
 }

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

@@ -37,24 +37,8 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.Id,
-                t.YearNo,
-                t.StuNo,
-                t.orderid,
-                t.YJAmount,
-                t.SJAmount,
-                t.DJAmount,
-                t.NowBlance,
-                t.Status,
-                t.PlaceOrderTime,
-                t.PayTime,
-                t.PayMode,
-                t.OrderType,
-                t.BankOrder
-                ");
-                strSql.Append("  FROM FinaChargeStuOrder t ");
+                strSql.Append("SELECT t*,b.StuName,b.GenderNo,b.IdentityCardNo,b.DeptNo,b.MajorNo,b.ClassNo,b.Grade,b.Mobile ");
+                strSql.Append("  FROM FinaChargeStuOrder t left join FinaChargeStudent b on t.StuNo=b.StuNo ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数