【修改】毕业证领取：领取时增加领取人签名、领取日期、代领备注、代领人身份证号；

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

@@ -256,6 +256,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
 
+        /// <summary>
+        /// 毕业证领取表单
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GraduateDiplomaReceiveForm()
+        {
+            return View();
+        }
 
         #endregion
 
@@ -413,9 +421,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpPost]
         [AjaxOnly]
 
-        public ActionResult GetCard(string keyValue,string status)
+        public ActionResult GetCard(string keyValue,string status, string strEntity)
         {
-            stuInfoBasicIBLL.GetCard(keyValue,status);
+            if (status == "1")//领取
+            {
+                StuInfoBasicEntity entity = strEntity.ToObject<StuInfoBasicEntity>();
+                stuInfoBasicIBLL.GetCard(keyValue, status, entity);
+            }
+            else//取消领取
+            {
+                stuInfoBasicIBLL.GetCard(keyValue,status,new StuInfoBasicEntity());
+            }
             return Success("操作成功");
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js

@@ -52,14 +52,30 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
                 var DiplomaReceiveStatus = $('#gridtable').jfGridValue('DiplomaReceiveStatus');
                 if (learun.checkrow(keyValue)) {
-                    if (DiplomaReceiveStatus.indexOf('1') != -1) {
-                        return learun.alert.warning("选中项包括已领取数据！");
+                    //if (DiplomaReceiveStatus.indexOf('1') != -1) {
+                    //    return learun.alert.warning("选中项包括已领取数据！");
+                    //}
+                    //learun.layerConfirm('是否确认领取毕业证！', function (res) {
+                    //    if (res) {
+                    //        learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '1' }, function () {
+                    //            refreshGirdData();
+                    //        });
+                    //    }
+                    //});
+                    if (keyValue.split(',').length > 1) {
+                        return learun.alert.warning("只能选择一条记录进行操作！");
                     }
-                    learun.layerConfirm('是否确认领取毕业证！', function (res) {
-                        if (res) {
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '1' }, function () {
-                                refreshGirdData();
-                            });
+                    if (DiplomaReceiveStatus == "1") {
+                        return learun.alert.warning("当前记录毕业证已领取！");
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '毕业证领取',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GraduateDiplomaReceiveForm?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
                         }
                     });
                 }
@@ -168,7 +184,10 @@ var bootstrap = function ($, learun) {
                             return cellvalue == "1" ? "已领取" : "未领取"
                         }
                     },
-                    { label: "毕业证领取时间", name: "DiplomaReceiveDate", width: 100, align: "left" },
+                    { label: "毕业证领取时间", name: "DiplomaReceiveDate", width: 120, align: "left" },
+                    { label: "领取人签名", name: "DiplomaReceiveSign", width: 100, align: "left" },
+                    { label: "代领人身份证号", name: "DiplomaReceiveIdcard", width: 130, align: "left" },
+                    { label: "代领备注", name: "DiplomaReceiveRemark", width: 100, align: "left" },
                 ],
                 mainId: 'StuId',
                 isPage: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceiveForm.cshtml

@@ -0,0 +1,19 @@
+@{
+    ViewBag.Title = "毕业证领取表单";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">领取人签名<font face="宋体">*</font></div>
+        <input id="DiplomaReceiveSign" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">代领人身份证号</div>
+        <input id="DiplomaReceiveIdcard" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">代领备注</div>
+        <input id="DiplomaReceiveRemark" type="text" class="form-control" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceiveForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceiveForm.js

@@ -0,0 +1,57 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2022-09-26 16:53
+ * 描  述：毕业证领取表单
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+            page.hide();
+        },
+        hide: function () {
+            
+        },
+        bind: function () {
+            
+        }, 
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        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 = {
+            status:"1",
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+
+}

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

@@ -1172,6 +1172,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\GraduateDiplomaReceiveForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\FormTran.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\FormOfDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\Graduate.js" />
@@ -1247,6 +1248,7 @@
     <Content Include="Areas\EducationalAdministration\Views\ScoreCheckInfo\FormGene.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ScoreCheckInfo\FormTeach.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ScoreCheckInfo\FormAudit.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\GraduateDiplomaReceiveForm.cshtml" />
     <None Include="Areas\EducationalAdministration\Views\StuInfoBasic\Printxjk.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\AllocationClassDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticClassIndex.js" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs

@@ -398,11 +398,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void GetCard(string keyValue, string status)
+        public void GetCard(string keyValue, string status, StuInfoBasicEntity entity)
         {
             try
             {
-                stuInfoBasicService.GetCard(keyValue, status);
+                stuInfoBasicService.GetCard(keyValue, status,entity);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -896,6 +896,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns> 
         [Column("TISSUEDATE")]
         public DateTime? TissueDate { get; set; }
+        /// <summary> 
+        /// 毕业证领取-领取人签名 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVESIGN")]
+        public string DiplomaReceiveSign { get; set; }
+        /// <summary> 
+        /// 毕业证领取-代领人身份证号 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVEIDCARD")]
+        public string DiplomaReceiveIdcard { get; set; }
+        /// <summary> 
+        /// 毕业证领取-代领备注 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVEREMARK")]
+        public string DiplomaReceiveRemark { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs

@@ -60,7 +60,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 领取毕业证
         /// </summary>
         /// <param name="keyValue"></param>
-        void GetCard(string keyValue,string status);
+        void GetCard(string keyValue,string status, StuInfoBasicEntity entity);
         /// <summary>
         /// 图书资料归还
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -624,7 +624,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void GetCard(string keyValue, string status)
+        public void GetCard(string keyValue, string status, StuInfoBasicEntity entity)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -635,11 +635,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     var keyValueArr = keyValue.Split(',');
                     foreach (var item in keyValueArr)
                     {
-                        var sql = $"UPDATE StuInfoBasic SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate='{now}' WHERE StuId='{item}'";
+                        var sql = $"UPDATE StuInfoBasic SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate='{now}',DiplomaReceiveSign='{entity.DiplomaReceiveSign}',DiplomaReceiveIdcard='{entity.DiplomaReceiveIdcard}',DiplomaReceiveRemark='{entity.DiplomaReceiveRemark}' WHERE StuId='{item}'";
                         db.ExecuteBySql(sql);
 
                         //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and FileTransferStatus='1' ";
+                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and FileTransferStatus='1' and TissueStatus='1' ";
                         db.ExecuteBySql(sql2);
                     }
                 }
@@ -649,7 +649,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     var keyValueArr = keyValue.Split(',');
                     foreach (var item in keyValueArr)
                     {
-                        var sql = $"UPDATE StuInfoBasic SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate=null WHERE StuId='{item}'";
+                        var sql = $"UPDATE StuInfoBasic SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate=null,DiplomaReceiveSign=null,DiplomaReceiveIdcard=null,DiplomaReceiveRemark=null WHERE StuId='{item}'";
                         db.ExecuteBySql(sql);
 
                         //判断毕业状态是否为已毕业，若是，则毕业状态修改为准许毕业，毕业时间为空；
@@ -693,7 +693,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         db.ExecuteBySql(sql);
 
                         //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' ";
+                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1'  ";
                         db.ExecuteBySql(sql2);
                     }
                 }
@@ -747,7 +747,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         db.ExecuteBySql(sql);
 
                         //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' ";
+                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1'  ";
                         db.ExecuteBySql(sql2);
                     }
                 }
@@ -801,7 +801,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         db.ExecuteBySql(sql);
 
                         //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' ";
+                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1'  ";
                         db.ExecuteBySql(sql2);
                     }
                 }
@@ -855,7 +855,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         db.ExecuteBySql(sql);
 
                         //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' ";
+                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1'  ";
                         db.ExecuteBySql(sql2);
                     }
                 }
@@ -909,7 +909,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         db.ExecuteBySql(sql);
 
                         //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' ";
+                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1'  ";
                         db.ExecuteBySql(sql2);
                     }
                 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs

@@ -873,17 +873,47 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("DIPLOMARECEIVEDATE")]
         public DateTime? DiplomaReceiveDate { get; set; }
         /// <summary> 
-        /// 档案与组织关系转出状态 
+        /// 档案关系转出状态 
         /// </summary> 
         /// <returns></returns> 
         [Column("FILETRANSFERSTATUS")]
         public string FileTransferStatus { get; set; }
         /// <summary> 
-        /// 档案与组织关系转出状态时间 
+        /// 档案关系转出状态时间 
         /// </summary> 
         /// <returns></returns> 
         [Column("FILETRANSFERDATE")]
         public DateTime? FileTransferDate { get; set; }
+        /// <summary> 
+        /// 组织关系转出状态 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("TISSUESTATUS")]
+        public string TissueStatus { get; set; }
+        /// <summary> 
+        /// 组织关系转出状态时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("TISSUEDATE")]
+        public DateTime? TissueDate { get; set; }
+        /// <summary> 
+        /// 毕业证领取-领取人签名 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVESIGN")]
+        public string DiplomaReceiveSign { get; set; }
+        /// <summary> 
+        /// 毕业证领取-代领人身份证号 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVEIDCARD")]
+        public string DiplomaReceiveIdcard { get; set; }
+        /// <summary> 
+        /// 毕业证领取-代领备注 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVEREMARK")]
+        public string DiplomaReceiveRemark { get; set; }
         #endregion
 
         #region  扩展操作