Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl

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

@@ -167,6 +167,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 助学贷款表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult LoanForm()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 现场缴费表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult OnsitePayForm()
+        {
+            return View();
+        }
 
         /// <summary>
         /// 主页面【学子在线-新生信息完善】
@@ -409,6 +427,21 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("保存成功！");
         }
 
+        /// <summary> 
+        /// 保存实体数据（新增、修改） 
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveLoanForm(string keyValue, string strEntity)
+        {
+            StuInfoFreshEntity entity = strEntity.ToObject<StuInfoFreshEntity>();
+            stuInfoFreshIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
         #endregion
 
         #region 扩展数据
@@ -489,7 +522,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("操作成功");
         }
         /// <summary>
-        ///领取用品
+        ///领取钥匙
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -500,6 +533,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("操作成功");
         }
         /// <summary>
+        ///领取校园卡
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult IsGetCard(string keyValue, string status)
+        {
+            stuInfoFreshIBLL.IsGetCard(keyValue, status);
+            return Success("操作成功");
+        }
+        /// <summary>
         ///缴费
         /// </summary>
         /// <returns></returns>
@@ -510,6 +554,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             stuInfoFreshIBLL.IsPayFee(keyValue, status);
             return Success("操作成功");
         }
+
+        /// <summary>
+        ///其他费用缴费
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult IsOtherPayFee(string keyValue, string status)
+        {
+            stuInfoFreshIBLL.IsOtherPayFee(keyValue, status);
+            return Success("操作成功");
+        }
         /// <summary> 
         /// 获取新生缴费明细 
         /// <summary> 

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

@@ -125,6 +125,10 @@
         <div class="lr-form-item-title">家庭地址  <font face="宋体">*</font></div>
         <input id="FamilyAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
+        <div class="lr-form-item-title">精准贫困户</div>
+        <div id="IsPoor"></div>
+    </div>
 
 
     <div class="col-xs-12" id="photoBox">

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

@@ -24,6 +24,7 @@ var bootstrap = function ($, learun) {
             $("#HighTestSortNo").lrDataItemSelect({ code: 'GraduateCategory' });
             $("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' });
             $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
+            $('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' });
 
             $('#StuInfoFreshFamily').jfGrid({
                 headData: [

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.cshtml

@@ -145,6 +145,10 @@
         <div class="lr-form-item-title">家庭地址  <font face="宋体">*</font></div>
         <input id="FamilyAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
+        <div class="lr-form-item-title">精准贫困户</div>
+        <div id="IsPoor"></div>
+    </div>
 
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js

@@ -24,6 +24,8 @@ var bootstrap = function ($, learun) {
             $("#HighTestSortNo").lrDataItemSelect({ code: 'GraduateCategory' });
             $("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' });
             $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
+            $('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' });
+
 
             $('#StuInfoFreshFamily').jfGrid({
                 headData: [

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.cshtml

@@ -37,8 +37,10 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
-                        <a id="lr_get" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;领取饭卡钥匙</a>
-                        <a id="lr_cancelGet" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置未领取</a>
+                        <a id="lr_get" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;领取钥匙</a>
+                        <a id="lr_cancelGet" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置未领取钥匙</a>
+                        <a id="lr_getCard" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;领取校园卡</a>
+                        <a id="lr_cancelGetCard" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置未领取校园卡</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_deleteBed" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除宿舍信息</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js

@@ -50,16 +50,16 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 领取饭卡钥匙
+            // 领取钥匙
             $('#lr_get').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.GetKeyStatus == "1") {
-                        learun.alert.warning("当前新生已领取饭卡钥匙！");
+                        learun.alert.warning("当前新生已领取钥匙！");
                         return;
                     }
-                    learun.layerConfirm('是否确认领取饭卡钥匙！', function (res) {
+                    learun.layerConfirm('是否确认领取钥匙！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetKey', { keyValue: keyValue, status: 1 }, function () {
                                 refreshGirdData();
@@ -68,16 +68,16 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 设置未领取
+            // 设置未领取钥匙
             $('#lr_cancelGet').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.GetKeyStatus != "1") {
-                        learun.alert.warning("当前新生暂未领取饭卡钥匙！");
+                        learun.alert.warning("当前新生暂未领取钥匙！");
                         return;
                     }
-                    learun.layerConfirm('是否设置新生未领取饭卡钥匙！', function (res) {
+                    learun.layerConfirm('是否设置新生未领取钥匙！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetKey', { keyValue: keyValue, status: 0 }, function () {
                                 refreshGirdData();
@@ -86,6 +86,43 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+
+            // 领取校园卡
+            $('#lr_getCard').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.GetCardStatus == "1") {
+                        learun.alert.warning("当前新生已领取校园卡！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认领取校园卡！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetCard', { keyValue: keyValue, status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 设置未领取校园卡
+            $('#lr_cancelGetCard').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.GetCardStatus != "1") {
+                        learun.alert.warning("当前新生暂未领取校园卡！");
+                        return;
+                    }
+                    learun.layerConfirm('是否设置新生未领取校园卡！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetCard', { keyValue: keyValue, status: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
             // 删除宿舍信息
             $('#lr_deleteBed').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
@@ -100,7 +137,11 @@ var bootstrap = function ($, learun) {
                         return;
                     }
                     if (selectedRow.GetKeyStatus == "1") {
-                        learun.alert.warning("当前新生已领取饭卡钥匙，无法删除宿舍信息！");
+                        learun.alert.warning("当前新生已领取钥匙，无法删除宿舍信息！");
+                        return;
+                    }
+                    if (selectedRow.GetCardStatus == "1") {
+                        learun.alert.warning("当前新生已领取校园卡，无法删除宿舍信息！");
                         return;
                     }
                     learun.layerConfirm('是否确认删除宿舍信息！', function (res) {
@@ -146,22 +187,28 @@ var bootstrap = function ($, learun) {
                     },
                     { label: '报到时间', name: 'ArriveDate', width: 130, align: "left" },
                     {
-                        label: '缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) {
+                        label: '线上缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) {
                             return value == 1 ? "<span class=\"label label-success\">已缴费</span>" : "<span class=\"label label-warning\">未缴费</span>";
                         }
                     },
-                    { label: '缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
+                    { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
                     {
                         label: '宿舍信息', name: 'DormitoryName', width: 180, align: "left", formatter: function (value, row) {
                             return "<span>" + (row.Build ? row.Build : '') + (row.Room ? row.Room : '') + (row.Bed ? row.Bed : '') + "</span>";
                         }
                     },
                     {
-                        label: '领取状态', name: 'GetKeyStatus', width: 100, align: "left", formatter: function (value) {
+                        label: '领取钥匙状态', name: 'GetKeyStatus', width: 100, align: "left", formatter: function (value) {
+                            return value == 1 ? "<span class=\"label label-success\">已领取</span>" : "<span class=\"label label-warning\">未领取</span>";
+                        }
+                    },
+                    { label: '领取钥匙时间', name: 'GetKeyDate', width: 130, align: "left" },
+                    {
+                        label: '领取校园卡状态', name: 'GetCardStatus', width: 100, align: "left", formatter: function (value) {
                             return value == 1 ? "<span class=\"label label-success\">已领取</span>" : "<span class=\"label label-warning\">未领取</span>";
                         }
                     },
-                    { label: '领取时间', name: 'GetKeyDate', width: 130, align: "left" },
+                    { label: '领取校园卡时间', name: 'GetCardDate', width: 130, align: "left" },
                     {
                         label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.cshtml

@@ -0,0 +1,13 @@
+@{
+    ViewBag.Title = "助学贷款";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoFresh">
+        <div class="lr-form-item-title">贷款回执码</div>
+        <input id="StudentLoan" type="text" class="form-control" />
+    </div>
+
+
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js

@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-08-08 17:21
+ * 描  述：助学贷款
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (id == "StuInfoFresh") {
+                            if (!!data[id].length && data[id].length > 0) {
+                                $('#' + id).jfGridSet('refreshdata', data[id]);
+                            }
+                            else {
+                                $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                            }
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+
+        var postData = {};
+        postData.strEntity = JSON.stringify($('[data-table="StuInfoFresh"]').lrGetFormData());
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SaveLoanForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调 
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/OnsitePayForm.cshtml

@@ -0,0 +1,13 @@
+@{
+    ViewBag.Title = "现场缴费";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoFresh">
+        <div class="lr-form-item-title">缴费状态<font face="宋体">*</font></div>
+        <div id="OnsitePayFeeStatus" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+
+
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/OnsitePayForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/OnsitePayForm.js

@@ -0,0 +1,53 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-08-08 17:21
+ * 描  述：现场缴费
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#OnsitePayFeeStatus').lrDataItemSelect({ code: 'OnsitePayStatus' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (id == "StuInfoFresh") {
+                            if (!!data[id].length && data[id].length > 0) {
+                                $('#' + id).jfGridSet('refreshdata', data[id]);
+                            }
+                            else {
+                                $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                            }
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+
+        var postData = {};
+        postData.strEntity = JSON.stringify($('[data-table="StuInfoFresh"]').lrGetFormData());
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SaveLoanForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调 
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml

@@ -1,4 +1,6 @@
 @{
+    /**/
+
     ViewBag.Title = "新生缴费管理";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
@@ -19,8 +21,14 @@
                         <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">
-                        <a id="lr_view"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
-                        <a id="lr_payFee"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;缴费</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
+                        @*<a id="lr_payFee" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;缴费</a>*@
+                        <a id="lr_pay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;线上缴费</a>
+                        <a id="lr_cancelPay" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;取消线上缴费</a>
+                        <a id="lr_loan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;助学贷款</a>
+                        <a id="lr_onsitePay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;现场缴费</a>
+                        <a id="lr_otherPay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;其他费用缴费</a>
+                        <a id="lr_cancelOtherPay" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;取消其他费用缴费</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js

@@ -53,6 +53,113 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 线上缴费
+            $('#lr_pay').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.PayFeeStatus == "1") {
+                        learun.alert.warning("当前新生已线上缴费！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认线上缴费！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsPayFee', { keyValue: keyValue, status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 取消线上缴费
+            $('#lr_cancelPay').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.PayFeeStatus != "1") {
+                        learun.alert.warning("当前新生未线上缴费！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认取消线上缴费！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsPayFee', { keyValue: keyValue, status: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 助学贷款
+            $('#lr_loan').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'loanForm',
+                        title: '助学贷款',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/LoanForm?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 现场缴费
+            $('#lr_onsitePay').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'onsitePayForm',
+                        title: '现场缴费',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/OnsitePayForm?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 其他费用缴费
+            $('#lr_otherPay').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.OtherPayFeeStatus == "1") {
+                        learun.alert.warning("当前新生其他费用已缴费！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认其他费用缴费！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsOtherPayFee', { keyValue: keyValue, status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 取消其他费用缴费
+            $('#lr_cancelOtherPay').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.OtherPayFeeStatus != "1") {
+                        learun.alert.warning("当前新生其他费用未缴费！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认取消其他费用缴费！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsOtherPayFee', { keyValue: keyValue, status: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+
         },
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
@@ -63,11 +170,38 @@ var bootstrap = function ($, learun) {
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
                     { label: '姓名', name: 'StuName', width: 100, align: "left" },
                     {
-                        label: '缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) {
+                        label: '线上缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) {
+                            return value == 1 ? "<span class=\"label label-success\">已缴费</span>" : "<span class=\"label label-warning\">未缴费</span>";
+                        }
+                    },
+                    { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
+                    { label: '助学贷款', name: 'StudentLoan', width: 130, align: "left" },
+                    {
+                        label: '现场缴费状态', name: 'OnsitePayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'OnsitePayStatus',
+                                callback: function (_data) {
+                                    //callback(_data.text);
+                                    if (_data.text) {
+                                        if (_data.text == "已缴费") {
+                                            callback('<span class=\"label label-success\">' + _data.text + '</span>');
+                                        } else {
+                                            callback('<span class=\"label label-warning\">' + _data.text + '</span>');
+                                        }
+                                    } else {
+                                        callback('<span class=\"label label-warning\">未缴费</span>');
+                                    }
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '其他费用缴费状态', name: 'OtherPayFeeStatus', width: 100, align: "left", formatter: function (value) {
                             return value == 1 ? "<span class=\"label label-success\">已缴费</span>" : "<span class=\"label label-warning\">未缴费</span>";
                         }
                     },
-                    { label: '缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
+                    { label: '其他费用缴费时间', name: 'OtherPayFeeDate', width: 130, align: "left" },
                     {
                         label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml

@@ -7,10 +7,6 @@
         <div class="lr-form-item-title">主题<font face="宋体">*</font></div>
         <input id="Title" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" id="ReceiverIddiv">
-        <div class="lr-form-item-title">指定接收人<font face="宋体">*</font></div>
-        <div id="SpecifyReceiver" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
     <div class="col-xs-12 lr-form-item" data-table="Sys_SendFile">
         <div class="lr-form-item-title">文件</div>
         <div id="Url" readonly="readonly" style="padding-right: 60px;"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js

@@ -27,7 +27,6 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#SpecifyReceiver').lrUserSelect({ type: '1' });
             $('#Url').lrUploader();
             var ContentsUE = UE.getEditor('Contents');
             $('#Contents')[0].ue = ContentsUE;

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

@@ -142,12 +142,11 @@ var bootstrap = function ($, learun) {
             // 下发审批指定接收人
             $('#lr_IssueSpecifyReceiver').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('SFileId');
-                var specifyReceiver = $('#gridtable').jfGridValue('SpecifyReceiver');
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
                         id: 'form',
                         title: '下发审批指定接收人',
-                        url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue + '&specifyReceiver=' + specifyReceiver,
+                        url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue,
                         width: 800,
                         height: 200,
                         callBack: function (id) {
@@ -191,39 +190,10 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetPageList',
                 headData: [
                     { label: "主题", name: "Title", width: 300, align: "left" },
-                    {
-                        label: "已接收", name: "Receiver", width: 300, align: "left"
-                    },
-                    {
-                        label: "审批指定接收人", name: "SpecifyReceiver", width: 150, align: "left", formatterAsync:
-                            function (callback, value, row, op, $cell) {
-                                learun.clientdata.getAsync('user',
-                                    {
-                                        key: value,
-                                        callback: function (_data) {
-                                            if (_data.length > 0) {
-                                                var text = '';
-                                                $.each(_data,
-                                                    function (i, item) {
-                                                        if (item) {
-                                                            text += item.name + ',';
-                                                        }
-                                                    });
-                                                text = text.substring(0, text.lastIndexOf(','));
-                                                callback(text);
-                                            } else {
-                                                callback(_data.name);
-                                            }
-                                        }
-                                    });
-                            }
-                    },
-                    {
-                        label: "下发人", name: "Sender", width: 100, align: "left"
-                    },
-                    {
-                        label: "下发时间", name: "SendTime", width: 150, align: "left"
-                    },
+                    { label: "已接收", name: "Receiver", width: 300, align: "left" },
+                    { label: "审批意见", name: "SpecifyReceiver", width: 300, align: "left" },
+                    { label: "下发人", name: "Sender", width: 100, align: "left" },
+                    { label: "下发时间", name: "SendTime", width: 150, align: "left" },
                     {
                         label: "状态", name: "SendFlag", width: 100, align: "left",
                         formatter: function (cellvalue, row) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs

@@ -1,6 +1,7 @@
 using Learun.Application.WorkFlow;
 using Learun.Util;
 using System.Collections.Generic;
+using System.Linq;
 using System.Web.Mvc;
 using Learun.Application.Organization;
 using Learun.Application.Base.AuthorizeModule;
@@ -20,6 +21,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
 
         private NWFSchemeIBLL nWFSchemeIBLL = new NWFSchemeBLL();
         private NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL();
+
         private UserIBLL userIbll = new UserBLL();
         private UserRelationIBLL userRelationIBLL = new UserRelationBLL();
 
@@ -97,6 +99,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
         {
             return View();
         }
+
         /// <summary>
         /// 合同打印
         /// </summary>
@@ -105,22 +108,36 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
         public ActionResult htPrint(string keyValue)
         {
 
+            //获取校长的签名盖章
+            var listTaskLog = nWFTaskIBLL.GetLogList(keyValue);
+            var nwfTaskLogEntity = listTaskLog.FirstOrDefault(a => a.F_TaskUserName == "关亮");
+            if (nwfTaskLogEntity != null)
+            {
+                ViewBag.StampImg = nwfTaskLogEntity.F_StampImg;
+                ViewBag.SignImg = nwfTaskLogEntity.F_SignImg;
+            }
+
+
             var data = nWFProcessIBLL.GetHTInfo(keyValue);
-            var userInfo = userIbll.GetEntityByUserId(data.F_CreateUserName);
-            var beginTime = data.LC_htkssj.ToDate();
-            var endTime = data.LC_htjssj.ToDate();
-            var operationTime = data.OperationTime.ToDate();
+            var userInfo = new UserEntity();
+            if (data != null)
+            {
+                userInfo = userIbll.GetEntityByUserId(data.F_CreateUserName);
+            }
+            var beginTime = data?.LC_htkssj.ToDate();
+            var endTime = data?.LC_htjssj.ToDate();
+            var operationTime = data?.OperationTime.ToDate();
             ViewBag.UserName = userInfo?.F_RealName;
             ViewBag.IDCard = userInfo?.F_IdentityCardNo;
-            ViewBag.BeginYear = beginTime.Year;
-            ViewBag.BeginMonth = beginTime.Month;
-            ViewBag.BeginDay = beginTime.Day;
-            ViewBag.EndYear = endTime.Year;
-            ViewBag.EndMonth = endTime.Month;
-            ViewBag.EndDay = endTime.Day;
-            ViewBag.OperationYear = operationTime.Year;
-            ViewBag.OperationMonth = operationTime.Month;
-            ViewBag.OperationDay = operationTime.Day;
+            ViewBag.BeginYear = beginTime?.Year;
+            ViewBag.BeginMonth = beginTime?.Month;
+            ViewBag.BeginDay = beginTime?.Day;
+            ViewBag.EndYear = endTime?.Year;
+            ViewBag.EndMonth = endTime?.Month;
+            ViewBag.EndDay = endTime?.Day;
+            ViewBag.OperationYear = operationTime?.Year;
+            ViewBag.OperationMonth = operationTime?.Month;
+            ViewBag.OperationDay = operationTime?.Day;
             return View();
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js

@@ -160,8 +160,9 @@ var bootstrap = function ($, learun) {
 
                             var isaAain = false;
                             if (categoryId == '1') {
-                                if (row.F_IsFinished != 0 && row.F_SchemeCode == 'LC_Contract_') {
-                                    $cell.on('click', '.print', function () {// 催办审核
+                                //如果流程是合同审批 并且校长审批通过的话可以打印
+                                if (row.LeaderIsAgree && row.F_SchemeCode == 'LC_Contract_') {
+                                    $cell.on('click', '.print', function () {
 
                                         learun.layerForm({
                                             id: 'print',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js

@@ -236,6 +236,8 @@ var bootstrap = function ($, learun) {
             });
             // 打印表单
             $('#print').on('click', function () {
+                //打印checkbox 选中效果打印不出来
+                $("input[type='checkbox']:checked").attr('checked', 'checked');
                 var $iframes = $('#form_list_iframes');
                 var iframeId = $iframes.find('.form-list-iframe.active').attr('id');
                 if (iframeId) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml

@@ -33,11 +33,16 @@
                     委托人：<span>关亮</span>(身份证号码：<span style="width: 237px;">110111196506121035</span>)
                 </div>
                 <div class="entrTxt">
-                    (签字) 
+                    (签字)
+                    <img id="signImg" hidden="hidden">)
+                    <img id="stampImg" hidden="hidden">
                 </div>
                 <div class="entrTime">
+
                     @ViewBag.OperationYear 年<span></span>@ViewBag.OperationMonth 月<span></span>@ViewBag.OperationDay 日
                 </div>
+
+
             </div>
         </div>
 
@@ -46,10 +51,28 @@
     <script src="~/Content/jquery/plugin/fullcalendar/js/jquery-1.7.2.min.js"></script>
     <script src="~/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js"></script>
 
-    <script>
-        $('.btn').click(function () {
-            $('.tableBox').jqprint();
-        })
-    </script>
+
+
 </body>
 </html>
+<script>
+    //盖章图片
+    var stampUrl = '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=00324dc8-e0db-457f-b078-ebd1aac46463';// + @ViewBag.StampImg;
+    var signUrl = '/LR_SystemModule/Img/GetImg?keyValue=90ddf143-ba5a-4900-b9c5-96fb3336d4a7';// + @ViewBag.SignImg;
+    $('#signImg').attr('src', signUrl);
+    $('#stampImg').attr('src', stampUrl);
+
+    var signImg = new Image();
+    var stampImg = new Image();
+    signImg.src = $('#signImg')[0].src;
+    stampImg.src = $('#stampImg')[0].src;
+    signImg.onload=function() {
+        $('#signImg').show();
+    }
+    stampImg.onload=function() {
+        $('#stampImg').show();
+    }
+        $('.btn').click(function () {
+        $('.tableBox').jqprint();
+    });
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.css

@@ -84,6 +84,7 @@ table {
     text-indent: 32px;
     font-size: 14px;
     line-height: 30px;
+    position: relative;
 }
 
 .entrTxt span {
@@ -97,13 +98,24 @@ table {
     text-indent: 0;
     text-align: center
 }
-
+#signImg {
+    position: absolute;
+    width: 250px;
+    top: 40px;
+    left: 100px;
+}
 .entrTime {
     text-align: right;
     padding-right: 80px;
     margin-top: 120px;
+    position: relative;
+}
+#stampImg {
+    position: absolute;
+    width: 140px;
+    top: 60px;
+    left: 170px;
 }
-
 .entrTime span {
     display: inline-block;
     width: 50px;

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

@@ -952,6 +952,8 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\MyClass.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\Print.css" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\AllocationClassDC.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\OnsitePayForm.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\LoanForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\FormDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\SchoolUniform.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\IndexDC.js" />
@@ -988,6 +990,7 @@
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\FormPartyView.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\IndexParty.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\IndexDocument.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\IssueForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\ReadListParty.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\ReadListDocument.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\StatisticIndex.js" />
@@ -6802,6 +6805,9 @@
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.cshtml" />
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\PaymentIndex.cshtml" />
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\ReportIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\LoanForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\OnsitePayForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\IssueForm.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs

@@ -408,6 +408,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
+        /// <summary> 
+        /// 保存实体数据（新增、修改） 
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        public void SaveEntity(string keyValue, StuInfoFreshEntity entity)
+        {
+            try
+            {
+                stuInfoFreshService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
         #region 扩展数据
@@ -461,7 +485,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
 
         /// <summary> 
-        /// 领取用品
+        /// 领取钥匙
         /// <param name="keyValue">主键</param> 
         /// <summary> 
         /// <returns></returns> 
@@ -484,6 +508,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary> 
+        /// 领取校园卡
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        public void IsGetCard(string keyValue, string status)
+        {
+            try
+            {
+                stuInfoFreshService.IsGetCard(keyValue, status);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary> 
         /// 缴费
         /// <param name="keyValue">主键</param> 
@@ -508,6 +556,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary> 
+        /// 其他费用缴费
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        public void IsOtherPayFee(string keyValue, string status)
+        {
+            try
+            {
+                stuInfoFreshService.IsOtherPayFee(keyValue, status);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary> 
         /// 分配班级 
         /// <param name="keyValue">主键</param> 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs

@@ -465,29 +465,71 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("COLLECTFILESTATUS")]
         public string CollectFileStatus { get; set; }
         /// <summary> 
-        /// 领取饭卡钥匙时间 
+        /// 领取钥匙时间 
         /// </summary> 
         /// <returns></returns> 
         [Column("GETKEYDATE")]
         public DateTime? GetKeyDate { get; set; }
         /// <summary> 
-        /// 领取饭卡钥匙状态 
+        /// 领取钥匙状态 
         /// </summary> 
         /// <returns></returns> 
         [Column("GETKEYSTATUS")]
         public string GetKeyStatus { get; set; }
         /// <summary> 
+        /// 领取校园卡时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("GETCARDDATE")]
+        public DateTime? GetCardDate { get; set; }
+        /// <summary> 
+        /// 领取校园卡状态 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("GETCARDSTATUS")]
+        public string GetCardStatus { get; set; }
+        /// <summary> 
         /// 缴费时间 
         /// </summary> 
         /// <returns></returns> 
         [Column("PAYFEEDATE")]
         public DateTime? PayFeeDate { get; set; }
         /// <summary> 
-        /// 缴费状态 
+        /// 线上缴费状态
         /// </summary> 
         /// <returns></returns> 
         [Column("PAYFEESTATUS")]
         public string PayFeeStatus { get; set; }
+        /// <summary> 
+        /// 助学贷款：贷款回执码
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("STUDENTLOAN")]
+        public string StudentLoan { get; set; }
+        /// <summary> 
+        /// 现场缴费状态
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("ONSITEPAYFEESTATUS")]
+        public string OnsitePayFeeStatus { get; set; }
+        /// <summary> 
+        /// 其他费用缴费时间（班费、体检费、军训费、）
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("OTHERPAYFEEDATE")]
+        public DateTime? OtherPayFeeDate { get; set; }
+        /// <summary> 
+        /// 其他费用缴费状态（班费、体检费、军训费、）
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("OTHERPAYFEESTATUS")]
+        public string OtherPayFeeStatus { get; set; }
+        /// <summary>
+        /// 是否精准贫困户
+        /// </summary>
+        [Column("ISPOOR")]
+        public string IsPoor { get; set; }
+
         /// <summary>
         /// 宿舍号
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs

@@ -110,6 +110,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns> 
         void SaveEntity(string keyValue, StuInfoFreshEntity entity, List<StuInfoFreshEmergePeopleEntity> stuInfoFreshEmergePeopleList, List<StuInfoFreshFamilyEntity> stuInfoFreshFamilyList);
 
+        /// <summary> 
+        /// 保存实体数据（新增、修改） 
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        void SaveEntity(string keyValue, StuInfoFreshEntity entity);
         #endregion
 
         #region 扩展数据
@@ -129,12 +135,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         void IsCollectFile(string keyValue, string status);
 
         /// <summary> 
-        /// 领取用品
+        /// 领取钥匙
         /// <param name="keyValue">主键</param> 
         /// <summary> 
         /// <returns></returns> 
         void IsGetKey(string keyValue, string status);
 
+        /// <summary> 
+        /// 领取校园卡
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        void IsGetCard(string keyValue, string status);
+
         /// <summary> 
         /// 缴费
         /// <param name="keyValue">主键</param> 
@@ -142,6 +155,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns> 
         void IsPayFee(string keyValue, string status);
 
+        /// <summary> 
+        /// 其他费用缴费
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        void IsOtherPayFee(string keyValue, string status);
+
         /// <summary> 
         /// 分配班级 
         /// <param name="keyValue">主键</param> 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -839,6 +839,40 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
+        /// <summary> 
+        /// 保存实体数据（新增、修改） 
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        public void SaveEntity(string keyValue, StuInfoFreshEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region 扩展数据
@@ -906,7 +940,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
 
         /// <summary> 
-        /// 领取用品
+        /// 领取钥匙
         /// <param name="keyValue">主键</param> 
         /// <summary> 
         /// <returns></returns> 
@@ -936,6 +970,37 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary> 
+        /// 领取校园卡
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        public void IsGetCard(string keyValue, string status)
+        {
+            try
+            {
+                if (status == "1")//领取
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set GetCardStatus='1',GetCardDate='" + DateTime.Now + "' where ID='" + keyValue + "' ");
+                }
+                else
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set GetCardStatus='0',GetCardDate=null where ID='" + keyValue + "' ");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary> 
         /// 缴费
         /// <param name="keyValue">主键</param> 
@@ -967,6 +1032,37 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary> 
+        /// 其他费用缴费
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        public void IsOtherPayFee(string keyValue, string status)
+        {
+            try
+            {
+                if (status == "1")//缴费
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set OtherPayFeeStatus='1',OtherPayFeeDate='" + DateTime.Now + "' where ID='" + keyValue + "' ");
+                }
+                else
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set OtherPayFeeStatus='0',OtherPayFeeDate=null where ID='" + keyValue + "' ");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary> 
         /// 分配班级 
         /// <param name="keyValue">主键</param> 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs

@@ -233,6 +233,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var Sys_SendFile = db.FindEntity<Sys_SendFileEntity>(m => m.SProcessId == processId);
                 Sys_SendFile.SendFlag = status;
+
+                //获取校长的审批意见
                 if (status == 2)
                 {
                     Sys_SendFile.SendTime = DateTime.Now;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs

@@ -10,9 +10,10 @@ namespace Learun.Application.WorkFlow
     public class Sys_SendFileMethod : IWorkFlowMethod
     {
         Sys_SendFileIBLL asset = new Sys_SendFileBLL();
+        NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL();
         public void Sucess(string processId)
         {
-            asset.ChangeStatusByProcessId(processId,2);
+            asset.ChangeStatusByProcessId(processId, 2);
         }
 
         public void Fail(string processId)
@@ -25,6 +26,18 @@ namespace Learun.Application.WorkFlow
             if (parameter.code == "agree")
             {
                 asset.ChangeStatusByProcessId(parameter.processId, 2);
+                var list = nWFTaskIBLL.GetLogList(parameter.processId);
+                var nwfTaskLogEntity = list.FirstOrDefault(a => a.F_TaskUserName == "关亮");
+                Sys_SendFileEntity entity = asset.GetEntityByProcessId(parameter.processId);
+                if (nwfTaskLogEntity != null)
+                {
+                    entity.SpecifyReceiver = nwfTaskLogEntity.F_Des;
+                }
+                else
+                {
+                    entity.SpecifyReceiver = "测试信息";
+                }
+                asset.SaveEntity(entity.SFileId, entity);
             }
             else
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs

@@ -174,6 +174,12 @@ namespace Learun.Application.WorkFlow
         /// <returns></returns> 
         [NotMapped]
         public int? F_IsUrge { get; set; }
+
+        /// <summary>
+        /// 合同流程专用， 校长是否同意
+        /// </summary>
+        [NotMapped]
+        public bool? LeaderIsAgree { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs

@@ -237,6 +237,18 @@ namespace Learun.Application.WorkFlow
                 foreach (var item in aa)
                 {
                     item.F_TaskId = this.BaseRepository().FindEntity<NWFTaskEntity>(x => x.F_ProcessId == item.F_Id)?.F_Id;
+
+                    //合同流程审批专用  如果第一步校长审批同意的话 可以打印授权委托书
+                    if (item.F_SchemeCode == "LC_Contract_")
+                    {
+                        var entity = this.BaseRepository().FindEntity<NWFTaskLogEntity>(a =>
+                              a.F_ProcessId == item.F_Id && a.F_TaskUserId == "29add015-3638-415d-9f91-5024bd746fb5" &&
+                              a.F_OperationCode == "agree");
+                        if (null != entity)
+                        {
+                            item.LeaderIsAgree = true;
+                        }
+                    }
                 }
                 return aa;
             }