Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js

@@ -134,7 +134,8 @@ var bootstrap = function ($, learun) {
                                     callback(_data.text);
                                 }
                             });
-                        } },
+                        }
+                    },
                     { label: "考勤时间", name: "ADTime", width: 150, align: "left" },
                     { label: "打卡时间", name: "ClockTime", width: 150, align: "left" },
                     {
@@ -146,19 +147,21 @@ var bootstrap = function ($, learun) {
                                     //callback(_data.text);
                                     if (_data.text) {
                                         if (_data.text == "正常") {
-                                            callback('<span class=\"label label-success\">'+_data.text+'</span>');
+                                            callback('<span class=\"label label-success\">' + _data.text + '</span>');
                                         } else {
-                                            callback('<span class=\"label label-warning\">'+_data.text+'</span>');
+                                            callback('<span class=\"label label-warning\">' + _data.text + '</span>');
                                         }
                                     }
-                                    
+
                                 }
                             });
-                        } },
+                        }
+                    },
                     { label: "打卡地点", name: "ClockPlace", width: 100, align: "left" },
                 ],
                 mainId: 'ID',
-                isPage: true
+                isPage: true,
+                sidx: "UserNo,ADYear,ADMonth,ADDay,ADTime",
             });
         },
         search: function (param) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ADR_RestrictionController.cs

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         #endregion
 
@@ -71,8 +71,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var ADR_RestrictionData = aDR_RestrictionIBLL.GetADR_RestrictionEntity( keyValue );
-            var jsonData = new {
+            var ADR_RestrictionData = aDR_RestrictionIBLL.GetADR_RestrictionEntity(keyValue);
+            var jsonData = new
+            {
                 ADR_Restriction = ADR_RestrictionData,
             };
             return Success(jsonData);
@@ -94,6 +95,18 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             return Success("删除成功！");
         }
         /// <summary>
+        /// 启用限制
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult Enable(string keyValue)
+        {
+            aDR_RestrictionIBLL.Enable(keyValue);
+            return Success("启用成功！");
+        }
+        /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>
         /// <param name="keyValue">主键</param>
@@ -105,7 +118,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             ADR_RestrictionEntity entity = strEntity.ToObject<ADR_RestrictionEntity>();
-            aDR_RestrictionIBLL.SaveEntity(keyValue,entity);
+            aDR_RestrictionIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {
             }

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

@@ -2,46 +2,53 @@
     ViewBag.Title = "考勤限制";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
+<style>
+
+    .lr-form-item-title {
+        width: 117px;
+        padding-right: 21px;
+    }
+</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">开始时间</div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
+        <div class="lr-form-item-title">上班时间</div>
         <input id="WorkTime" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">结束时间</div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
+        <div class="lr-form-item-title">下班时间</div>
         <input id="CloseTime" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">签到有效时间</div>
-        <input id="SignInStartTime" type="text" class="form-control "/>
-    </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">-</div>
-        <input id="SignInEndTime" type="text" class="form-control "/>
-    </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">签退有效时间</div>
-        <input id="SignOutStartTime" type="text" class="form-control "/>
-    </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">-</div>
-        <input id="SignOutEndTime" type="text" class="form-control "/>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">迟到超过时间</div>
-        <input id="LateOvertime" type="text" class="form-control"  />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">早退超过时间</div>
-        <input id="LeaveOverTime" type="text" class="form-control"  />
-    </div>
-    <div class="col-xs-12 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">签到有效时间</div>
+            <input id="SignInStartTime" type="text" class="form-control "/>
+        </div>
+        <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
+            <div class="lr-form-item-title">-</div>
+            <input id="SignInEndTime" type="text" class="form-control "/>
+        </div>
+        <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
+            <div class="lr-form-item-title">签退有效时间</div>
+            <input id="SignOutStartTime" type="text" class="form-control "/>
+        </div>
+        <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
+            <div class="lr-form-item-title">-</div>
+            <input id="SignOutEndTime" type="text" class="form-control "/>
+        </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
+        <div class="lr-form-item-title">允许迟到范围(分)</div>
+        <input id="LateOvertime" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
+        <div class="lr-form-item-title">允许早退范围(分)</div>
+        <input id="LeaveOverTime" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">未签到，记为</div>
-        <div id="NoSignIn"  ></div>
+        <div id="NoSignIn"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ADR_Restriction" >
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">未签退，记为</div>
-        <div id="NoSignOut"  ></div>
+        <div id="NoSignOut"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/ADR_Restriction/Form.js")

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

@@ -15,8 +15,8 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#NoSignIn').lrDataItemSelect({ code: 'ADR_Status' });
-            $('#NoSignOut').lrDataItemSelect({ code: 'ADR_Status' });
+            $('#NoSignIn').lrDataItemSelect({ code: 'ADStatus' });
+            $('#NoSignOut').lrDataItemSelect({ code: 'ADStatus' });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -16,6 +16,7 @@
                         <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
                         <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_enable" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;启用</a>
                     </div>
                 </div>
             </div>

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

@@ -52,56 +52,79 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/DeleteForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
                     });
                 }
             });
+            // 启用
+            $('#lr_enable').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认启用！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/Enable', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+
         },
         // 初始化列表
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/GetPageList',
                 headData: [
-                    { label: "开始时间", name: "WorkTime", width: 100, align: "left"},
-                    { label: "结束时间", name: "CloseTime", width: 100, align: "left"},
-                    { label: "签到有效时间", name: "SignInStartTime", width: 100, align: "left"},
-                    { label: "-", name: "SignInEndTime", width: 100, align: "left"},
-                    { label: "签退有效时间", name: "SignOutStartTime", width: 100, align: "left"},
-                    { label: "-", name: "SignOutEndTime", width: 100, align: "left"},
-                    { label: "迟到超过时间", name: "LateOvertime", width: 100, align: "left"},
-                    { label: "早退超过时间", name: "LeaveOverTime", width: 100, align: "left"},
-                    { label: "未签到，记为", name: "NoSignIn", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'ADR_Status',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
-                        }},
-                    { label: "未签退，记为", name: "NoSignOut", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'ADR_Status',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
-                        }},
+                    { label: "上班时间", name: "WorkTime", width: 100, align: "left" },
+                    { label: "下班时间", name: "CloseTime", width: 100, align: "left" },
+                    //{ label: "签到有效时间", name: "SignInStartTime", width: 100, align: "left"},
+                    //{ label: "-", name: "SignInEndTime", width: 100, align: "left"},
+                    //{ label: "签退有效时间", name: "SignOutStartTime", width: 100, align: "left"},
+                    //{ label: "-", name: "SignOutEndTime", width: 100, align: "left"},
+                    { label: "允许迟到范围(分)", name: "LateOvertime", width: 100, align: "left" },
+                    { label: "允许早退范围(分)", name: "LeaveOverTime", width: 100, align: "left" },
+                    {
+                        label: "未签到，记为", name: "NoSignIn", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ADStatus',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "未签退，记为", name: "NoSignOut", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ADStatus',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "是否启用", name: "REnable", width: 100, align: "left", formatter: function (val) {
+                            return val ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }
+                    },
                 ],
-                mainId:'ID',
+                mainId: 'ID',
                 isPage: true
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

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

@@ -26,10 +26,14 @@
     <UseGlobalApplicationHostFile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <SccProjectName>Learun.Application.Website</SccProjectName>
-    <SccLocalPath>1~a7250b02-76e9-4d74-aa27-f5cdf7719296</SccLocalPath>
-    <SccAuxPath>http://123.57.209.16:8090/VaultService</SccAuxPath>
-    <SccProvider>SourceGear Vault Visual Studio 2005 Client:{1EA47954-8515-402d-82D9-B5C332120A8D}</SccProvider>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

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

@@ -68,6 +68,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 }
 
 
+
                 return this.BaseRepository("CollegeMIS").FindList<ADR_RecordEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionBLL.cs

@@ -93,6 +93,28 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
             }
         }
+        /// <summary>
+        /// 启用限制
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void Enable(string keyValue)
+        {
+            try
+            {
+                aDR_RestrictionService.Enable(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
 
         /// <summary>
         /// 保存实体数据（新增、修改）

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionIBLL.cs

@@ -37,6 +37,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="keyValue">主键</param>
         void DeleteEntity(string keyValue);
         /// <summary>
+        /// 启用限制
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void Enable(string keyValue);
+        /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs

@@ -42,6 +42,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 t.LateOvertime,
                 t.LeaveOverTime,
                 t.NoSignIn,
+                t.REnable,
                 t.NoSignOut
                 ");
                 strSql.Append("  FROM ADR_Restriction t ");
@@ -49,7 +50,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-                return this.BaseRepository("CollegeMIS").FindList<ADR_RestrictionEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<ADR_RestrictionEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -100,7 +101,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<ADR_RestrictionEntity>(t=>t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<ADR_RestrictionEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {
@@ -114,6 +115,35 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
             }
         }
+        /// <summary>
+        /// 启用限制
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void Enable(string keyValue)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                var sql = "UPDATE dbo.ADR_Restriction SET REnable='false'";
+                db.ExecuteBySql(sql);
+                var entity = db.FindEntity<ADR_RestrictionEntity>(a => a.ID == keyValue);
+                entity.REnable = true;
+                db.Update(entity);
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
 
         /// <summary>
         /// 保存实体数据（新增、修改）
@@ -154,7 +184,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindEntity<ADR_RestrictionEntity>(m=>m.REnable==true);
+                return this.BaseRepository("CollegeMIS").FindEntity<ADR_RestrictionEntity>(m => m.REnable == true);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json

@@ -137,11 +137,11 @@
 
   // 全局样式
   "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "enablePullDownRefresh": false,
-    "navigationBarBackgroundColor": "#FFF",
-    "backgroundColor": "#f3f3f3",
-    "navigationBarTitleText": "力软敏捷开发框架",
+    "navigationBarTextStyle": "black",//导航栏标题颜色及状态栏前景颜色
+    "enablePullDownRefresh": false,//是否开启下拉刷新
+    "navigationBarBackgroundColor": "#FFF",//导航栏背景颜色
+    "backgroundColor": "#f3f3f3",//窗口背景色
+    "navigationBarTitleText": "数字化校园",//导航栏标题文字内容
     "mp-alipay": { "allowsBounceVertical": "NO" }
   },
 

Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/App.config

@@ -5,7 +5,7 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
   <connectionStrings>
-    <add name="ConnectionPfcMisDBString" connectionString="server=server=123.57.209.16;database=CollegeMIS_西昌;Max Pool Size=1000;Min Pool Size=5;UID=sa;Pwd=bjqjkj@2014~2015!;" providerName="System.Data.SqlClient" />
+    <add name="ConnectionPfcMisDBString" connectionString="server=123.57.209.16;database=CollegeMIS_西昌;Max Pool Size=1000;Min Pool Size=5;UID=sa;Pwd=bjqjkj@2014~2015!;" providerName="System.Data.SqlClient" />
     <add name="ConnectionPfcMisDBString2" connectionString="server=192.168.100.225;database=CollegeMIS_金隅;Max Pool Size=1000;Min Pool Size=5;UID=sa;Pwd=Jykj@2019;" providerName="System.Data.SqlClient" />
     <add name="CoreDBString" connectionString="server=123.57.209.16;database=adms7ultimate2_西昌;Max Pool Size=1000;Min Pool Size=5;UID=sa;Pwd=bjqjkj@2014~2015!;" providerName="System.Data.SqlClient" />
     <add name="CoreDBString2" connectionString="server=192.168.100.225;database=adms7ultimate2_金隅;Max Pool Size=1000;Min Pool Size=5;UID=sa;Pwd=Jykj@2019;" providerName="System.Data.SqlClient" />

Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/Quanjiang.DigitalScholl.JobService.csproj

@@ -124,44 +124,6 @@
   <ItemGroup>
     <Content Include="installanduninstall.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.AppMagager\Learun.Application.AppMagager.csproj">
-      <Project>{8f770f8b-06b3-43da-886f-15d41cec62ee}</Project>
-      <Name>Learun.Application.AppMagager</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Base\Learun.Application.Base.csproj">
-      <Project>{0cdd0dc8-74cf-4c71-923c-66204a8923d3}</Project>
-      <Name>Learun.Application.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping\Learun.Application.Mapping.csproj">
-      <Project>{79f8e2f1-08e7-4336-93e0-512b39f9dd54}</Project>
-      <Name>Learun.Application.Mapping</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment\Learun.Application.TwoDevelopment.csproj">
-      <Project>{56f9a112-fd96-4809-98f4-0d7c5de0711b}</Project>
-      <Name>Learun.Application.TwoDevelopment</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Db\Learun.DataBase.EF.Sqlserver\Learun.DataBase.SqlServer.csproj">
-      <Project>{890532f8-5205-4ee9-965c-84500cad24de}</Project>
-      <Name>Learun.DataBase.SqlServer</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Db\Learun.DataBase.Repository\Learun.DataBase.Repository.csproj">
-      <Project>{7f5e2a6c-c859-494a-8577-75bf9603a80c}</Project>
-      <Name>Learun.DataBase.Repository</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Db\Learun.DataBase\Learun.DataBase.csproj">
-      <Project>{c329f9e1-4327-4769-9d08-07e6fec41005}</Project>
-      <Name>Learun.DataBase</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Ioc\Learun.Ioc.csproj">
-      <Project>{81c03609-ae0d-414c-829b-16b990487add}</Project>
-      <Name>Learun.Ioc</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Util\Learun.Util\Learun.Util.csproj">
-      <Project>{cf8ae293-88ab-436c-9720-a8386ba5d7b7}</Project>
-      <Name>Learun.Util</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Analyzer Include="..\packages\Microsoft.DependencyValidation.Analyzers.0.10.0\analyzers\dotnet\cs\Microsoft.DependencyValidation.Analyzers.resources.dll" />
     <Analyzer Include="..\packages\Microsoft.DependencyValidation.Analyzers.0.10.0\analyzers\dotnet\Microsoft.DependencyValidation.Analyzers.dll" />

Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/Service1.cs

@@ -20,6 +20,8 @@ namespace Quanjiang.DigitalScholl.JobService
                 ServerName = "QuanjiangDigitalSchollJobService"
             };
             _server = new BackgroundJobServer(options);
+            //自动运行连接考勤机
+            RecurringJob.Trigger("HKAttendance");
         }
 
         protected override void OnStop()

Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln

@@ -1595,6 +1595,10 @@ Global
 		{36083FBB-CE7F-4EE0-8459-C4B60A2DD070} = {16DDB25D-3101-47A2-BDC8-161954FD77FA}
 		{DBB22F9E-ED75-40EB-A091-717D42C65A9B} = {29DFF52B-8455-4EA1-8798-3AEE210D9372}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35
+		SolutionGuid = {968C278F-4142-4DFF-96B0-B3D70A649451}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {968C278F-4142-4DFF-96B0-B3D70A649451}
 		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35