校级奖学金

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

@@ -114,7 +114,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             var data = stuScoreIBLL.GetScoreListByClassNoForScholarship(queryJson);
 
-            var aa = data.GroupBy(x => new { x.StuNo, x.StuName, x.StuId, x.DepositBank, x.BankCode, x.DeptNo, x.ClassNo, x.IdCard }).Select(x => new
+            var aa = data.GroupBy(x => new { x.StuNo, x.StuName, x.StuId, x.DepositBank, x.BankCard, x.DeptNo, x.ClassNo, x.IdCard, x.GenderNo, x.Birthday, x.NationalityNo, x.PartyFaceNo, x.MajorNo, x.Grade }).Select(x => new
             {
                 StuId = x.Key.StuId,
                 StuNo = x.Key.StuNo,
@@ -122,8 +122,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 DeptNo = x.Key.DeptNo,
                 ClassNo = x.Key.ClassNo,
                 IdCard = x.Key.IdCard,
+                GenderNo = x.Key.GenderNo,
+                Birthday = x.Key.Birthday,
+                NationalityNo = x.Key.NationalityNo,
+                PartyFaceNo = x.Key.PartyFaceNo,
+                MajorNo = x.Key.MajorNo,
+                Grade = x.Key.Grade,
                 DepositBank = x.Key.DepositBank,
-                BankCode = x.Key.BankCode,
+                BankCard = x.Key.BankCard,
                 TotalScore = x.Select(y => y.Score).Sum(),
             }).OrderByDescending(x => x.TotalScore);
 
@@ -140,8 +146,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 aaa.Add("DeptNo", item.DeptNo);
                 aaa.Add("ClassNo", item.ClassNo);
                 aaa.Add("IdCard", item.IdCard);
+                aaa.Add("GenderNo", item.GenderNo);
+                aaa.Add("Birthday", item.Birthday);
                 aaa.Add("DepositBank", item.DepositBank);
-                aaa.Add("BankCode", item.BankCode);
+                aaa.Add("BankCard", item.BankCard);
+                aaa.Add("NationalityNo", item.NationalityNo);
+                aaa.Add("PartyFaceNo", item.PartyFaceNo);
+                aaa.Add("MajorNo", item.MajorNo);
+                aaa.Add("Grade", item.Grade);
                 aaa.Add("TotalScore", item.TotalScore.ToString());
 
 

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

@@ -8,7 +8,7 @@
         <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly style="width: 91%;float: left;" />
         <a id="lr_select" class="btn btn-primary" style="float: left; margin-left: 8px;">选择</a>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+    <div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
         <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
         <input id="StuNo" type="text" class="form-control" readonly isvalid="yes" checkexpession="NotNull" />
     </div>
@@ -42,15 +42,15 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
         <div class="lr-form-item-title">资助标准<font face="宋体">*</font></div>
-        <input id="FundingCriteria" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="FundingCriteria" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
         <div class="lr-form-item-title">应发金额<font face="宋体">*</font></div>
-        <input id="ShoudAmount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="ShoudAmount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
         <div class="lr-form-item-title">实发金额<font face="宋体">*</font></div>
-        <input id="ActualAmount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="ActualAmount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
         <div class="lr-form-item-title">申请日期</div>
@@ -66,7 +66,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
         <div class="lr-form-item-title">开户银行<font face="宋体">*</font></div>
-        <input id="DepositBank" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+        <div id="DepositBank" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
         <div class="lr-form-item-title">开户行账号<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.js

@@ -16,9 +16,21 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#DepositBank').lrDataItemSelect({
+                code: 'DepositBank'
+            });
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            $('#FundingLevel').lrDataItemSelect({ code: 'StateStipend' });
+            $('#FundingLevel').lrDataItemSelect({
+                code: 'SchoolFundingLevel',
+                select: function (item) {
+                    if (!!item) {
+                        $('#FundingCriteria').val(item.id);
+                        $('#ShoudAmount').val(item.id);
+                        $('#ActualAmount').val(item.id);
+                    }
+                }
+            });
             $('#ApplyDate').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
             //$('#Url').lrUploader();
             //选择学生
@@ -278,15 +290,18 @@ var bootstrap = function ($, learun) {
             }
         });
     };
-    bindData = function (temprow) {
-        if (!!temprow) {
+    bindData = function (data) {
+        if (!!data) {
+            $('#StuName').val(data.StuName);
             $('#StuNo').val(data.StuNo);
             $('#DeptNo').lrselectSet(data.DeptNo);
-            $('#ClassNo').val(data.ClassNo);
+            $('#ClassNo').lrselectSet(data.ClassNo);
             $('#IdCard').val(data.IdCard);
             $('#IdCardType').val('居民身份证');
+            $('#DepositBank').lrselectSet(data.DepositBank);
             $('#BankCard').val(data.BankCard);
-            $('#BankCode').val(data.BankCode);
+            $('#CalssNum').val(data.StuNum);
+            $('#ClassRank').val(data.Num);
         }
     };
     page.init();

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

@@ -107,7 +107,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('dataItem', {
                                  key: value,
-                                 code: 'StateStipend',
+                                 code: 'SchoolFundingLevel',
                                  callback: function (_data) {
                                      callback(_data.text);
                                  }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.js

@@ -91,6 +91,78 @@ var bootstrap = function ($, learun) {
                 { label: '学号', name: 'StuNo', width: 100, align: "left" },
                 { label: '姓名', name: 'StuName', width: 100, align: "left" },
                 { label: '总分', name: 'TotalScore', width: 100, align: "left" },
+                {
+                    label: "性别", name: "GenderNo", width: 80, align: "left",
+                    formatter: function (cellvalue) {
+                        return cellvalue == 'True' ? "男" : "女";
+                    }
+                },
+                { label: "出生日期", name: "Birthday", width: 100, align: "left" },
+                { label: "身份证号", name: "IdCard", width: 100, align: "left" },
+                {
+                    label: "民族", name: "NationalityNo", width: 100, align: "left",
+                    formatterAsync: function (callback, value, row, op, $cell) {
+                        learun.clientdata.getAsync('dataItem', {
+                            key: value,
+                            code: 'National',
+                            callback: function (_data) {
+                                callback(_data.text);
+                            }
+                        });
+                    }
+                },
+                {
+                    label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left",
+                    formatterAsync: function (callback, value, row, op, $cell) {
+                        learun.clientdata.getAsync('dataItem', {
+                            key: value,
+                            code: 'BCdPartyFace',
+                            callback: function (_data) {
+                                callback(_data.text);
+                            }
+                        });
+                    }
+                },
+                {
+                    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: 100, align: "left" },
             ];
             //$("#gridtable")[0].dfop = undefined;
             $('#gridtable').lrAuthorizeJfGridLei({
@@ -113,18 +185,15 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     acceptClick = function (callBack) {
-        var box = $('.perFestivalsBox').find('div.box.active');
-        if (box.length <= 0) {
-            learun.alert.warning("请选择学生！");
-            return false;
-        }
-        if (box.length > 1) {
-            learun.alert.warning("只能选择一个学生！");
-            return false;
-        }
-        var postData = JSON.parse(box.attr('data-val'));
+        var row = $('#gridtable').jfGridGet('rowdata');
+
+        //var box = $('.perFestivalsBox').find('div.box.active');
+        //if (box.length <= 0) {
+        //    learun.alert.warning("请选择学生！");
+        //    return false;
+        //}
         if (!!callBack) {
-            callBack(postData);
+            callBack(row);
             return true;
         }
     };

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

@@ -387,9 +387,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [NotMapped]
         public string DepositBank { get; set; }
         [NotMapped]
-        public string BankCode { get; set; }
+        public string BankCard { get; set; }
         [NotMapped]
         public string IdCard { get; set; }
+        [NotMapped]
+        public string Birthday { get; set; }
+        [NotMapped]
+        public string NationalityNo { get; set; }
+        [NotMapped]
+        public string PartyFaceNo { get; set; }
 
 
         /// <summary>

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

@@ -1481,11 +1481,11 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                     tableName = queryParam["TableName"].ToString();
                 }
                 var strSql = new StringBuilder();
-                strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,bb.DeptNo,bb.ClassNo,bb.IdentityCardNo as IdCard,bb.DepositBank,bb.BankCard as BankCode ");
+                strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,bb.DeptNo,bb.ClassNo,bb.IdentityCardNo as IdCard,bb.DepositBank,bb.BankCard ,bb.MajorNo,bb.GenderNo,bb.Birthday,bb.NationalityNo,bb.PartyFaceNo,bb.Grade ");
                 strSql.Append(" ,case when bb.Score >=60 then bb.Score else (case when sp.Score>= 60 then sp.Score else (case when spt.Score>=60 then spt.Score else bb.Score end) end) end as Score ");
                 strSql.Append(" ,case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end as ScoreFormat ");
                 strSql.Append(" from ( ");
-                strSql.Append($" select s.AcademicYearNo,s.Semester,s.ClassNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,Max(s.Score) as Score,sb.DeptNo,sb.IdentityCardNo,sb.DepositBank,sb.BankCard from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo ");
+                strSql.Append($" select s.AcademicYearNo,s.Semester,s.ClassNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,Max(s.Score) as Score,sb.DeptNo,sb.IdentityCardNo,sb.DepositBank,sb.BankCard,sb.majorno,sb.GenderNo,sb.Birthday,sb.NationalityNo,sb.PartyFaceNo,sb.Grade from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo ");
                 strSql.Append(" where 1=1 and s.LessonSortNo='1' and s.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus =1) ");
                 if (!queryParam["AcademicYearNo"].IsEmpty())
                 {
@@ -1507,7 +1507,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                     dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
                     strSql.Append(" and s.StuNo=@StuNo ");
                 }
-                strSql.Append(" group by s.AcademicYearNo,s.Semester,s.ClassNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,sb.DeptNo,sb.ClassNo,sb.IdentityCardNo,sb.DepositBank,sb.BankCard ) as bb ");
+                strSql.Append(" group by s.AcademicYearNo,s.Semester,s.ClassNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,sb.DeptNo,sb.ClassNo,sb.IdentityCardNo,sb.DepositBank,sb.BankCard,sb.majorno,sb.GenderNo,sb.Birthday,sb.NationalityNo,sb.PartyFaceNo,sb.Grade ) as bb ");
                 strSql.Append(" left join StuScoreNotPass sp on bb.AcademicYearNo=sp.AcademicYearNo and bb.Semester=sp.Semester and bb.ClassNo=sp.ClassNo and bb.LessonNo=sp.LessonNo and bb.LessonName=sp.LessonName and bb.StuNo=sp.StuNo ");
                 strSql.Append(" left join StuScoreNotPassTwo spt on bb.AcademicYearNo=spt.AcademicYearNo and bb.Semester=spt.Semester and bb.ClassNo=spt.ClassNo and bb.LessonNo=spt.LessonNo and bb.LessonName=spt.LessonName and bb.StuNo=spt.StuNo ");