Merge branch '西昌分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserEntity.cs

@@ -233,6 +233,8 @@ namespace Learun.Application.Organization
         [Column("PERSIGNATURE")]
         public string PerSignature { get; set; }
 
+        [Column("F_ORDER")]
+        public int? F_Order { get; set; }
         #endregion
 
         #region  扩展操作

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

@@ -58,15 +58,19 @@
             <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
             <input id="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="IDCard" />
         </div>
-        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+        <div class="col-xs-3 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">出生日期</div>
             <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Birthday').trigger('change'); } })" />
         </div>
-        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+        <div class="col-xs-3 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">民族</div>
             <div id="NationalityNo"></div>
         </div>
-        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+        <div class="col-xs-3 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">排序<font face="宋体">*</font></div>
+            <input id="F_Order" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        </div>
+        <div class="col-xs-3 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">政治面貌</div>
             <div id="PartyFaceNo"></div>
         </div>

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

@@ -172,6 +172,7 @@ var bootstrap = function ($, learun) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
                             $('#' + id).jfGridSet('refreshdata', data[id]);
+                            console.log(2);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);

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

@@ -460,7 +460,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
-
+                    { label: "排序", name: "F_Order", width: 100, align: "left" },
                     {
                         label: "最高学历", name: "HighestRecord", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -615,6 +615,7 @@ var bootstrap = function ($, learun) {
 
                 ],
                 mainId: 'EmpId',
+                sidx: 'F_Order asc',
                 isPage: true,
                 isMultiselect: true
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/Index.js

@@ -357,6 +357,7 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
+                    { label: "排序", name: "F_Order", index: "F_Order", width: 50, align: "center"},
                     {
                         label: "最后登录时间", name: "F_UserId_Log", width: 200, align: "left", formatterAsync: function (callback, value, row) {
                             learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetLastLoginTime?userId=' + value, function (res) {
@@ -372,6 +373,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 reloadSelected: true,
                 mainId: 'F_UserId',
+                sidx: 'F_Order asc',
                 isMultiselect: true
             });
         },

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs

@@ -527,7 +527,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("WORKERTECHNOLOGYSTATUS")]
         public bool? WorkerTechnologyStatus { get; set; }
-        
+
         /// <summary>
         /// 任同职级职务时间
         /// </summary>
@@ -585,6 +585,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("ISINACTIVETIME")]
         public DateTime? IsInActiveTime { get; set; }
 
+        /// <summary>
+        /// 排序
+        /// </summary>
+        [Column("F_ORDER")]
+        public int? F_Order { get; set; }
+
+
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs

@@ -434,6 +434,7 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi
                     userbase.F_CompanyId = tEntity.F_CompanyId;
                     userbase.F_DepartmentId = tEntity.F_DepartmentId;
                     userbase.F_IdentityCardNo = tEntity.IdentityCardNo;
+                    userbase.F_Order = tEntity.F_Order;
                     userIBLL.SaveEntity(null, userbase);
                     studentList.Add(userbase);
                 }
@@ -545,7 +546,7 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi
                 var keyValueArr = keyValue.Split(',');
                 foreach (var item in keyValueArr)
                 {
-                    db.ExecuteBySql("update EmpInfo set CheckMark=1 where EmpId='" + item + "'");
+                    db.ExecuteBySql("update EmpInfo set CheckMark=1  where EmpId='" + item + "'");
                 }
                 db.Commit();
             }