Merge branch 'master' into 大厂分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Controllers/AuthorizeController.cs

@@ -48,14 +48,14 @@ namespace Learun.Application.Web.Areas.LR_AuthorizeModule.Controllers
             var modules = authorizeIBLL.GetItemIdList(objectId, 1);
             var buttons = authorizeIBLL.GetItemIdList(objectId, 2);
             var columns = authorizeIBLL.GetItemIdList(objectId, 3);
-            var forms = authorizeIBLL.GetItemIdList(objectId, 4);
+            //var forms = authorizeIBLL.GetItemIdList(objectId, 4);
 
             var datajson = new
             {
                 modules,
                 buttons,
-                columns,
-                forms
+                columns
+                //forms
             };
             return JsonResult(datajson);
         }
@@ -92,7 +92,8 @@ namespace Learun.Application.Web.Areas.LR_AuthorizeModule.Controllers
             string[] moduleIds = strModuleId.Split(',');
             string[] moduleButtonIds = strModuleButtonId.Split(',');
             string[] moduleColumnIds = strModuleColumnId.Split(',');
-            string[] moduleFormIds = strModuleFormId.Split(',');
+            //string[] moduleFormIds = strModuleFormId.Split(',');
+            string[] moduleFormIds = new string[0];
 
             authorizeIBLL.SaveAuthorize(objectType, objectId, moduleIds, moduleButtonIds, moduleColumnIds, moduleFormIds);
             return Success("保存成功！");

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/Authorize/Form.cshtml

@@ -9,7 +9,7 @@
             <li data-target="#step-1" class="active"><span class="step">1</span>系统功能<span class="chevron"></span></li>
             <li data-target="#step-2"><span class="step">2</span>系统按钮<span class="chevron"></span></li>
             <li data-target="#step-3"><span class="step">3</span>系统视图<span class="chevron"></span></li>
-            <li data-target="#step-4"><span class="step">4</span>系统表单<span class="chevron"></span></li>
+            @*<li data-target="#step-4"><span class="step">4</span>系统表单<span class="chevron"></span></li>*@
         </ul>
     </div>
     <div class="step-content" id="wizard-steps">
@@ -22,9 +22,9 @@
         <div class="step-pane" id="step-3">
 
         </div>
-        <div class="step-pane" id="step-4">
+        @*<div class="step-pane" id="step-4">
 
-        </div>
+        </div>*@
     </div>
 
     <div class="lr-form-bottom-button" id="wizard-actions">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/Authorize/Form.js

@@ -78,14 +78,14 @@ var bootstrap = function ($, learun) {
                     $('#step-3').lrtree({
                         data: treeData.columnList
                     });
-                    $('#step-4').lrtree({
-                        data: treeData.formList
-                    });
+                    //$('#step-4').lrtree({
+                    //    data: treeData.formList
+                    //});
                     if (!!objectId) {
                         setTreeData1();
                         setTreeData2();
                         setTreeData3();
-                        setTreeData4();
+                        //setTreeData4();
                     }
                 }
                 setTimeout(function () {
@@ -101,13 +101,14 @@ var bootstrap = function ($, learun) {
                         checkModuleIds = $('#step-1').lrtreeSet('getCheckNodeIds');
                         $('#step-2 .lr-tree-root [id$="_learun_moduleId"]').parent().hide();
                         $('#step-3 .lr-tree-root [id$="_learun_moduleId"]').parent().hide();
-                        $('#step-4 .lr-tree-root [id$="_learun_moduleId"]').parent().hide();
+                        //$('#step-4 .lr-tree-root [id$="_learun_moduleId"]').parent().hide();
                         $.each(checkModuleIds, function (id, item) {
                             $('#step-2_' + item.replace(/-/g, '_') + '_learun_moduleId').parent().show();
                             $('#step-3_' + item.replace(/-/g, '_') + '_learun_moduleId').parent().show();
-                            $('#step-4_' + item.replace(/-/g, '_') + '_learun_moduleId').parent().show();
+                            //$('#step-4_' + item.replace(/-/g, '_') + '_learun_moduleId').parent().show();
                         });
-                    } else if (data.step == 3) {
+                    //} else if (data.step == 3) {
+                    } else if (data.step == 2) {
 
                         $finish.removeAttr('disabled');
                         $next.attr('disabled', 'disabled');
@@ -140,7 +141,7 @@ var bootstrap = function ($, learun) {
             var buttonList = [], columnList = [], formList = [];
             var checkButtonIds = $('#step-2').lrtreeSet('getCheckNodeIds');
             var checkColumnIds = $('#step-3').lrtreeSet('getCheckNodeIds');
-            var checkFormIds = $('#step-4').lrtreeSet('getCheckNodeIds');
+            //var checkFormIds = $('#step-4').lrtreeSet('getCheckNodeIds');
 
 
             $.each(checkButtonIds, function (id, item) {
@@ -153,11 +154,11 @@ var bootstrap = function ($, learun) {
                     columnList.push(item);
                 }
             });
-            $.each(checkFormIds, function (id, item) {
-                if (item.indexOf('_learun_moduleId') == -1) {
-                    formList.push(item);
-                }
-            });
+            //$.each(checkFormIds, function (id, item) {
+            //    if (item.indexOf('_learun_moduleId') == -1) {
+            //        formList.push(item);
+            //    }
+            //});
 
 
             var postData = {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ModuleController.cs

@@ -108,15 +108,15 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
             var moduleList = moduleIBLL.GetModuleCheckTree();
             var buttonList = moduleIBLL.GetButtonCheckTree();
             var columnList = moduleIBLL.GetColumnCheckTree();
-            var formList = moduleIBLL.GetFormCheckTree();
+            //var formList = moduleIBLL.GetFormCheckTree();
 
 
             var jsonData = new
             {
                 moduleList,
                 buttonList,
-                columnList,
-                formList
+                columnList
+                //formList
             };
 
             return this.JsonResult(jsonData);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.cshtml

@@ -4,38 +4,40 @@
 }
 <style>
 
-        /*    .lr-form-item-title {
-            width: 117px;
-            padding-right: 21px;
+    .lr-form-item-title {
+            width: 120px;
+            padding-right: 10px;
         }
-    */
+    .lr-form-item {
+        padding: 5px 0 5px 120px;
+    }
 </style>
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">上班时间<font face="宋体">*</font></div>
         <input id="WorkTime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="ADR_Restriction">
+    @*<div class="col-xs-6 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">上午签到有效时间<font face="宋体">*</font></div>
         <input id="SignInStartTime" type="text" class="form-control " isvalid="yes" checkexpession="NotNull"  />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">-<font face="宋体">*</font></div>
         <input id="SignInEndTime" type="text" class="form-control " isvalid="yes" checkexpession="NotNull"  />
-    </div>
+    </div>*@
 
     <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">下班时间<font face="宋体">*</font></div>
         <input id="CloseTime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="ADR_Restriction">
+    @*<div class="col-xs-6 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">下午签退有效时间<font face="宋体">*</font></div>
         <input id="SignOutStartTime" type="text" class="form-control " isvalid="yes" checkexpession="NotNull"  />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">-<font face="宋体">*</font></div>
         <input id="SignOutEndTime" type="text" class="form-control "  isvalid="yes" checkexpession="NotNull" />
-    </div>
+    </div>*@
     <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">打卡次数<font face="宋体">*</font></div>
         <div id="ClockTime" class="form-control" isvalid="yes" checkexpession="NotNull"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js

@@ -24,7 +24,7 @@ var bootstrap = function ($, learun) {
                     title: '新增',
                     url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/Form',
                     width: 600,
-                    height: 400,
+                    height: 520,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -39,7 +39,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑',
                         url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/Form?keyValue=' + keyValue,
                         width: 600,
-                        height: 400,
+                        height: 520,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -80,18 +80,18 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/GetPageList',
                 headData: [
                     { label: "上班时间", name: "WorkTime", width: 100, align: "left" },
-                    { label: "签到开始时间", name: "SignInStartTime", width: 100, align: "left" },
-                    { label: "签到结束时间", name: "SignInEndTime", width: 100, align: "left" },
+                    //{ label: "签到开始时间", name: "SignInStartTime", width: 100, align: "left" },
+                    //{ label: "签到结束时间", name: "SignInEndTime", width: 100, align: "left" },
                     { label: "下班时间", name: "CloseTime", width: 100, align: "left" },
-                    { label: "签退开始时间", name: "SignOutStartTime", width: 100, align: "left" },
-                    { label: "签退结束时间", name: "SignOutEndTime", width: 100, align: "left" },
+                    //{ label: "签退开始时间", name: "SignOutStartTime", width: 100, align: "left" },
+                    //{ label: "签退结束时间", name: "SignOutEndTime", width: 100, align: "left" },
                     { label: "打卡次数", name: "ClockTime", width: 100, align: "left" },
                     { label: "中午签退时间", name: "NoonCloseTime", width: 100, align: "left" },
-                    { label: "中午签退开始时间", name: "SignOutStartTime2", width: 100, align: "left" },
-                    { label: "中午签退结束时间", name: "SignOutEndTime2", width: 100, align: "left" },
+                    { label: "中午签退开始时间", name: "SignOutStartTime2", width: 150, align: "left" },
+                    { label: "中午签退结束时间", name: "SignOutEndTime2", width: 150, align: "left" },
                     { label: "中午签到时间", name: "NoonWorkTime", width: 100, align: "left" },
-                    { label: "中午签到开始时间", name: "SignInStartTime2", width: 100, align: "left" },
-                    { label: "中午签到结束时间", name: "SignInEndTime2", width: 100, align: "left" },
+                    { label: "中午签到开始时间", name: "SignInStartTime2", width: 150, align: "left" },
+                    { label: "中午签到结束时间", name: "SignInEndTime2", width: 150, align: "left" },
                     { label: "允许迟到范围(分)", name: "LateOvertime", width: 100, align: "left" },
                     { label: "允许早退范围(分)", name: "LeaveOverTime", width: 100, align: "left" },
                     {

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/tree/lr-tree.js

@@ -226,6 +226,11 @@
                 if (!!dfop.nodeClick) {
                     dfop.nodeClick(node, $this);
                 }
+                if (dfop.isTextCheck) {
+                    setTimeout(function () {
+                        $this.find('.lr-tree-node-cb').trigger('click');
+                    });
+                }
             }
             return false;
         },
@@ -529,7 +534,13 @@
                 setNoCheck(dfop.data);
                 break;
             case 'allCheck':
-                $self.find('.lr-tree-node-cb[src$="checkbox_0.png"]').trigger('click');
+                $self.find('.lr-tree-node-cb[src$="checkbox_0.png"]').each(function () {
+                    var $this = $(this);
+                    if ($this.parent().parent().find('.lr-tree-node-ct').length == 0) {
+                        $this.trigger('click');
+                    }
+                    $this = null;
+                });
                 break;
             case 'setCheck':
                 var list = op;

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

@@ -295,6 +295,7 @@
   <ItemGroup />
   <ItemGroup>
     <None Include="packages.config" />
+    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Extention\Learun.Application.Extention.csproj">

Learun.Framework.Ultimate V7/Learun.Application.Website/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
+自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <PublishProvider>FileSystem</PublishProvider>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>D:\Job-release\DigitalCampusWebSite-release</publishUrl>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+  </PropertyGroup>
+</Project>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/Authorize/AuthorizeService.cs

@@ -161,16 +161,16 @@ namespace Learun.Application.Base.AuthorizeModule
                 #endregion
 
                 #region 表单
-                foreach (string item in moduleForms)
-                {
-                    AuthorizeEntity authorizeEntity = new AuthorizeEntity();
-                    authorizeEntity.Create();
-                    authorizeEntity.F_ObjectType = objectType;
-                    authorizeEntity.F_ObjectId = objectId;
-                    authorizeEntity.F_ItemType = 4;
-                    authorizeEntity.F_ItemId = item;
-                    db.Insert(authorizeEntity);
-                }
+                //foreach (string item in moduleForms)
+                //{
+                //    AuthorizeEntity authorizeEntity = new AuthorizeEntity();
+                //    authorizeEntity.Create();
+                //    authorizeEntity.F_ObjectType = objectType;
+                //    authorizeEntity.F_ObjectId = objectId;
+                //    authorizeEntity.F_ItemType = 4;
+                //    authorizeEntity.F_ItemId = item;
+                //    db.Insert(authorizeEntity);
+                //}
                 #endregion
 
                 db.Commit();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleService.cs

@@ -38,14 +38,7 @@ namespace Learun.Application.Base.SystemModule
                     t.F_AllowDelete,
                     t.F_SortCode,
                     t.F_DeleteMark,
-                    t.F_EnabledMark,
-                    t.F_Description,
-                    t.F_CreateDate,
-                    t.F_CreateUserId,
-                    t.F_CreateUserName,
-                    t.F_ModifyDate,
-                    t.F_ModifyUserId,
-                    t.F_ModifyUserName
+                    t.F_EnabledMark
                     ";
             btnfieldSql = @"
                     t.F_ModuleButtonId,

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

@@ -459,6 +459,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUDYMODALITY")]
         public string StudyModality { get; set; }
         /// <summary>
+        /// 学籍异动状态
+        /// </summary>
+        /// <returns></returns>
+        [Column("CHANGESTATUS")]
+        public int? ChangeStatus { get; set; }
+        /// <summary>
         /// SyncFlag
         /// </summary>
         [Column("SYNCFLAG")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs

@@ -54,12 +54,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 {
                     dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
                     dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
-                    strSql.Append(" AND ( t.ADTime >= @startTime AND t.ADTime <= @endTime ) ");
+                    strSql.Append(" AND ( t.ClockTime >= @startTime AND t.ClockTime <= @endTime ) ");
                 }
                 if (!queryParam["UserName"].IsEmpty())
                 {
                     dp.Add("UserName", "%" + queryParam["UserName"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND emp.EmpName Like @UserName ");
+                    strSql.Append(" AND emp.F_RealName Like @UserName ");
                 }
                 if (!queryParam["Department"].IsEmpty())
                 {
@@ -74,7 +74,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 if (!queryParam["ADStatus"].IsEmpty())
                 {
                     dp.Add("ADStatus", queryParam["ADStatus"].ToString(), DbType.String);
-                    strSql.Append(" AND t.ADStatus = @ADStatus ");
+                    strSql.Append(" AND t.ClockStatus = @ADStatus ");
                 }
                 return this.BaseRepository("CollegeMIS").FindList<ADR_RecordEntity>(strSql.ToString(),dp, pagination);
             }