【修改】国家助学金（辅导员）页面；

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

@@ -135,6 +135,20 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             stuFellowshipIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
+
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoSubmit(string keyValue, string status, string step)
+        {
+            stuFellowshipIBLL.DoSubmit(keyValue, status, step);
+            return Success("操作成功！");
+        }
+
         #endregion
 
     }

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

@@ -6,74 +6,82 @@
     var classs = "@ViewBag.ClassNo";
 </script>
 <div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship" style="display:none;">
+        <div class="lr-form-item-title">助学金类型</div>
+        <input id="Types" type="text" class="form-control" />
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
         <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
-        <input id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-        <input id="DeptNo" type="text" class="form-control" style="display:none" />
-        <input id="MajorNo" type="text" class="form-control" style="display:none" />
-        <input id="ClassNo" type="text" class="form-control" style="display:none" />
-        <input id="OpenBank" type="text" class="form-control" style="display:none" />
-        <input id="OpenAccount" type="text" class="form-control" style="display:none" />
+        <div id="StuNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">姓名</div>
+        <input id="StuName" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">院校</div>
+        <div id="F_SchoolId" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
-        <div class="lr-form-item-title">姓名<font face="宋体" >*</font></div>
-        <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
-    </div>
-    @*<div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
-        <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
-    </div>*@
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title" data-table="StuFellowship">证件类型<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">班级</div>
+        <div id="ClassNo" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
         <div id="IdCardType" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title" data-table="StuFellowship">身份证号<font face="宋体">*</font></div>
-        <input id="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly/>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">身份证件号</div>
+        <input id="IdentityCardNo" type="text" class="form-control" readonly="readonly" />
     </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title" data-table="StuFellowship">开户行号<font face="宋体">*</font></div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">开户银行</div>
+        <div id="OpenBank" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">开户卡账号</div>
+        <input id="OpenAccount" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">开户行号<font face="宋体">*</font></div>
         <input id="OpenBankNo" type="text" class="form-control" readonly value="20230307230" />
     </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title" data-table="StuFellowship">资助等级<font face="宋体">*</font></div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">资助等级<font face="宋体">*</font></div>
         <div id="SubsidizeType" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item">
-        <div class="lr-form-item-title" data-table="StuFellowship">资助标准<font face="宋体">*</font></div>
-        <input id="FunderNationStandard" type="text" class="form-control" readonly/>
+    <div class="col-xs-4 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">资助标准<font face="宋体">*</font></div>
+        <input id="FunderNationStandard" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">应发金额<font face="宋体">*</font></div>
+        <input id="AmountPayable" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
-    <div class="col-xs-4 lr-form-item">
-        <div class="lr-form-item-title" data-table="StuFellowship">应发金额<font face="宋体">*</font></div>
-        <input id="AmountPayable" type="text" class="form-control" readonly />
+    <div class="col-xs-4 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">实发金额<font face="宋体">*</font></div>
+        <input id="FinalPayingAmount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
-    <div class="col-xs-4 lr-form-item">
-        <div class="lr-form-item-title" data-table="StuFellowship">实发金额<font face="宋体">*</font></div>
-        <input id="FinalPayingAmount" type="text" class="form-control" readonly />
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">申请日期<font face="宋体">*</font></div>
+        <input id="ApplyDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#ApplyDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title" data-table="StuFellowship">申请日期<font face="宋体">*</font></div>
-        <input id="CreateDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">发放日期<font face="宋体">*</font></div>
+        <input id="ReleaseDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#ReleaseDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title" data-table="StuFellowship">发放日期<font face="宋体">*</font></div>
-        <input id="ReleaseDate" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    <div class="col-xs-12 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">申请理由<font face="宋体">*</font></div>
+        <textarea id="ApplyReason" class="form-control" style="height: 100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item">
-        <div class="lr-form-item-title" data-table="StuFellowship">申请理由<font face="宋体">*</font></div>
-        <textarea id="ApplyReason" class="form-control" style="height: 100px;"></textarea>
+    <div class="col-xs-12 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">备注说明</div>
+        <textarea id="Remark" class="form-control" style="height: 50px;" isvalid="yes" checkexpession="LenStrOrNull" length="100" placeholder="字符长度最多为100位"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item">
-        <div class="lr-form-item-title" data-table="StuFellowship">备注</div>
-        <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
+    <div class="col-xs-12 lr-form-item" id="FilesDiv">
+        <div class="lr-form-item-title">附件</div>
+        <div id="Files"></div>
     </div>
+
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuFellowship/Form.js")

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

@@ -6,24 +6,45 @@
  */
 var acceptClick;
 var keyValue = request('keyValue');
+var Step = request('Step');//第几步
+var Types = request('Types');//助学金类型：1国家助学金，2校级助学金
+if (Types != null && Types != undefined && Types != "") {
+    $('#Types').val(Types);
+}
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
             $('.lr-form-wrap').lrscroll();
-            page.initData();
+            page.hide();
             page.bind();
+            page.initData();
+        },
+        hide: function () {
+            if (Step == "2") {//第二步：二级学院审核，时附件显示且必填；
+                $('#FilesDiv').show();
+                $('#Files').attr('isvalid', 'yes');
+                $('#Files').attr('checkexpession', 'NotNull');
+                $('#Files').prev().html('附件<font face="宋体">*</font>');
+            } else {
+                $('#Files').removeAttr('isvalid');
+                $('#Files').removeAttr('checkexpession');
+                $('#Files').prev().html('附件');
+                $('#FilesDiv').hide();
+            }
         },
         bind: function () {
+            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
-            $('#IdCardType').lrselectSet("01");
-
+            $('#OpenBank').lrDataItemSelect({ code: 'DepositBank' });
+            //判断登录用户所带班级：学生弹框显示所带班级学生
             if (classs != "" && classs != undefined && classs != null) {
                 $('#StuNo').lrGirdSelect({
                     // 字段
                     url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
                     param: { strWhere: " 1=1 and classno in (" + classs + ") order by deptno,majorno,classno,grade desc" },
-                    selectWord: 'stuno',
+                    selectWord: 'stuname',
                     value: 'stuno',
                     text: 'stuno',
                     headData: [
@@ -78,28 +99,23 @@ var bootstrap = function ($, learun) {
                         { label: "年级", name: "grade", width: 100, align: "left" }
                     ],
                     select: function (item) {
-                        $("#StuNo").val(item.stuno);
+                        console.log(item);
+                        //自动带出内容：姓名 院校 班级 身份证件号 身份证件类型 开户银行 开户卡账号
                         $("#StuName").val(item.stuname);
+                        $("#F_SchoolId").lrselectSet(item.f_schoolid);
+                        $("#ClassNo").lrselectSet(item.classno);
                         $("#IdentityCardNo").val(item.identitycardno);
-                        $("#DeptNo").val(item.deptno);
-                        $("#MajorNo").val(item.majorno);
-                        $("#ClassNo").val(item.classno);
-                        $("#OpenBank").val(item.depositbank);
+                        $("#OpenBank").lrselectSet(item.depositbank);
                         $("#OpenAccount").val(item.bankcard);
-                        //绑定值到下拉框 1
-                        //$("#DeptNo").lrselectSet(item.deptno);
-                        //$("#MajorNo").lrselectSet(item.majorno);
-                        //$('#ClassNo').lrselectSet(item.bankcard);
-                        //$('#DepositBank').lrselectSet(item.depositbank);
+                        $('#IdCardType').lrselectSet("01");
                     }
-
                 });
             } else {
                 $('#StuNo').lrGirdSelect({
                     // 字段
                     url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
                     param: { strWhere: " 1=1 " },
-                    selectWord: 'stuno',
+                    selectWord: 'stuname',
                     value: 'stuno',
                     text: 'stuno',
                     headData: [
@@ -154,37 +170,48 @@ var bootstrap = function ($, learun) {
                         { label: "年级", name: "grade", width: 100, align: "left" }
                     ],
                     select: function (item) {
-                        $("#StuNo").val(item.stuno);
+                        //自动带出内容：姓名 院校 班级 身份证件号 身份证件类型 开户银行 开户卡账号
                         $("#StuName").val(item.stuname);
+                        $("#F_SchoolId").lrselectSet(item.f_schoolid);
+                        $("#ClassNo").lrselectSet(item.classno);
                         $("#IdentityCardNo").val(item.identitycardno);
-                        $("#DeptNo").val(item.deptno);
-                        $("#MajorNo").val(item.majorno);
-                        $("#ClassNo").val(item.classno);
-                        $("#OpenBank").val(item.depositbank);
+                        $("#OpenBank").lrselectSet(item.depositbank);
                         $("#OpenAccount").val(item.bankcard);
-                        //绑定值到下拉框 1
-                        //$("#DeptNo").lrselectSet(item.deptno);
-                        //$("#MajorNo").lrselectSet(item.majorno);
-                        //$('#ClassNo').lrselectSet(item.bankcard);
-                        //$('#DepositBank').lrselectSet(item.depositbank);
+                        $('#IdCardType').lrselectSet("01");
                     }
-
                 });
             }
-            $('#SubsidizeType').lrDataItemSelect({
-                code: 'StateStipend',
-                select: function (item) {
-                    if (item != null && item != undefined) {
-                        $("#FunderNationStandard").val(item.id);
-                        $("#FinalPayingAmount").val(item.id);
-                        $("#AmountPayable").val(item.id);
+            //判断助学金类型：1国家助学金，2校级助学金
+            if (Types == "1") {
+                $('#SubsidizeType').lrDataItemSelect({
+                    code: 'StateStipend',
+                    select: function (item) {
+                        //系统自动带出标准、应发金额和实发金额
+                        if (item != null && item != undefined) {
+                            $("#FunderNationStandard").val(item.id);
+                            $("#FinalPayingAmount").val(item.id);
+                            $("#AmountPayable").val(item.id);
+                        }
+                    }
+                });
+            } else if (Types == "2") {
+                $('#SubsidizeType').lrDataItemSelect({
+                    code: 'SchoolStipend',
+                    select: function (item) {
+                        //系统自动带出标准、应发金额和实发金额
+                        if (item != null && item != undefined) {
+                            $("#FunderNationStandard").val(item.id);
+                            $("#FinalPayingAmount").val(item.id);
+                            $("#AmountPayable").val(item.id);
+                        }
                     }
-                }
-            });
-            //绑定值到下拉框 2
-            //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            //$('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
-            //$('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+                });
+            }
+
+            //申请时间：默认当天
+            $('#ApplyDate').val(getNowDate());
+            $('#Files').lrUploader();
+
         },
         initData: function () {
             if (!!keyValue) {
@@ -194,20 +221,11 @@ var bootstrap = function ($, learun) {
                             $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
-                          
+
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
                         }
                     }
-                    $("#CreateDate").val(data.StuFellowship.CreateDate);
-                    $('#SubsidizeType').lrselectSet(data.StuFellowship.SubsidizeType);
-                    $("#FunderNationStandard").val(data.StuFellowship.FunderNationStandard);
-                    $("#AmountPayable").val(data.StuFellowship.AmountPayable);
-                    $("#ApplyReason").val(data.StuFellowship.ApplyReason);
-                    $("#ReleaseDate").val(data.StuFellowship.ReleaseDate)
-                    $("#FinalPayingAmount").val(data.StuFellowship.FinalPayingAmount)
-                    $("#ApplyReason").val(data.StuFellowship.ApplyReason)
-                    $("#Remark").val(data.StuFellowship.Remark)
-                    
+
                 });
             }
         }
@@ -217,12 +235,11 @@ var bootstrap = function ($, learun) {
         if (!$('#form').lrValidform()) {
             return false;
         }
-        var postData = $('body').lrGetFormData();
-        postData.State = 1;
-        postData.Types = 1;
+        var postData = $('#form').lrGetFormData();
         var postDatas = {
             strEntity: JSON.stringify(postData)
         };
+
         $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuFellowship/SaveForm?keyValue=' + keyValue, postDatas, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
@@ -232,3 +249,19 @@ var bootstrap = function ($, learun) {
     };
     page.init();
 }
+
+//获取当前时间
+function getNowDate() {
+    var myDate = new Date;
+    var year = myDate.getFullYear(); //获取当前年
+    var mon = myDate.getMonth() + 1; //获取当前月
+    var date = myDate.getDate(); //获取当前日
+    var h = myDate.getHours();//获取当前小时数(0-23)
+    var m = myDate.getMinutes();//获取当前分钟数(0-59)
+    var s = myDate.getSeconds();//获取当前秒
+    var week = myDate.getDay();
+    var weeks = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
+    //console.log(year, mon, date, weeks[week])
+    var result = year + "-" + mon + "-" + date;
+    return result;
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/Index.cshtml

@@ -2,39 +2,51 @@
     ViewBag.Title = "助学金管理";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<style>
+    .datesearchLabel {
+        float: left;
+        line-height: 28px;
+        height: 40px;
+        padding-top: 13px;
+        padding-left: 5px;
+    }
+
+        .datesearchLabel:first-child {
+            padding-left: 0px;
+        }
+</style>
 <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="datesearchLabel">申请</div>
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="datesearchLabel">发放</div>
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearchRelease"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <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="StuNo" 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="StuName" 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 class="lr-form-item-title">院系</div>
+                                    <div id="F_SchoolId"></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="ReleaseDate" type="text" class="form-control" />
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">身份证号</div>
                                     <input id="IdentityCardNo" type="text" class="form-control" />
@@ -44,29 +56,25 @@
                                     <div id="SubsidizeType"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">开户行</div>
-                                    <div id="OpenBank"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">开户行账户</div>
-                                    <input id="OpenAccount" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">开户行户</div>
+                                    <input id="OpenBankNo" type="text" class="form-control" />
                                 </div>
                             </div>
                         </div>
                     </div>
-                    <div class="lr-layout-tool-item">
-                        <div id="datesearch"></div>
-                    </div>
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                    <div class=" btn-group btn-group-sm" >
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
+                    <div class=" btn-group btn-group-sm" >
+                        <a id="lr_submit" 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>

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

@@ -5,10 +5,14 @@
  * 描  述：定制功能助学金
  */
 var refreshGirdData;
+var types = request('types');//助学金类型：1国家助学金，2校级助学金
+console.log(types == "1" ? "国家助学金" : types == "2" ? "校级助学金" : "");
 var bootstrap = function ($, learun) {
     "use strict";
-    var logbegin = '';
-    var logend = '';
+    var startTime;
+    var endTime;
+    var startTimeRelease;
+    var endTimeRelease;
     var page = {
         init: function () {
             page.initGird();
@@ -20,7 +24,7 @@ var bootstrap = function ($, learun) {
                     { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
                     { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
                     { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
-                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
                 ],
                 // 月
                 mShow: false,
@@ -34,21 +38,45 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
+                dfvalue: '1',
                 selectfn: function (begin, end) {
-                    logbegin = begin;
-                    logend = end;
-
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#datesearchRelease').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTimeRelease = begin;
+                    endTimeRelease = end;
                     page.search();
                 }
             });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 400, 400);
+            }, 350, 400);
             //下拉框绑定
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            $('#OpenBank').lrDataItemSelect({ code: 'DepositBank' });
             $('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' });
 
             // 刷新
@@ -60,8 +88,8 @@ var bootstrap = function ($, learun) {
                 learun.layerForm({
                     id: 'form',
                     title: '新增',
-                    url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/Form',
-                    width: 800,
+                    url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/Form?Types=' + types,
+                    width: 1000,
                     height: 600,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
@@ -72,11 +100,16 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "0") {
+                        learun.alert.warning("当前项不属于草稿状态，无法编辑！");
+                        return false;
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/Form?keyValue=' + keyValue,
-                        width: 800,
+                        url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/Form?Types=' + types + '&keyValue=' + keyValue,
+                        width: 1000,
                         height: 600,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
@@ -88,6 +121,11 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "0") {
+                        learun.alert.warning("当前项不属于草稿状态，无法删除！");
+                        return false;
+                    }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuFellowship/DeleteForm', { keyValue: keyValue }, function () {
@@ -97,65 +135,93 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 提交二级学院审核
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "0") {
+                        learun.alert.warning("当前项不属于草稿状态，无法提交学院审核！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuFellowship/DoSubmit', { keyValue: keyValue, status: '1', step: '1' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
         },
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/GetPageList',
                 headData: [
                     { label: '学号', name: 'StuNo', width: 120, align: "left" },
                     { label: '姓名', name: 'StuName', width: 150, align: "left" },
                     {
-                        label: "系所", name: "DeptNo", width: 100, align: "left",
+                        label: '院校', name: 'F_SchoolId', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
                                 key: value,
-                                keyId: 'deptno',
+                                keyId: 'f_companyid',
                                 callback: function (_data) {
-                                    callback(_data['deptname']);
+                                    callback(_data['f_fullname']);
                                 }
                             });
                         }
                     },
                     {
-                        label: "专业", name: "MajorNo", width: 100, align: "left",
+                        label: "所属班级", name: "ClassNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
                                 key: value,
-                                keyId: 'majorno',
+                                keyId: 'classno',
                                 callback: function (_data) {
-                                    callback(_data['majorname']);
+                                    callback(_data['classname']);
                                 }
                             });
                         }
                     },
                     {
-                        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',
+                        label: '身份证件类型', name: 'IdCardType', width: 100, align: "left"
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'classno',
+                                code: 'IdCardType',
                                 callback: function (_data) {
-                                    callback(_data['classname']);
+                                    callback(_data.text);
                                 }
                             });
                         }
                     },
+                    { label: '身份证件号', name: 'IdentityCardNo', width: 160, align: "left" },
                     {
-                        label: '证件类型', name: 'IdCardType', width: 100, align: "left"
+                        label: '资助等级', name: 'SubsidizeType', width: 100, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'IdCardType',
+                                code: 'StateStipend',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
-                    { label: '身份证号', name: 'IdentityCardNo', width: 160, align: "left" },
+                    { label: '资助标准', name: 'FunderNationStandard', width: 100, align: "left" },
+                    { label: '应发金额', name: 'AmountPayable', width: 100, align: "left" },
+                    { label: '实发金额', name: 'FinalPayingAmount', width: 100, align: "left" },
+                    {
+                        label: '申请日期', name: 'ApplyDate', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: '发放日期', name: 'ReleaseDate', width: 100, align: "left" },
+                    { label: '申请理由', name: 'ApplyReason', width: 200, align: "left" },
                     {
                         label: '开户银行', name: 'OpenBank', width: 200, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
@@ -170,62 +236,82 @@ var bootstrap = function ($, learun) {
                     },
                     { label: '开户卡账号', name: 'OpenAccount', width: 200, align: "left" },
                     { label: '开户行号', name: 'OpenBankNo', width: 120, align: "left" },
+                    { label: '备注说明', name: 'Remark', width: 200, align: "left" },
                     {
-                        label: '资助等级', name: 'SubsidizeType', width: 100, align: "left"
-                        , formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
+                        label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "0" ? "<span class=\"label label-default\">草稿</span>" : cellvalue == "1" ? "<span class=\"label label-success\">学院审核中</span>" : cellvalue == "2" ? "<span class=\"label label-success\">学工部审核中</span>" : cellvalue == "3" ? "<span class=\"label label-success\">已归档</span>" : "<span class=\"label label-default\">草稿</span>";
+                        }
+                    },
+                    {
+                        label: '创建人', name: 'CreateUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
                                 key: value,
-                                code: 'StateStipend',
+                                keyId: 'f_userid',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
                     },
-                    { label: '资助标准', name: 'FunderNationStandard', width: 100, align: "left" },
-                    { label: '应发金额', name: 'AmountPayable', width: 100, align: "left" },
-                    { label: '实发金额', name: 'FinalPayingAmount', width: 100, align: "left" },
+                    { label: '创建时间', name: 'CreateTime', width: 130, align: "left" },
+                    { label: '提交时间', name: 'SubmitTime', width: 130, align: "left" },
                     {
-                        label: '申请时间', name: 'CreateDate', width: 100, align: "left",
-                        formatter: function (cellvalue) {
-                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        label: '提交人', name: 'SubmitUserId', width: 100, 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: 'ReleaseDate', width: 200, align: "left" },
-                    { label: '申请理由', name: 'ApplyReason', width: 200, align: "left" },
-                    { label: '备注', name: 'Remark', width: 200, align: "left" },
                     {
-                        label: '状态', name: 'State', width: 100, align: "left",
-                        formatter: function (cellvalue, row) {
-                            if (cellvalue == 2) {
-                                return "<span class=\"label label-success\">二级学院</span>";
-                            } else if (cellvalue == 3) {
-                                return "<span class=\"label label-danger\">学工部</span>";
-                            } else if (cellvalue == 2) {
-                                return "<span class=\"label label-warning\">归档</span>";
-                            } else if (cellvalue == 1) {
-                                return "<span class=\"label label-default\">草稿</span>";
-                            }
+                        label: '学院审核人', name: 'FirstCheckUserId', width: 100, 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: 'FirstCheckTime', width: 130, align: "left" },
+                    {
+                        label: '学工部审核人', name: 'SecondCheckUserId', width: 100, 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: 'SecondCheckTime', width: 130, align: "left" },
                 ],
                 mainId: 'ID',
                 isPage: true,
-                sidx: 'CreateDate',
-                sord: 'ASC'
+                sidx: 'CreateTime desc'
             });
-            page.search();
         },
         search: function (param) {
             param = param || {};
-            param.SqlParam = " and Types = 1"
-            param.StartTime = logbegin;
-            param.EndTime = logend;
+            param.Types = types;
+            param.StartTime = startTime;
+            param.EndTime = endTime;
+            param.StartTimeRelease = startTimeRelease;
+            param.EndTimeRelease = endTimeRelease;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {
-        $('#gridtable').jfGridSet('reload');
+        page.search();
     };
     page.init();
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Form.cshtml

@@ -33,7 +33,7 @@
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
-        <div id="IdCardType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+        <div id="IdCardType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">申请时间<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Form.js

@@ -33,6 +33,7 @@ var bootstrap = function ($, learun) {
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
+            $('#IdCardType').lrselectSet('01');
             $('#StuNo').lrGirdSelect({
                 // 字段
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
@@ -97,7 +98,6 @@ var bootstrap = function ($, learun) {
                     $("#F_SchoolId").lrselectSet(item.f_schoolid);
                     $("#ClassNo").lrselectSet(item.classno);
                     $("#IdentityCardNo").val(item.identitycardno);
-                    $('#IdCardType').lrselectSet('01');
                 }
             });
             //申请时间：默认当天

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipBLL.cs

@@ -142,6 +142,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoSubmit(string keyValue, string status, string step)
+        {
+            try
+            {
+                stuFellowshipService.DoSubmit(keyValue, status, step);
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipEntity.cs

@@ -27,54 +27,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUNO")]
         public string StuNo { get; set; }
         /// <summary>
-        /// 姓名
-        /// </summary>
-        /// <returns></returns>
-        [Column("STUNAME")]
-        public string StuName { get; set; }
-        /// <summary>
-        /// 系部
-        /// </summary>
-        /// <returns></returns>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
-        /// 专业
-        /// </summary>
-        /// <returns></returns>
-        [Column("MAJORNO")]
-        public string MajorNo { get; set; }
-        /// <summary>
-        /// 班级
-        /// </summary>
-        /// <returns></returns>
-        [Column("CLASSNO")]
-        public string ClassNo { get; set; }
-        /// <summary>
-        /// 证件类型 默认身份证
-        /// </summary>
-        /// <returns></returns>
-        [Column("IDCARDTYPE")]
-        public string IdCardType { get; set; }
-        /// <summary>
-        /// 身份证号
-        /// </summary>
-        /// <returns></returns>
-        [Column("IDENTITYCARDNO")]
-        public string IdentityCardNo { get; set; }
-        /// <summary>
-        /// 开户银行
-        /// </summary>
-        /// <returns></returns>
-        [Column("OPENBANK")]
-        public string OpenBank { get; set; }
-        /// <summary>
-        /// 开户卡账号
-        /// </summary>
-        /// <returns></returns>
-        [Column("OPENACCOUNT")]
-        public string OpenAccount { get; set; }
-        /// <summary>
         /// 开户行号
         /// </summary>
         /// <returns></returns>
@@ -87,13 +39,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("SUBSIDIZETYPE")]
         public string SubsidizeType { get; set; }
         /// <summary>
-        /// 资助金额
+        /// 资助标准
         /// </summary>
         /// <returns></returns>
         [Column("FUNDERNATIONSTANDARD")]
         public decimal? FunderNationStandard { get; set; }
         /// <summary>
-        /// AmountPayable
+        /// 应发金额
         /// </summary>
         /// <returns></returns>
         [Column("AMOUNTPAYABLE")]
@@ -105,12 +57,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("FINALPAYINGAMOUNT")]
         public decimal? FinalPayingAmount { get; set; }
         /// <summary>
-        /// 创建时间
-        /// </summary>
-        /// <returns></returns>
-        [Column("CREATEDATE")]
-        public DateTime? CreateDate { get; set; }
-        /// <summary>
         /// 申请时间
         /// </summary>
         /// <returns></returns>
@@ -121,7 +67,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         /// <returns></returns>
         [Column("RELEASEDATE")]
-        public string ReleaseDate { get; set; }
+        public DateTime? ReleaseDate { get; set; }
         /// <summary>
         /// 申请理由
         /// </summary>
@@ -141,17 +87,89 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("FILES")]
         public string Files { get; set; }
         /// <summary>
-        ///  1 草稿  2 二级学院 3 学工部 4 归档
+        ///  0 草稿  1 二级学院 2 学工部 3 归档
         /// </summary>
         /// <returns></returns>
-        [Column("STATE")]
-        public string State { get; set; }
+        [Column("STATUS")]
+        public string Status { get; set; }
         /// <summary>
-        /// 助学金类型 1国家级 2校级
+        /// 助学金类型：1国家助学金，2校级助学金
         /// </summary>
         /// <returns></returns>
         [Column("TYPES")]
         public string Types { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        /// <returns></returns>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        /// <returns></returns>
+        [Column("CREATEUSERNO")]
+        public string CreateUserNo { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        /// <returns></returns>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 编辑人
+        /// </summary>
+        /// <returns></returns>
+        [Column("MODIFYUSERID")]
+        public string ModifyUserId { get; set; }
+        /// <summary>
+        /// 编辑人
+        /// </summary>
+        /// <returns></returns>
+        [Column("MODIFYUSERNO")]
+        public string ModifyUserNo { get; set; }
+        /// <summary>
+        /// 编辑时间
+        /// </summary>
+        /// <returns></returns>
+        [Column("MODIFYTIME")]
+        public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// 提交时间
+        /// </summary>
+        /// <returns></returns>
+        [Column("SUBMITTIME")]
+        public DateTime? SubmitTime { get; set; }
+        /// <summary>
+        /// 提交人
+        /// </summary>
+        /// <returns></returns>
+        [Column("SUBMITUSERID")]
+        public string SubmitUserId { get; set; }
+        /// <summary>
+        /// 学院审核人
+        /// </summary>
+        /// <returns></returns>
+        [Column("FIRSTCHECKUSERID")]
+        public string FirstCheckUserId { get; set; }
+        /// <summary>
+        /// 学院审核时间
+        /// </summary>
+        /// <returns></returns>
+        [Column("FIRSTCHECKTIME")]
+        public DateTime? FirstCheckTime { get; set; }
+        /// <summary>
+        /// 学工部审核人
+        /// </summary>
+        /// <returns></returns>
+        [Column("SECONDCHECKUSERID")]
+        public string SecondCheckUserId { get; set; }
+        /// <summary>
+        /// 学工部审核时间
+        /// </summary>
+        /// <returns></returns>
+        [Column("SECONDCHECKTIME")]
+        public DateTime? SecondCheckTime { get; set; }
         #endregion
 
         #region 扩展操作
@@ -161,6 +179,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public void Create()
         {
             this.ID = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            this.CreateUserId = LoginUserInfo.Get().userId;
+            this.CreateUserNo = LoginUserInfo.Get().account;
+            this.Status = "0";//草稿
         }
         /// <summary>
         /// 编辑调用
@@ -169,8 +191,59 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public void Modify(string keyValue)
         {
             this.ID = keyValue;
+            this.ModifyTime = DateTime.Now;
+            this.ModifyUserId = LoginUserInfo.Get().userId;
+            this.ModifyUserNo = LoginUserInfo.Get().account;
         }
         #endregion
+
+        #region 扩展字段
+
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public string StuName { get; set; }
+        /// <summary>
+        /// 院校
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public string F_SchoolId { get; set; }
+        /// <summary>
+        /// 班级
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// 身份证件号
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public string IdentityCardNo { get; set; }
+        /// <summary>
+        /// 身份证件类型
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public string IdCardType { get; set; }
+        /// <summary>
+        /// 开户银行
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public string OpenBank { get; set; }
+        /// <summary>
+        /// 开户卡账号
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public string OpenAccount { get; set; }
+
+        #endregion
+
     }
 }
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipIBLL.cs

@@ -49,6 +49,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         void SaveEntity(string keyValue, StuFellowshipEntity entity);
+
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DoSubmit(string keyValue, string status, string step);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipService.cs

@@ -66,77 +66,65 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT  t.*");
+                strSql.Append("SELECT t.*,s.StuName,s.F_SchoolId,s.ClassNo,s.IdentityCardNo,s.IdCardType,s.DepositBank as OpenBank,s.BankCard as OpenAccount ");
                 strSql.Append(" FROM StuFellowship t ");
+                strSql.Append(" left join StuInfoBasic s on t.StuNo=s.StuNo ");
                 strSql.Append(" where 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-
-                if (!queryParam["SqlParam"].IsEmpty())
+                
+                if (!queryParam["Types"].IsEmpty())//助学金类型：1国家助学金，2校级助学金
                 {
-                    strSql.Append(queryParam["SqlParam"].ToString());
+                    dp.Add("Types", queryParam["Types"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Types=@Types ");
                 }
                 if (!queryParam["StuNo"].IsEmpty())
                 {
-                    dp.Add("StuNo", "%"+queryParam["StuNo"].ToString()+ "%", DbType.String);
+                    dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.StuNo Like @StuNo ");
                 }
-                if (!queryParam["IdentityCardNo"].IsEmpty())
-                {
-                    dp.Add("IdentityCardNo", "%" + queryParam["IdentityCardNo"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.IdentityCardNo like @IdentityCardNo ");
-                }
                 if (!queryParam["StuName"].IsEmpty())
                 {
                     dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.StuName Like @StuName ");
+                    strSql.Append(" AND s.StuName Like @StuName ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
+                if (!queryParam["F_SchoolId"].IsEmpty())
                 {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.DeptNo=@DeptNo ");
-                }
-                if (!queryParam["MajorNo"].IsEmpty())
-                {
-                    dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.MajorNo=@MajorNo ");
+                    dp.Add("F_SchoolId", queryParam["F_SchoolId"].ToString(), DbType.String);
+                    strSql.Append(" AND s.F_SchoolId=@F_SchoolId ");
                 }
                 if (!queryParam["ClassNo"].IsEmpty())
                 {
                     dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.ClassNo=@ClassNo ");
+                    strSql.Append(" AND s.ClassNo=@ClassNo ");
                 }
-                if (!queryParam["Grade"].IsEmpty())
+                if (!queryParam["IdentityCardNo"].IsEmpty())
                 {
-                    dp.Add("Grade", queryParam["Grade"].ToString(), DbType.String);
-                    strSql.Append(" AND t.Grade=@Grade ");
+                    dp.Add("IdentityCardNo", "%" + queryParam["IdentityCardNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND s.IdentityCardNo like @IdentityCardNo ");
                 }
                 if (!queryParam["SubsidizeType"].IsEmpty())
                 {
-                    dp.Add("SubsidizeType", "" + queryParam["SubsidizeType"].ToString() + "", DbType.String);
+                    dp.Add("SubsidizeType", queryParam["SubsidizeType"].ToString(), DbType.String);
                     strSql.Append(" AND t.SubsidizeType=@SubsidizeType ");
                 }
-                if (!queryParam["OpenAccount"].IsEmpty())
-                {
-                    dp.Add("OpenAccount", "" + queryParam["OpenAccount"].ToString() + "", DbType.String);
-                    strSql.Append(" AND t.OpenAccount=@OpenAccount ");
-                }
-                if (!queryParam["OpenBank"].IsEmpty())
-                {
-                    dp.Add("OpenBank", "" + queryParam["OpenBank"].ToString() + "", DbType.String);
-                    strSql.Append(" AND t.OpenBank=@OpenBank ");
-                }
-                if (!queryParam["ReleaseDate"].IsEmpty())
+                if (!queryParam["OpenBankNo"].IsEmpty())
                 {
-                    dp.Add("ReleaseDate", "%" + queryParam["ReleaseDate"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.ReleaseDate Like @ReleaseDate ");
+                    dp.Add("OpenBankNo", "%" + queryParam["OpenBankNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.OpenBankNo Like @OpenBankNo ");
                 }
                 if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
                 {
                     dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
                     dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
-                    strSql.Append(" AND ( CreateDate >= @startTime AND CreateDate <= @endTime ) ");
+                    strSql.Append(" AND ( t.ApplyDate >= @startTime AND t.ApplyDate <= @endTime ) ");
+                }
+                if (!queryParam["StartTimeRelease"].IsEmpty() && !queryParam["EndTimeRelease"].IsEmpty())
+                {
+                    dp.Add("StartTimeRelease", queryParam["StartTimeRelease"].ToDate(), DbType.DateTime);
+                    dp.Add("EndTimeRelease", queryParam["EndTimeRelease"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.ReleaseDate >= @StartTimeRelease AND t.ReleaseDate <= @EndTimeRelease ) ");
                 }
                 return this.BaseRepository("CollegeMIS").FindList<StuFellowshipEntity>(strSql.ToString(), dp, pagination);
             }
@@ -162,7 +150,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindEntity<StuFellowshipEntity>(keyValue);
+                var strsql = $"select t.*,s.StuName,s.F_SchoolId,s.ClassNo,s.IdentityCardNo,s.IdCardType,s.DepositBank as OpenBank,s.BankCard as OpenAccount from StuFellowship t left join StuInfoBasic s on t.StuNo=s.StuNo where 1=1 and t.ID='{keyValue}' ";
+                return this.BaseRepository("CollegeMIS").FindEntity<StuFellowshipEntity>(strsql, null);
             }
             catch (Exception ex)
             {
@@ -237,6 +226,42 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoSubmit(string keyValue, string status, string step)
+        {
+            try
+            {
+                if (step == "1")//第一步：提交二级学院审核
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuFellowship set SubmitTime='{DateTime.Now}',SubmitUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+                }
+                else if (step == "2")//第二步：提交学工部审核
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuFellowship set FirstCheckTime='{DateTime.Now}',FirstCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+                }
+                else if (step == "3")//第三步：归档
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuFellowship set SecondCheckTime='{DateTime.Now}',SecondCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+                }
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
     }