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

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js

@@ -1,7 +1,7 @@
-// var config = {
-//     webapi: 'http://localhost:8088/',
-//     web: "http://localhost:8087/"//web地址，用于配置logo
-// };
+var config = {
+    webapi: 'http://localhost:8088/',
+    web: "http://localhost:8087/"//web地址，用于配置logo
+};
 //var config = {
 //    webapi: 'http://112.230.201.53:31173/',
 //    web:"http://112.230.201.53/:8081/"//web地址，用于配置logo
@@ -16,10 +16,10 @@
 //    webapi: 'http://localhost:8081/',
 //    web: "http://localhost:8080/"//web地址，用于配置logo
 //}; 
-var config = {
-   webapi: 'http://123.57.209.16:31173/',
-   web: "http://123.57.209.16:31175/"//web地址，用于配置logo
-}; 
+// var config = {
+//    webapi: 'http://123.57.209.16:31173/',
+//    web: "http://123.57.209.16:31175/"//web地址，用于配置logo
+// }; 
 
 //金隅
 //var config = {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/OpenLessonPlanOfElectiveStudentPre.js

@@ -118,6 +118,7 @@
                     _postData.keyValue = item.Id;
                     _postData.StuNo = JSON.parse(localStorage.userinfo).baseinfo.account;
                     learun.layer.loading(true, '正在取消报名...');
+                    console.log(123);
                     learun.httppost(config.webapi + 'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/CancelPre', _postData, (data, info) => {
 						console.log(data)
 						console.log(info)

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentCheck/studentCheck.js

@@ -85,7 +85,8 @@
     };
     function studentCheckData(Monday, Sunday) {
         var studCheckList = $('.studCheckList');
-        learun.httpget(config.webapi + "learun/adms/timetable/StuLessonInfo", {}, (data) => {
+        var param = { StartDate: Monday, EndDate: Sunday };
+        learun.httpget(config.webapi + "learun/adms/timetable/StuLessonInfo", param, (data) => {
             console.log(data);
             $.each(data, function (i, n) {
                 var html = '';

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

@@ -147,10 +147,10 @@
             <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
             <div id="F_DepartmentId" checkexpession="NotNull"></div>
         </div>
-        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+        @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">系部</div>
             <div id="DeptNo"></div>
-        </div>
+        </div>*@
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">岗位类别</div>
             <div id="EmpSortNo"></div>

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

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 $("#ForeignLanguageNo").parent().hide();
                 $("#EmpSortNo").parent().hide();
                 $("#EmpFullTimeNo").parent().hide();
-                $("#DeptNo").parent().hide();
+                //$("#DeptNo").parent().hide();
                 $("#TitleOfTechPostNo").parent().hide();
                 $("#InSchoolDate").parent().hide();
                 $("#resume").parent().hide();
@@ -127,7 +127,7 @@ var bootstrap = function ($, learun) {
             $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' });
             $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
             $('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#PostRank').lrDataSourceSelect({ code: 'BCdTitleOfTechPost', value: 'titleoftechpostno', text: 'titleoftechpost' });
             $('#Photo').lrUploader();
             $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });

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

@@ -11,10 +11,10 @@
         <div class="lr-form-item-title">部门</div>
         <div id="F_DepartmentId"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="EmpInfo">
+    @*<div class="col-xs-12 lr-form-item" data-table="EmpInfo">
         <div class="lr-form-item-title">系部</div>
         <div id="DeptNo"></div>
-    </div>
+    </div>*@
 </div>
 
 

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

@@ -35,7 +35,7 @@ var bootstrap = function ($, learun) {
                 }
             });
             $('#F_DepartmentId').lrselect();
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -22,10 +22,10 @@
                                     <div class="lr-form-item-title">联系电话</div>
                                     <input id="mobile" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
+                                @*<div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">系部</div>
                                     <div id="DeptNo"></div>
-                                </div>
+                                </div>*@
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">部门</div>
                                     <div id="F_DepartmentId"></div>

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

@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 280, 400);
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#ProvinceNo').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
                 select: function (item) {
@@ -364,19 +364,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: "系部", name: "DeptNo", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
+                    //{
+                    //    label: "系部", name: "DeptNo", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                    //            key: value,
+                    //            keyId: 'deptno',
+                    //            callback: function (_data) {
+                    //                callback(_data['deptname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
                         formatter: function (cellvalue) {

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

@@ -36,7 +36,7 @@
                     <td>政治面貌</td>
                     <td>@Model.PartyFaceNo</td>
                     <td>入党时间</td>
-                    <td>@(Model.JoinPartyTime.HasValue ? Model.JoinPartyTime.Value.ToShortDateString().Replace("/", "-") : "")</td>
+                    <td>@(Model.JoinPartyTime != "" && Model.JoinPartyTime != null ? Model.JoinPartyTime.Replace("/", "-") : "")</td>
                     <td>最高学历（学位）</td>
                     <td>@Model.HighestRecord</td>
                 </tr>

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

@@ -7,21 +7,25 @@
         <div class="lr-form-item-title">教师姓名<font face="宋体">*</font></div>
         <div id="TCName" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherCertificate" >
-        <div class="lr-form-item-title">资格种类</div>
-        <div id="TCTypeID"  ></div>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherCertificate" >
-        <div class="lr-form-item-title">任教学科<font face="宋体">*</font></div>
-        <input id="TCClass" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
+        <div class="lr-form-item-title">证书名称<font face="宋体">*</font></div>
+        <input id="TCType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
         <div class="lr-form-item-title">证书编号<font face="宋体">*</font></div>
         <input id="TCCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
+        <div class="lr-form-item-title">资格种类</div>
+        <div id="TCTypeID"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
+        <div class="lr-form-item-title">任教学科</div>
+        <input id="TCClass" type="text" class="form-control"/>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
         <div class="lr-form-item-title">取得时间<font face="宋体">*</font></div>
-        <input id="TCTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TCTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+        <input id="TCTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TCTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js")

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

@@ -16,11 +16,12 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#TCTypeID').lrDataItemSelect({ code: 'jszgzl' });
-            $('#TCName').lrformselect({
-                layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm',
-                layerUrlW: 400,
-                layerUrlH: 300,
-                dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds'
+            $('#TCName').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+                param: { strWhere: "1=1 " },
+                value: "empid",
+                text: "empname"
             });
         },
         initData: function () {

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

@@ -7,8 +7,26 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
+                    @*<div class="lr-layout-tool-item">
                         <div id="datesearch"></div>
+                    </div>*@
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">教师姓名</div>
+                                    <div id="TCName"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">证书名称</div>
+                                    <input id="TCType" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">资格种类</div>
+                                    <div id="TCTypeID"></div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="lr-layout-tool-right">

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

@@ -15,6 +15,9 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
             // 时间搜索框
             $('#datesearch').lrdate({
                 dfdata: [
@@ -42,6 +45,14 @@ var bootstrap = function ($, learun) {
                     page.search();
                 }
             });
+            $('#TCName').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+                param: { strWhere: "1=1 " },
+                value: "empid",
+                text: "empname"
+            });
+            $('#TCTypeID').lrDataItemSelect({ code: 'jszgzl' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -101,14 +112,18 @@ var bootstrap = function ($, learun) {
                     {
                         label: "教师姓名", name: "TCName", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('user', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
                                 key: value,
+                                keyId: 'empid',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['empname']);
                                 }
                             });
                         }
                     },
+                    { label: "证书名称", name: "TCType", width: 150, align: "left" },
+                    { label: "证书编号", name: "TCCode", width: 150, align: "left" },
                     {
                         label: "资格种类", name: "TCTypeID", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -122,17 +137,18 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "任教学科", name: "TCClass", width: 100, align: "left" },
-                    { label: "证书编号", name: "TCCode", width: 100, align: "left" },
                     { label: "取得时间", name: "TCTime", width: 100, align: "left" },
                 ],
                 mainId: 'TCID',
-                isPage: true
+                isPage: true,
+                sidx:'TCTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};
-            param.StartTime = startTime;
-            param.EndTime = endTime;
+            //param.StartTime = startTime;
+            //param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs

@@ -261,25 +261,25 @@ namespace Learun.Application.WebApi.Modules
         private Response GetPayFeeDetail(dynamic _)
         {
             var academicAndYear = Common.GetSemesterAndYear();
-            var FinaChargesStandardList = new List<FinaChargesStandardEntity>();
-            var StuInfoFreshData = stuInfoFreshIBLL.GetStuInfoFreshEntityByStuNo(userInfo.account);
-            if (StuInfoFreshData != null)
+            var finaChargesStandardList = new List<FinaChargesStandardEntity>();
+            var stuInfoFreshData = stuInfoFreshIBLL.GetStuInfoFreshEntityByStuNo(userInfo.account);
+            if (stuInfoFreshData != null)
             {
-                if (!string.IsNullOrEmpty(StuInfoFreshData.ClassNo) && !string.IsNullOrEmpty(StuInfoFreshData.MajorNo))
+                if (!string.IsNullOrEmpty(stuInfoFreshData.ClassNo) && !string.IsNullOrEmpty(stuInfoFreshData.MajorNo))
                 {
-                    var ClassInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(StuInfoFreshData.ClassNo);
-                    if (ClassInfoEntity != null)
+                    var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(stuInfoFreshData.ClassNo);
+                    if (classInfoEntity != null)
                     {
-                        FinaChargesStandardList = finaChargesStandardIBLL.GetFinaChargesStandardListByMajorNoOfNotAll(StuInfoFreshData.MajorNo, academicAndYear.AcademicYearShort, academicAndYear.Semester, ClassInfoEntity.Grade).ToList();
+                        finaChargesStandardList = finaChargesStandardIBLL.GetFinaChargesStandardListByMajorNoOfNotAll(stuInfoFreshData.MajorNo, academicAndYear.AcademicYearShort, academicAndYear.Semester, classInfoEntity.Grade).ToList();
                     }
                 }
             }
-            var PayFeeTotal = FinaChargesStandardList.Select(x => x.Standard).Sum();
+            var payFeeTotal = finaChargesStandardList.Select(x => x.Standard).Sum();
 
             var result = new
             {
-                FinaChargesStandardList = FinaChargesStandardList,
-                PayFeeTotal = PayFeeTotal,
+                FinaChargesStandardList = finaChargesStandardList,
+                PayFeeTotal = payFeeTotal,
                 AcademicYearNo = academicAndYear.AcademicYearShort,
                 Semester = academicAndYear.Semester,
             };

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs

@@ -83,7 +83,8 @@ namespace Learun.Application.WebApi.Modules
 
         public Response GetStuLessonInfo(dynamic _)
         {
-            var lessonInfos = stuAttendanceIBLL.GetStuLessonInfo(userInfo.account);
+            var param = this.GetReqData<TimeParameter>();
+            var lessonInfos = stuAttendanceIBLL.GetStuLessonInfo(userInfo.account,param.StartDate,param.EndDate);
             var empNos = lessonInfos.Select(a => a.EmpNo).ToList();
             var lessonTerms = arrangeLessonTermIBLL.GetListByEmpNo(empNos);
 
@@ -91,7 +92,7 @@ namespace Learun.Application.WebApi.Modules
             {
                 a.LessonName,
                 LessonDate = Convert.ToDateTime(a.LessonDate).ToString("yyyy-MM-dd"),
-                Teacher = lessonTerms.FirstOrDefault(b => b.EmpNo == a.EmpNo).EmpName,
+                Teacher = lessonTerms.FirstOrDefault(b => b.EmpNo == a.EmpNo)?.EmpName,
                 a.LessonTime,
                 a.EmpNo,
                 a.ClassRoomName,

Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Learun.Application.WebApi.csproj.50308.19.2020-01-17.09-46-40.9504

@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{FA8E854B-F41C-4554-A97E-8D6E076E3117}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Learun.Application.WebApi</RootNamespace>
-    <AssemblyName>Learun.Application.WebApi</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <UseIISExpress>true</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress />
-    <SccProjectName>Learun.Application.WebApi</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>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
-      <HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Practices.ServiceLocation">
-      <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity">
-      <HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Configuration">
-      <HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention">
-      <HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="MySql.Data.Entity.EF6, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\MySql.Data.Entity.6.9.9\lib\net45\MySql.Data.Entity.EF6.dll</HintPath>
-    </Reference>
-    <Reference Include="Nancy">
-      <HintPath>..\packages\Nancy.1.4.1\lib\net40\Nancy.dll</HintPath>
-    </Reference>
-    <Reference Include="Nancy.Hosting.Aspnet">
-      <HintPath>..\packages\Nancy.Hosting.Aspnet.1.4.1\lib\net40\Nancy.Hosting.Aspnet.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Oracle.ManagedDataAccess.12.1.24160719\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
-    </Reference>
-    <Reference Include="Oracle.ManagedDataAccess.EntityFramework, Version=6.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Oracle.ManagedDataAccess.EntityFramework.12.1.2400\lib\net45\Oracle.ManagedDataAccess.EntityFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Common, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Reference\ServiceStack.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Reference\ServiceStack.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Redis, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Reference\ServiceStack.Redis.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Text, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Reference\ServiceStack.Text.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.4\lib\net45\System.Web.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.4\lib\net45\System.Web.Http.WebHost.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.GetCustFareInfoByOutIDResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.GetEcardConsumeRecordResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.GetEcardCustInfoByOutIDResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.GetEcardDeptInfoResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.GetEcardSaveRecordResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.GetEcardTermInfoResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.GetTokenResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.LogonResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.ResultDTO.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.ResultDTOOfEcardConsumeRecordDTO.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.ResultDTOOfEcardCustAllInfoDTO.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.ResultDTOOfEcardCustomerFareInfo.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.ResultDTOOfEcardDeptDTO.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.ResultDTOOfEcardSaveRecordDTO.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <Content Include="Connected Services\ServiceReference_CardRecord\Learun.Application.WebApi.ServiceReference_CardRecord.ResultDTOOfEcardTermDTO.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Content>
-    <None Include="Connected Services\ServiceReference_CardRecord\SynService.disco" />
-    <None Include="Connected Services\ServiceReference_CardRecord\configuration91.svcinfo" />
-    <None Include="Connected Services\ServiceReference_CardRecord\configuration.svcinfo" />
-    <None Include="Connected Services\ServiceReference_CardRecord\Reference.svcmap">
-      <Generator>WCF Proxy Generator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <Content Include="Content\images\head\on-boy.jpg" />
-    <Content Include="Content\images\head\on-girl.jpg" />
-    <Content Include="favicon.ico" />
-    <Content Include="index.html" />
-    <Content Include="packages.config" />
-    <None Include="Connected Services\ServiceReference_CardRecord\SynService.wsdl" />
-    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
-    <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />
-    <None Include="Web.Debug.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </None>
-    <None Include="Web.Release.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </None>
-    <Content Include="port.png" />
-    <Content Include="XmlConfig\database.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="XmlConfig\ioc.config" />
-    <Content Include="XmlConfig\log4net.config" />
-    <Content Include="XmlConfig\redis.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="XmlConfig\system.config">
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Bootstraper.cs" />
-    <Compile Include="Connected Services\ServiceReference_CardRecord\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Compile>
-    <Compile Include="Modules\BaseNoLoginApi.cs" />
-    <Compile Include="Modules\ArrangeLessonTermAttemperApi.cs" />
-    <Compile Include="Modules\StatisticsApi.cs" />
-    <Compile Include="Modules\TeacherWorkloadApi.cs" />
-    <Compile Include="Modules\DutyScheduleApi.cs" />
-    <Compile Include="Modules\PersonnelManagement\ScheduleApi.cs" />
-    <Compile Include="Modules\StuMailApi.cs" />
-    <Compile Include="Modules\EmpInfoApi.cs" />
-    <Compile Include="Modules\InventoryItemApi.cs" />
-    <Compile Include="Modules\InventoryApi.cs" />
-    <Compile Include="Modules\BookBorrowApi.cs" />
-    <Compile Include="Modules\NewsApi.cs" />
-    <Compile Include="Modules\NewWorkFlowApi.cs" />
-    <Compile Include="Modules\OpenLessonPlanOfElectiveStudentApi.cs" />
-    <Compile Include="Modules\StuInfoFreshApi.cs" />
-    <Compile Include="Modules\Sys_ReceiveFileApi.cs" />
-    <Compile Include="Modules\JournalReceiveApi.cs" />
-    <Compile Include="Modules\SalarySheet.cs" />
-    <Compile Include="Modules\StuAttendanceLeaveApi.cs" />
-    <Compile Include="Modules\SYS_ReceiveMessageApi.cs" />
-    <Compile Include="Modules\JournalApi.cs" />
-    <Compile Include="Modules\StuEncourgementApi.cs" />
-    <Compile Include="Modules\StuPunishmentApi.cs" />
-    <Compile Include="Modules\ScoreSearch.cs" />
-    <Compile Include="Modules\ArrangeExam.cs" />
-    <Compile Include="Modules\TeachAttendance.cs" />
-    <Compile Include="Modules\Arrangelesson.cs" />
-    <Compile Include="Modules\BaseNoAuthentication.cs" />
-    <Compile Include="Modules\DesktopApi.cs" />
-    <Compile Include="Modules\AnnexesApi.cs" />
-    <Compile Include="Modules\BaseApi.cs" />
-    <Compile Include="Modules\ClientDataApi.cs" />
-    <Compile Include="Modules\CodeRuleApi.cs" />
-    <Compile Include="Modules\CompanyApi.cs" />
-    <Compile Include="Modules\CustmerFormApi.cs" />
-    <Compile Include="Modules\DataItemApi.cs" />
-    <Compile Include="Modules\DataSourceApi.cs" />
-    <Compile Include="Modules\DepartmentApi.cs" />
-    <Compile Include="Modules\Feixing\FeixingNoAuthentication.cs" />
-    <Compile Include="Modules\Feixing\FileTypeConvert.cs" />
-    <Compile Include="Modules\Feixing\UserApiController.cs" />
-    <Compile Include="Modules\FormApi.cs" />
-    <Compile Include="Modules\FunctionApi.cs" />
-    <Compile Include="Modules\IMApi.cs" />
-    <Compile Include="Modules\Index.cs" />
-    <Compile Include="Modules\LR_Crm\CrmCustomer.cs" />
-    <Compile Include="Modules\LR_Crm\CrmOrder.cs" />
-    <Compile Include="Modules\LR_Crm\Invoice.cs" />
-    <Compile Include="Modules\TimeTable.cs" />
-    <Compile Include="Modules\UtilityApi.cs" />
-    <Compile Include="Modules\WeixinApi.cs" />
-    <Compile Include="Modules\WorkFlowApi.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Modules\UserApi.cs" />
-    <Compile Include="Until\ReqEntity.cs" />
-    <Compile Include="Until\ReqPageParam.cs" />
-    <Compile Include="Modules\PersonnelManagement\ActivityScheduleApi.cs" />
-    <Compile Include="Modules\PersonnelManagement\ClassWorkApi.cs" />
-    <Compile Include="Modules\PersonnelManagement\EmpRepairApi.cs" />
-    <Compile Include="Modules\PersonnelManagement\CommunityInfoApi.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Learun.Application.Organization\Learun.Application.Organization.csproj">
-      <Project>{e9877a25-801b-4605-ad35-e6306916513c}</Project>
-      <Name>Learun.Application.Organization</Name>
-    </ProjectReference>
-    <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.CRM\Learun.Application.CRM.csproj">
-      <Project>{81e208bc-39b6-4ca3-81f1-c847d47330d1}</Project>
-      <Name>Learun.Application.CRM</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Form\Learun.Application.Form.csproj">
-      <Project>{9164926b-150a-47d6-b384-a41aa4a7bc5d}</Project>
-      <Name>Learun.Application.Form</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.IM\Learun.Application.IM.csproj">
-      <Project>{db34dfc9-7227-41fa-88aa-832dbf247811}</Project>
-      <Name>Learun.Application.IM</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.OA\Learun.Application.OA.csproj">
-      <Project>{5f3fdf79-a47e-4782-a090-dd0dc2d5cdc1}</Project>
-      <Name>Learun.Application.OA</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.Application.Module\Learun.Application.WorkFlow\Learun.Application.WorkFlow.csproj">
-      <Project>{88d8e99d-df26-4506-83c5-51e354818bef}</Project>
-      <Name>Learun.Application.WorkFlow</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Db\Learun.DataBase.EF.Oracle\Learun.DataBase.Oracle.csproj">
-      <Project>{82069f3a-ab45-4f8b-b2bf-a36b14208f41}</Project>
-      <Name>Learun.DataBase.Oracle</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.MySql\Learun.DataBase.MySqlEx.csproj">
-      <Project>{fe4cb79e-7f98-4683-bc4a-5173a5bc5636}</Project>
-      <Name>Learun.DataBase.MySqlEx</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Log\Learun.Loger.csproj">
-      <Project>{d27e14dc-b68c-408d-a2e3-fdb38665ecbb}</Project>
-      <Name>Learun.Loger</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Util\Learun.Util.Operat\Learun.Util.Operat.csproj">
-      <Project>{ad556b7a-e0d1-41bd-9d5b-18f8502e9f33}</Project>
-      <Name>Learun.Util.Operat</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>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Workflow\Learun.Workflow.Engine\Learun.Workflow.Engine.csproj">
-      <Project>{1D192591-B85A-41DB-AE3A-4BF9765786C1}</Project>
-      <Name>Learun.Workflow.Engine</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-    <Folder Include="Models\" />
-  </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" />
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Connected Services\" />
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadataStorage Include="Connected Services\ServiceReference_CardRecord\" />
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>True</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>31173</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:31173/</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.14182.1.2019-11-06.15-13-35.0033

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  有关如何配置 ASP.NET 应用程序的详细信息，请访问
-  http://go.microsoft.com/fwlink/?LinkId=169433
-  -->
-<configuration>
-  <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="redisconfig" type="Learun.Cache.Redis.RedisConfigInfo,Learun.Cache.Redis" />
-    <section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Microsoft.Practices.Unity.Configuration" />
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-  </configSections>
-  <redisconfig configSource="XmlConfig\redis.config" />
-  <unity configSource="XmlConfig\ioc.config" />
-  <connectionStrings configSource="XmlConfig\database.config" />
-  <appSettings configSource="XmlConfig\system.config" />
-  <log4net configSource="XmlConfig\log4net.config" />
-  <!--
-    有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
-
-    可在 <httpRuntime> 标记上设置以下特性。
-      <system.Web>
-        <httpRuntime targetFramework="4.5" />
-      </system.Web>
-  -->
-  <system.web>
-    <compilation debug="true" targetFramework="4.5" />
-    <httpRuntime />
-    <pages controlRenderingCompatibilityVersion="4.0" />
-    <httpHandlers>
-      <add verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*" />
-    </httpHandlers>
-  </system.web>
-  <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
-      <parameters>
-        <parameter value="mssqllocaldb" />
-      </parameters>
-    </defaultConnectionFactory>
-    <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
-      <provider invariantName="Oracle.ManagedDataAccess.Client" type="Oracle.ManagedDataAccess.EntityFramework.EFOracleProviderServices, Oracle.ManagedDataAccess.EntityFramework, Version=6.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-      <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
-    </providers>
-  </entityFramework>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <httpErrors existingResponse="PassThrough" />
-    <handlers>
-      <add name="Nancy" verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*" />
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
-      <remove name="OPTIONSVerbHandler" />
-      <remove name="TRACEVerbHandler" />
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-    </handlers>
-  </system.webServer>
-  <system.data>
-    <DbProviderFactories>
-      <remove invariant="Oracle.ManagedDataAccess.Client" />
-      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-      <remove invariant="MySql.Data.MySqlClient" />
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
-    </DbProviderFactories>
-  </system.data>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <publisherPolicy apply="no" />
-        <assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-  <oracle.manageddataaccess.client>
-    <version number="*">
-      <dataSources>
-        <dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) " />
-      </dataSources>
-    </version>
-  </oracle.manageddataaccess.client>
-</configuration>

Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-06.09-55-40.0785

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  有关如何配置 ASP.NET 应用程序的详细信息，请访问
-  http://go.microsoft.com/fwlink/?LinkId=169433
-  -->
-<configuration>
-  <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="redisconfig" type="Learun.Cache.Redis.RedisConfigInfo,Learun.Cache.Redis" />
-    <section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Microsoft.Practices.Unity.Configuration" />
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-  </configSections>
-  <redisconfig configSource="XmlConfig\redis.config" />
-  <unity configSource="XmlConfig\ioc.config" />
-  <connectionStrings configSource="XmlConfig\database.config" />
-  <appSettings configSource="XmlConfig\system.config" />
-  <log4net configSource="XmlConfig\log4net.config" />
-  <!--
-    有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
-
-    可在 <httpRuntime> 标记上设置以下特性。
-      <system.Web>
-        <httpRuntime targetFramework="4.5" />
-      </system.Web>
-  -->
-  <system.web>
-    <compilation debug="true" targetFramework="4.6.1" />
-    <httpRuntime />
-    <pages controlRenderingCompatibilityVersion="4.0" />
-    <httpHandlers>
-      <add verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*" />
-    </httpHandlers>
-  </system.web>
-  <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
-      <parameters>
-        <parameter value="mssqllocaldb" />
-      </parameters>
-    </defaultConnectionFactory>
-    <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
-      <provider invariantName="Oracle.ManagedDataAccess.Client" type="Oracle.ManagedDataAccess.EntityFramework.EFOracleProviderServices, Oracle.ManagedDataAccess.EntityFramework, Version=6.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-      <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
-    </providers>
-  </entityFramework>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <httpErrors existingResponse="PassThrough" />
-    <handlers>
-      <add name="Nancy" verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*" />
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
-      <remove name="OPTIONSVerbHandler" />
-      <remove name="TRACEVerbHandler" />
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-    </handlers>
-  </system.webServer>
-  <system.data>
-    <DbProviderFactories>
-      <remove invariant="Oracle.ManagedDataAccess.Client" />
-      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-      <remove invariant="MySql.Data.MySqlClient" />
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
-    </DbProviderFactories>
-  </system.data>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <publisherPolicy apply="no" />
-        <assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-  <oracle.manageddataaccess.client>
-    <version number="*">
-      <dataSources>
-        <dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) " />
-      </dataSources>
-    </version>
-  </oracle.manageddataaccess.client>
-</configuration>

Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-17.09-46-40.9504

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  有关如何配置 ASP.NET 应用程序的详细信息，请访问
-  http://go.microsoft.com/fwlink/?LinkId=169433
-  -->
-<configuration>
-  <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="redisconfig" type="Learun.Cache.Redis.RedisConfigInfo,Learun.Cache.Redis" />
-    <section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Microsoft.Practices.Unity.Configuration" />
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-  </configSections>
-  <redisconfig configSource="XmlConfig\redis.config" />
-  <unity configSource="XmlConfig\ioc.config" />
-  <connectionStrings configSource="XmlConfig\database.config" />
-  <appSettings configSource="XmlConfig\system.config" />
-  <log4net configSource="XmlConfig\log4net.config" />
-  <!--
-    有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
-
-    可在 <httpRuntime> 标记上设置以下特性。
-      <system.Web>
-        <httpRuntime targetFramework="4.5" />
-      </system.Web>
-  -->
-  <system.web>
-    <compilation debug="true" targetFramework="4.6.1" />
-    <httpRuntime />
-    <pages controlRenderingCompatibilityVersion="4.0" />
-    <httpHandlers>
-      <add verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*" />
-    </httpHandlers>
-  </system.web>
-  <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
-      <parameters>
-        <parameter value="mssqllocaldb" />
-      </parameters>
-    </defaultConnectionFactory>
-    <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
-      <provider invariantName="Oracle.ManagedDataAccess.Client" type="Oracle.ManagedDataAccess.EntityFramework.EFOracleProviderServices, Oracle.ManagedDataAccess.EntityFramework, Version=6.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-      <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
-    </providers>
-  </entityFramework>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <httpErrors existingResponse="PassThrough" />
-    <handlers>
-      <add name="Nancy" verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*" />
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
-      <remove name="OPTIONSVerbHandler" />
-      <remove name="TRACEVerbHandler" />
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-    </handlers>
-  </system.webServer>
-  <system.data>
-    <DbProviderFactories>
-      <remove invariant="Oracle.ManagedDataAccess.Client" />
-      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-      <remove invariant="MySql.Data.MySqlClient" />
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
-    </DbProviderFactories>
-  </system.data>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <publisherPolicy apply="no" />
-        <assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-  <oracle.manageddataaccess.client>
-    <version number="*">
-      <dataSources>
-        <dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) " />
-      </dataSources>
-    </version>
-  </oracle.manageddataaccess.client>
-  <system.serviceModel>
-    <bindings>
-      <basicHttpBinding>
-        <binding name="SynServiceSoap" />
-      </basicHttpBinding>
-    </bindings>
-    <client>
-      <endpoint address="http://218.28.133.181:13282/SYN/SynService.asmx"
-        binding="basicHttpBinding" bindingConfiguration="SynServiceSoap"
-        contract="ServiceReference_CardRecord.SynServiceSoap" name="SynServiceSoap" />
-    </client>
-  </system.serviceModel>
-</configuration>

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

@@ -57,11 +57,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("mobile", "%" + queryParam["mobile"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.mobile Like @mobile ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.DeptNo = @DeptNo ");
-                }
+                //if (!queryParam["DeptNo"].IsEmpty())
+                //{
+                //    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+                //    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                //}
                 if (!queryParam["ProvinceNo"].IsEmpty())
                 {
                     dp.Add("ProvinceNo", queryParam["ProvinceNo"].ToString(), DbType.String);
@@ -190,25 +190,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@" 
-                t.EmpId, 
-                t.EmpNo, 
-                t.EmpName, 
-                t.F_CompanyId, 
-                t.F_DepartmentId, 
-                t.DeptNo, 
-                t.GenderNo, 
-                t.Photo, 
-                t.Birthday, 
-                t.NationalityNo, 
-                t.PartyFaceNo, 
-                t.IdentityCardNo, 
-                t.CultureDegreeNo, 
-                t.DegreeNo, 
-                t.mobile, 
-                t.EMail 
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM EmpInfo t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -740,10 +722,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             {
                                 model.F_DepartmentId = entity.F_DepartmentId;
                             }
-                            if (!string.IsNullOrEmpty(entity.DeptNo))
-                            {
-                                model.DeptNo = entity.DeptNo;
-                            }
+                            //if (!string.IsNullOrEmpty(entity.DeptNo))
+                            //{
+                            //    model.DeptNo = entity.DeptNo;
+                            //}
                             db.Update(model);
                         }
                     }
@@ -762,10 +744,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 {
                                     model.F_DepartmentId = entity.F_DepartmentId;
                                 }
-                                if (!string.IsNullOrEmpty(entity.DeptNo))
-                                {
-                                    model.DeptNo = entity.DeptNo;
-                                }
+                                //if (!string.IsNullOrEmpty(entity.DeptNo))
+                                //{
+                                //    model.DeptNo = entity.DeptNo;
+                                //}
                                 db.Update(model);
                             }
                         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs

@@ -105,7 +105,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                   left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo
 	                               where not exists ( ");
                 //不显示与已选课程 相同课程名称相同教师的课程
-                strSql.Append(" select * from StuSelectLessonListOfElective s where s.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and s.Semester='" + EADateArrangeEntityAboutElective.Semester + "' and s.StuNo=@StuNo and s.Status <>3 and s.LessonName=b.LessonName and s.EmpNo=b.EmpNo and s.OLPEId!=b.Id ");
+                strSql.Append(" select * from StuSelectLessonListOfElective s where s.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and s.Semester='" + EADateArrangeEntityAboutElective?.Semester + "' and s.StuNo=@StuNo and s.Status <>3 and s.LessonName=b.LessonName and s.EmpNo=b.EmpNo and s.OLPEId!=b.Id ");
                 strSql.Append(" ) ");
                 strSql.Append(" and a.MajorId is not null and a.Grade is not null ");
                 strSql.Append(" AND b.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and b.Semester='" + EADateArrangeEntityAboutElective?.Semester + "' ");

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceBLL.cs

@@ -130,11 +130,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
 
 
-        public List<StuAttendanceEntity> GetStuLessonInfo(string account)
+        public List<StuAttendanceEntity> GetStuLessonInfo(string account,string startTime,string endTime)
         {
             try
             {
-                return stuAttendanceService.GetStuLessonInfo(account);
+                return stuAttendanceService.GetStuLessonInfo(account,startTime,endTime);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceIBLL.cs

@@ -70,7 +70,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// <returns></returns>
         void SaveEntity(string keyValue, StuAttendanceEntity entity);
-        List<StuAttendanceEntity> GetStuLessonInfo(string account);
+        List<StuAttendanceEntity> GetStuLessonInfo(string account,string startTime,string endTime);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceService.cs

@@ -237,11 +237,24 @@ and t.Status=2");
             }
         }
 
-        internal List<StuAttendanceEntity> GetStuLessonInfo(string account)
+        internal List<StuAttendanceEntity> GetStuLessonInfo(string account,string starTime,string endTime)
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<StuAttendanceEntity>(a => a.StuNo == account).ToList();
+                var expression = LinqExtensions.True<StuAttendanceEntity>();
+                expression = expression.And(a => a.StuNo == account);
+                if (!string.IsNullOrEmpty(starTime))
+                {
+                    var aTime = starTime.ToDate();
+                    expression = expression.And(a => a.LessonDate >= aTime);
+                }
+
+                if (!string.IsNullOrEmpty(endTime))
+                {
+                    var bTime = endTime.ToDate();
+                    expression = expression.And(a => a.LessonDate <= bTime);
+                }
+                return this.BaseRepository("CollegeMIS").FindList<StuAttendanceEntity>(expression).ToList();
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs

@@ -20,32 +20,32 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         [Column("TCID")]
         public string TCID { get; set; }
         /// <summary>
-        /// TCName
+        /// 教师empid
         /// </summary>
         [Column("TCNAME")]
         public string TCName { get; set; }
         /// <summary>
-        /// TCType
+        /// 证书名称
         /// </summary>
         [Column("TCTYPE")]
         public string TCType { get; set; }
         /// <summary>
-        /// TCTypeID
+        /// 资格种类
         /// </summary>
         [Column("TCTYPEID")]
-        public int? TCTypeID { get; set; }
+        public string TCTypeID { get; set; }
         /// <summary>
-        /// TCClass
+        /// 任教学科
         /// </summary>
         [Column("TCCLASS")]
         public string TCClass { get; set; }
         /// <summary>
-        /// TCCode
+        /// 证书编号
         /// </summary>
         [Column("TCCODE")]
         public string TCCode { get; set; }
         /// <summary>
-        /// TCTime
+        /// 取得时间
         /// </summary>
         [Column("TCTIME")]
         public DateTime? TCTime { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateService.cs

@@ -29,15 +29,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.TCID,
-                t.TCName,
-                t.TCTypeID,
-                t.TCClass,
-                t.TCCode,
-                t.TCTime
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM TeacherCertificate t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -49,6 +41,21 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
                     strSql.Append(" AND ( t.TCTime >= @startTime AND t.TCTime <= @endTime ) ");
                 }
+                if (!queryParam["TCName"].IsEmpty())
+                {
+                    dp.Add("TCName", queryParam["TCName"].ToString(), DbType.String);
+                    strSql.Append(" AND t.TCName=@TCName ");
+                }
+                if (!queryParam["TCType"].IsEmpty())
+                {
+                    dp.Add("TCType", '%' + queryParam["TCType"].ToString() + '%', DbType.String);
+                    strSql.Append(" AND t.TCType like @TCType ");
+                }
+                if (!queryParam["TCTypeID"].IsEmpty())
+                {
+                    dp.Add("TCTypeID", queryParam["TCTypeID"].ToString(), DbType.String);
+                    strSql.Append(" AND t.TCTypeID=@TCTypeID ");
+                }
                 return this.BaseRepository().FindList<TeacherCertificateEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)