生成学籍之后学籍管理看不到

迎新填报标记

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

@@ -285,6 +285,29 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("取消成功！");
         }
 
+        /// <summary>
+        /// 标注数据
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        public ActionResult JoinForm(string keyValue)
+        {
+            stuVolunteerIBLL.JoinEntity(keyValue);
+            return Success("标注成功！");
+        }
+
+        /// <summary>
+        /// 取消数据
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        public ActionResult CanJoinForm(string keyValue)
+        {
+            stuVolunteerIBLL.CanJoin(keyValue);
+            return Success("取消成功！");
+        }
+
+
         /// <summary>
         /// 填报志愿
         /// </summary>

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

@@ -21,7 +21,7 @@
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuVolunteer">
         <div class="lr-form-item-title">学生姓名<font face="宋体">*</font></div>
-        <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="Chinese" />
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuVolunteer">
         <div class="lr-form-item-title">性别<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexLabel.cshtml

@@ -37,6 +37,8 @@
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_label" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;标注</a>
                         <a id="lr_cancel" class="btn btn-default"><i class="fa fa-square-o"></i>&nbsp;取消标注</a>
+                        <a id="lr_join" class="btn btn-default"><i class="fa fa-square-o"></i>&nbsp;填报本校</a>
+                        <a id="lr_canjoin" class="btn btn-default"><i class="fa fa-square-o"></i>&nbsp;取消填报</a>
                         <a id="lr_school" class="btn btn-default"><i class="fa fa-square-o"></i>&nbsp;填报志愿</a>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexLabel.js

@@ -47,6 +47,32 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 填报我校
+            $('#lr_join').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认标注选中该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/JoinForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 取消填报本校
+            $('#lr_canjoin').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否取消标注选中该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/CanJoinForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
             // 填报志愿
             $('#lr_school').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
@@ -79,6 +105,13 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/GetPageList',
                 headData: [
+                    {
+                        label: "录取意向(本校)", name: "IsCYSchool", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<span class=\"label label-success\">是</span>" :
+                                "<span class=\"label label-danger\">否</span>";
+                        }
+                    },
                     {
                         label: "是否有意(本校)", name: "IsIntention", width: 100, align: "IsIntention",
                         formatter: function (cellvalue) {
@@ -110,13 +143,6 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: "录取意向", name: "IsCYSchool", width: 200, align: "left",
-                        formatter: function (cellvalue) {
-                            return cellvalue == true ? "<span class=\"label label-success\">是</span>" :
-                                "<span class=\"label label-danger\">否</span>";
-                        }
-                    },
                     { label: "身份证号", name: "CardNo", width: 150, align: "left" },
                     { label: "中考总分", name: "StuScore", width: 100, align: "left" },
                     { label: "第一志愿", name: "FirstVolunteer", width: 120, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js

@@ -136,7 +136,8 @@
             return learun.validator.validRegOrNull(obj, /^[-\+]?\d+(\.\d+)?$/, '必须为小数或空');
         },
         isIDCard: function (obj) {//判断是否为身份证 idcard
-            return learun.validator.validReg(obj, /^\d{15}(\d{2}[A-Za-z0-9;])?$/, '必须为身份证格式');
+            //return learun.validator.validReg(obj, /^\d{15}(\d{2}[A-Za-z0-9;])?$/, '必须为身份证格式');
+            return learun.validator.validReg(obj, /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/, '必须为身份证格式');
         },
         isIDCardOrNull: function (obj) {//判断是否为身份证 idcard或者null,空
             return learun.validator.validRegOrNull(obj, /^\d{15}(\d{2}[A-Za-z0-9;])?$/, '必须为身份证格式或空');

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerBLL.cs

@@ -402,6 +402,52 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
+        /// <summary>
+        /// 标注数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void JoinEntity(string keyValue)
+        {
+            try
+            {
+                stuVolunteerService.JoinEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 取消标注数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void CanJoin(string keyValue)
+        {
+            try
+            {
+                stuVolunteerService.CanJoin(keyValue);
+            }
+            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/StuVolunteer/StuVolunteerIBLL.cs

@@ -115,6 +115,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
         StuVolunteerEntity GetEntityByCardNo(string keyValue);
+
+        /// <summary>
+        /// 标注数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void JoinEntity(string keyValue);
+
+        /// <summary>
+        /// 取消标注数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void CanJoin(string keyValue);
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs

@@ -326,7 +326,7 @@ Stuid,StuNo,StuCode,ClassNo,StuName,GenderNo,DeptNo,MajorNo,IdentityCardNo,ExamS
 select newid(),StuNo,'G'+CardNo,ClassNo,StuName,Sex,DeptNo,MajorNo,CardNo,StuScore
 from StuVolunteer t where t.ClassStatus=1
 and  t.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=t.StuNo) ";
-                db.ExecuteBySql(updSql);
+                db.ExecuteBySql(addSql);
 
                 db.Commit();
             }
@@ -603,6 +603,71 @@ and  t.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=t.StuNo) "
                 }
             }
         }
+
+
+        /// <summary>
+        /// 标注数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void JoinEntity(string keyValue)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                var keyValueArr = keyValue.Split(',');
+                foreach (var item in keyValueArr)
+                {
+                    var entity = db.FindEntity<StuVolunteerEntity>(x => x.ID == item);
+                    entity.IsOurSchool = true;
+                    db.Update(entity);
+                }
+
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 取消标注数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void CanJoin(string keyValue)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                var keyValueArr = keyValue.Split(',');
+                foreach (var item in keyValueArr)
+                {
+                    var entity = db.FindEntity<StuVolunteerEntity>(x => x.ID == item);
+                    entity.IsOurSchool = false;
+                    db.Update(entity);
+                }
+
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
     }
 }