From 2b218193a518f72955738a24aa5bde84d2cab90d Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Mon, 10 May 2021 12:46:28 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=95=99=E7=A7=91=E7=A0=94=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Learun.Application.Web.csproj             | 234 ++----------------
 .../Learun.Application.Mapping.csproj         |   9 +-
 .../Learun.Application.TwoDevelopment.csproj  |  33 +--
 3 files changed, 30 insertions(+), 246 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index fe48fc587..8bb851850 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -284,7 +284,6 @@
     <Compile Include="Areas\AppManager\AppManagerAreaRegistration.cs" />
     <Compile Include="Areas\AppManager\Controllers\DTImgController.cs" />
     <Compile Include="Areas\AppManager\Controllers\FunctionManagerController.cs" />
-    <Compile Include="Areas\Ask\Controllers\Ask_MainOfTeacherController.cs" />
     <Compile Include="Areas\AssetManagementSystem\AssetManagementSystemAreaRegistration.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\AllocationController.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\AssReportController.cs" />
@@ -390,7 +389,6 @@
     <Compile Include="Areas\LR_Desktop\Controllers\DTListController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\DTSettingController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\DTTargetController.cs" />
-    <Compile Include="Areas\LR_Desktop\Controllers\MessageRindController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\WeChatDevelopController.cs" />
     <Compile Include="Areas\LR_Desktop\LR_DesktopAreaRegistration.cs" />
     <Compile Include="Areas\LR_DisplayBoard\Controllers\LR_KBConfigInfoController.cs" />
@@ -472,7 +470,6 @@
     <Compile Include="Areas\LR_WorkFlowModule\Controllers\WfSystemDemoController.cs" />
     <Compile Include="Areas\LR_WorkFlowModule\LR_WorkFlowModuleAreaRegistration.cs" />
     <Compile Include="Areas\Permission\PermissionAreaRegistration.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\MeetingNoticeController.cs" />
     <Compile Include="Areas\PersonnelManagement\PersonnelManagementAreaRegistration.cs" />
     <Compile Include="Areas\ReceiveSendFeeManagement\ReceiveSendFeeManagementAreaRegistration.cs" />
     <Compile Include="Areas\StudentWork\Controllers\SW_Ask_MainController.cs" />
@@ -673,6 +670,9 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\StuLeaveManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\EATalentTrainController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_DefaultPwdConfigController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ResearchMentController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ResearchGERController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\FundExaminerController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -689,14 +689,6 @@
     <Content Include="Areas\AppManager\Views\FunctionManager\Form.css" />
     <Content Include="Areas\AppManager\Views\FunctionManager\Form.js" />
     <Content Include="Areas\AppManager\Views\FunctionManager\Index.js" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\AnswerIndex.js" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\AnswerQuery.js" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\Form.js" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\Index.js" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\Paper.js" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\PaperAdminView.js" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\PaperView.js" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\TeacherIndex.js" />
     <Content Include="Areas\Ask\Views\Ask_Question\AnalysisIndex.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Allocation\Form.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Allocation\Index.js" />
@@ -1123,8 +1115,6 @@
     <Content Include="Areas\LR_Desktop\Views\DTSetting\App\AppIndex.js" />
     <Content Include="Areas\LR_Desktop\Views\DTSetting\PC\PcIndex.css" />
     <Content Include="Areas\LR_Desktop\Views\DTSetting\PC\PcIndex.js" />
-    <Content Include="Areas\LR_Desktop\Views\MessageRind\Form.js" />
-    <Content Include="Areas\LR_Desktop\Views\MessageRind\Index.js" />
     <Content Include="Areas\LR_Desktop\Views\WeChatDevelop\Form.js" />
     <Content Include="Areas\LR_Desktop\Views\WeChatDevelop\Index.js" />
     <Content Include="Areas\LR_DisplayBoard\Views\LR_KBConfigInfo\ChartForm.css" />
@@ -1154,8 +1144,6 @@
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\AddTaskForm.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\htPrint.css" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ContractFiling.js" />
-    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticCountIndex.js" />
-    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticTimeIndex.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexZiChan.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexGongWen.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexXingZhen.js" />
@@ -1163,7 +1151,6 @@
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\PersonalFiling.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\SelectUserForm.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\SignForm.js" />
-    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticTimeForm.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\EqualForm.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\Form.css" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\Form.js" />
@@ -1174,7 +1161,6 @@
     <Content Include="Areas\LR_OAModule\Views\Notice\IndexFlow.js" />
     <Content Include="Areas\LR_OAModule\Views\ResourceFile\BcIndex.js" />
     <Content Include="Areas\LR_OAModule\Views\Signet\Index.js" />
-    <Content Include="Areas\LR_OrganizationModule\Views\User\FamilyIndex.js" />
     <Content Include="Areas\LR_PortalSite\Views\Article\Form.css" />
     <Content Include="Areas\LR_PortalSite\Views\Article\Form.js" />
     <Content Include="Areas\LR_PortalSite\Views\Article\Index.js" />
@@ -1208,7 +1194,6 @@
     <Content Include="Areas\LR_PortalSite\Views\Page\SetContentForm.css" />
     <Content Include="Areas\LR_PortalSite\Views\Page\SetContentForm.js" />
     <Content Include="Areas\LR_PortalSite\Views\Page\SetNameForm.js" />
-    <Content Include="Areas\LR_ReportModule\Views\ReportTemplate\NWFSchemeReport.js" />
     <Content Include="Areas\LR_SystemModule\Views\Files\FileAuthAddFrom.js" />
     <Content Include="Areas\LR_SystemModule\Views\Files\FileAuthFrom.js" />
     <Content Include="Areas\LR_SystemModule\Views\Files\FileAuthIndex.js" />
@@ -1239,10 +1224,7 @@
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormTerminate.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRenew.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\FormView.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyApply.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.css" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.js" />
     <Content Include="Areas\PersonnelManagement\Views\StuSaverecord\IndexForStudent.js" />
@@ -1272,14 +1254,6 @@
     <Content Include="Areas\StudentWork\Views\SW_Ask_Question\SelectIndex.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Type\FormView.js" />
     <Content Include="Areas\StudentWork\Views\SW_HolidayGo\StatisticIndex.js" />
-    <Content Include="Content\css\DragSSO\blue.css" />
-    <Content Include="Content\css\DragSSO\common.css" />
-    <Content Include="Content\css\DragSSO\green.css" />
-    <Content Include="Content\css\DragSSO\index.css" />
-    <Content Include="Content\css\DragSSO\index2.css" />
-    <Content Include="Content\css\DragSSO\index3.css" />
-    <Content Include="Content\css\DragSSO\login5.css" />
-    <Content Include="Content\css\DragSSO\red.css" />
     <Content Include="Content\css\LoginModel\login8.css" />
     <Content Include="Content\css\OnlineRegistrate\Footer.html" />
     <Content Include="Content\css\OnlineRegistrate\Header.html" />
@@ -1602,154 +1576,6 @@
     <Content Include="Content\idcardreader\npCertReader.dll" />
     <Content Include="Content\images\calendar.png" />
     <Content Include="Content\images\chick1.png" />
-    <Content Include="Content\images\DragSSO\close.png" />
-    <Content Include="Content\images\DragSSO\close2.png" />
-    <Content Include="Content\images\DragSSO\download.png" />
-    <Content Include="Content\images\DragSSO\duigou.png" />
-    <Content Include="Content\images\DragSSO\head1.png" />
-    <Content Include="Content\images\DragSSO\head2.png" />
-    <Content Include="Content\images\DragSSO\head3.png" />
-    <Content Include="Content\images\DragSSO\head4-1.png" />
-    <Content Include="Content\images\DragSSO\head4-2.png" />
-    <Content Include="Content\images\DragSSO\head4-3.png" />
-    <Content Include="Content\images\DragSSO\head4.png" />
-    <Content Include="Content\images\DragSSO\headBg-green.jpg" />
-    <Content Include="Content\images\DragSSO\headBg-red.jpg" />
-    <Content Include="Content\images\DragSSO\headBg.jpg" />
-    <Content Include="Content\images\DragSSO\headBg2.jpg" />
-    <Content Include="Content\images\DragSSO\indexSec2-1.png" />
-    <Content Include="Content\images\DragSSO\indexSec2-2.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-1.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-10.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-11.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-12.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-13.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-14.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-15.jpg" />
-    <Content Include="Content\images\DragSSO\indexSec3-16.jpg" />
-    <Content Include="Content\images\DragSSO\indexSec3-17.jpg" />
-    <Content Include="Content\images\DragSSO\indexSec3-18.jpg" />
-    <Content Include="Content\images\DragSSO\indexSec3-19.jpg" />
-    <Content Include="Content\images\DragSSO\indexSec3-2.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-20.jpg" />
-    <Content Include="Content\images\DragSSO\indexSec3-21.jpg" />
-    <Content Include="Content\images\DragSSO\indexSec3-22.jpg" />
-    <Content Include="Content\images\DragSSO\indexSec3-23.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-24.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-25.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-26.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-27.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-28.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-3.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-4.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-5.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-6.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-7.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-8.png" />
-    <Content Include="Content\images\DragSSO\indexSec3-9.png" />
-    <Content Include="Content\images\DragSSO\indSec1-1.png" />
-    <Content Include="Content\images\DragSSO\indSec1-10.png" />
-    <Content Include="Content\images\DragSSO\indSec1-11.png" />
-    <Content Include="Content\images\DragSSO\indSec1-12.png" />
-    <Content Include="Content\images\DragSSO\indSec1-13.png" />
-    <Content Include="Content\images\DragSSO\indSec1-14.png" />
-    <Content Include="Content\images\DragSSO\indSec1-15.png" />
-    <Content Include="Content\images\DragSSO\indSec1-16.png" />
-    <Content Include="Content\images\DragSSO\indSec1-17.png" />
-    <Content Include="Content\images\DragSSO\indSec1-18.png" />
-    <Content Include="Content\images\DragSSO\indSec1-19.png" />
-    <Content Include="Content\images\DragSSO\indSec1-2.png" />
-    <Content Include="Content\images\DragSSO\indSec1-20.png" />
-    <Content Include="Content\images\DragSSO\indSec1-3.png" />
-    <Content Include="Content\images\DragSSO\indSec1-4.png" />
-    <Content Include="Content\images\DragSSO\indSec1-5.png" />
-    <Content Include="Content\images\DragSSO\indSec1-6.png" />
-    <Content Include="Content\images\DragSSO\indSec1-7.png" />
-    <Content Include="Content\images\DragSSO\indSec1-8.png" />
-    <Content Include="Content\images\DragSSO\indSec1-9.png" />
-    <Content Include="Content\images\DragSSO\indSec3-1.png" />
-    <Content Include="Content\images\DragSSO\indSec3-2.png" />
-    <Content Include="Content\images\DragSSO\indSec3-3.png" />
-    <Content Include="Content\images\DragSSO\indSec3-4.png" />
-    <Content Include="Content\images\DragSSO\indSec3-5.png" />
-    <Content Include="Content\images\DragSSO\indSec3-6.png" />
-    <Content Include="Content\images\DragSSO\inSec1-10.png" />
-    <Content Include="Content\images\DragSSO\inSec1-11.png" />
-    <Content Include="Content\images\DragSSO\inSec1-12.png" />
-    <Content Include="Content\images\DragSSO\inSec1-13.png" />
-    <Content Include="Content\images\DragSSO\inSec1-14.png" />
-    <Content Include="Content\images\DragSSO\inSec1-15.png" />
-    <Content Include="Content\images\DragSSO\inSec1-16.png" />
-    <Content Include="Content\images\DragSSO\inSec1-17.png" />
-    <Content Include="Content\images\DragSSO\inSec1-18.png" />
-    <Content Include="Content\images\DragSSO\inSec1-19.png" />
-    <Content Include="Content\images\DragSSO\inSec1-2.png" />
-    <Content Include="Content\images\DragSSO\inSec1-20.png" />
-    <Content Include="Content\images\DragSSO\inSec1-21.png" />
-    <Content Include="Content\images\DragSSO\inSec1-22.png" />
-    <Content Include="Content\images\DragSSO\inSec1-3.png" />
-    <Content Include="Content\images\DragSSO\inSec1-4.png" />
-    <Content Include="Content\images\DragSSO\inSec1-5.png" />
-    <Content Include="Content\images\DragSSO\inSec1-6.png" />
-    <Content Include="Content\images\DragSSO\inSec1-7.png" />
-    <Content Include="Content\images\DragSSO\inSec1-8.png" />
-    <Content Include="Content\images\DragSSO\inSec1-9.png" />
-    <Content Include="Content\images\DragSSO\inSec2-1.png" />
-    <Content Include="Content\images\DragSSO\inSec2-10.png" />
-    <Content Include="Content\images\DragSSO\inSec2-11.png" />
-    <Content Include="Content\images\DragSSO\inSec2-12.png" />
-    <Content Include="Content\images\DragSSO\inSec2-13.png" />
-    <Content Include="Content\images\DragSSO\inSec2-14.png" />
-    <Content Include="Content\images\DragSSO\inSec2-15.png" />
-    <Content Include="Content\images\DragSSO\inSec2-16.png" />
-    <Content Include="Content\images\DragSSO\inSec2-17.png" />
-    <Content Include="Content\images\DragSSO\inSec2-18.png" />
-    <Content Include="Content\images\DragSSO\inSec2-2.png" />
-    <Content Include="Content\images\DragSSO\inSec2-3.png" />
-    <Content Include="Content\images\DragSSO\inSec2-4.png" />
-    <Content Include="Content\images\DragSSO\inSec2-5.png" />
-    <Content Include="Content\images\DragSSO\inSec2-6.png" />
-    <Content Include="Content\images\DragSSO\inSec2-7.png" />
-    <Content Include="Content\images\DragSSO\inSec2-8.png" />
-    <Content Include="Content\images\DragSSO\inSec2-9.png" />
-    <Content Include="Content\images\DragSSO\inSec3-10.png" />
-    <Content Include="Content\images\DragSSO\inSec3-11.png" />
-    <Content Include="Content\images\DragSSO\inSec3-12.png" />
-    <Content Include="Content\images\DragSSO\inSec3-13.png" />
-    <Content Include="Content\images\DragSSO\inSec3-14.png" />
-    <Content Include="Content\images\DragSSO\inSec3-15.png" />
-    <Content Include="Content\images\DragSSO\inSec3-2.png" />
-    <Content Include="Content\images\DragSSO\inSec3-3.png" />
-    <Content Include="Content\images\DragSSO\inSec3-4.png" />
-    <Content Include="Content\images\DragSSO\inSec3-5.png" />
-    <Content Include="Content\images\DragSSO\inSec3-6.png" />
-    <Content Include="Content\images\DragSSO\inSec3-7.png" />
-    <Content Include="Content\images\DragSSO\inSec3-8.png" />
-    <Content Include="Content\images\DragSSO\inSec3-9.png" />
-    <Content Include="Content\images\DragSSO\inSec6-12.png" />
-    <Content Include="Content\images\DragSSO\inSec6-13.png" />
-    <Content Include="Content\images\DragSSO\inSec6-14.png" />
-    <Content Include="Content\images\DragSSO\inSec6-3.png" />
-    <Content Include="Content\images\DragSSO\inSec6-4.png" />
-    <Content Include="Content\images\DragSSO\inSec6-5.png" />
-    <Content Include="Content\images\DragSSO\inSec6-6.png" />
-    <Content Include="Content\images\DragSSO\login5-1.png" />
-    <Content Include="Content\images\DragSSO\login5-1s.png" />
-    <Content Include="Content\images\DragSSO\login5-2.png" />
-    <Content Include="Content\images\DragSSO\login5-2s.png" />
-    <Content Include="Content\images\DragSSO\login5-3.png" />
-    <Content Include="Content\images\DragSSO\login5-3s.png" />
-    <Content Include="Content\images\DragSSO\message.png" />
-    <Content Include="Content\images\DragSSO\noLogin.png" />
-    <Content Include="Content\images\DragSSO\right2.png" />
-    <Content Include="Content\images\DragSSO\search.png" />
-    <Content Include="Content\images\DragSSO\skin1.jpg" />
-    <Content Include="Content\images\DragSSO\skin2.jpg" />
-    <Content Include="Content\images\DragSSO\skin3.jpg" />
-    <Content Include="Content\images\DragSSO\tips1.png" />
-    <Content Include="Content\images\DragSSO\user.jpg" />
-    <Content Include="Content\images\DragSSO\verCode.png" />
-    <Content Include="Content\images\DragSSO\weixin.png" />
     <Content Include="Content\images\floor\inSec1-10_2.png" />
     <Content Include="Content\css\font-awesome.css" />
     <Content Include="Content\css\index.css" />
@@ -2876,14 +2702,6 @@
     <Content Include="Content\jquery\qrcode.min.js" />
     <Content Include="Content\js\bootstrap.min.js" />
     <Content Include="Content\js\china.js" />
-    <Content Include="Content\js\DragSSO\aLeft.js" />
-    <Content Include="Content\js\DragSSO\index.js" />
-    <Content Include="Content\js\DragSSO\index2.js" />
-    <Content Include="Content\js\DragSSO\index3.js" />
-    <Content Include="Content\js\DragSSO\indexData.js" />
-    <Content Include="Content\js\DragSSO\inSecHead.js" />
-    <Content Include="Content\js\DragSSO\main.js" />
-    <Content Include="Content\js\DragSSO\sortable.js" />
     <Content Include="Content\js\easing.js" />
     <Content Include="Content\js\echarts.js" />
     <Content Include="Content\js\echarts.min.js" />
@@ -3800,7 +3618,6 @@
     <Content Include="Content\webuploader\webuploader.withoutimage.min.js" />
     <Content Include="Areas\LR_WorkFlowModule\Views\WfScheme\Form.cshtml" />
     <Content Include="Areas\LR_WorkFlowModule\Views\WfScheme\HistoryForm.cshtml" />
-    <Content Include="Resource\wav\收到新消息.wav" />
     <Content Include="Views\Home\AdminAccordion\Index.css" />
     <Content Include="Views\Home\AdminAccordion\Index.js" />
     <Content Include="Views\Home\AdminDefault\indexNavigation.js" />
@@ -6202,14 +6019,18 @@
     <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Form.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Form.js" />
-    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Index.cshtml" />
-    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Index.js" />
-    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Form.cshtml" />
-    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Form.js" />
-    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CardSortManage\Index.cshtml" />
-    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CardSortManage\Index.js" />
-    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CardSortManage\Form.cshtml" />
-    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CardSortManage\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\LR_Desktop\Models\" />
@@ -6978,25 +6799,6 @@
     <Content Include="Areas\EducationalAdministration\Views\Thermography\IndexResult.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\FormView.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyApply.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
-    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticTimeIndex.cshtml" />
-    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticTimeForm.cshtml" />
-    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticCountIndex.cshtml" />
-    <Content Include="Areas\LR_ReportModule\Views\ReportTemplate\NWFSchemeReport.cshtml" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\AnswerIndex.cshtml" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\AnswerQuery.cshtml" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\Form.cshtml" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\Index.cshtml" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\Paper.cshtml" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\PaperAdminView.cshtml" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\PaperView.cshtml" />
-    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\TeacherIndex.cshtml" />
-    <Content Include="Areas\LR_Desktop\Views\MessageRind\Form.cshtml" />
-    <Content Include="Areas\LR_Desktop\Views\MessageRind\Index.cshtml" />
-    <Content Include="Areas\LR_Desktop\Views\MessageRind\UnreadIndex.cshtml" />
-    <Content Include="Areas\LR_OrganizationModule\Views\User\FamilyIndex.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />
@@ -7067,12 +6869,6 @@
     <Content Include="Views\Login\PageTwoWxLogin.cshtml" />
     <Content Include="Views\Home\SSOApplication.cshtml" />
     <Content Include="Views\Home\GoToApplication.cshtml" />
-    <Content Include="Views\SSOSystem\DragNoLogin.cshtml" />
-    <Content Include="Views\SSOSystem\DragModelOne.cshtml" />
-    <Content Include="Views\SSOSystem\_LayoutSSODrag.cshtml" />
-    <Content Include="Views\SSOSystem\DragModelTwo.cshtml" />
-    <Content Include="Views\SSOSystem\DragModelThree.cshtml" />
-    <Content Include="Views\SSOSystem\DragNoWxLogin.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
index 87f701a9e..784c033b6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj	
@@ -61,8 +61,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Ask\Ask_MainOfTeacherMap.cs" />
-    <Compile Include="Ask\Ask_TeacherMainMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_InventoryItemApplyMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_PurchaseItemApplyMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_ScrapItemMap.cs" />
@@ -112,7 +110,6 @@
     <Compile Include="LR_CodeDemo\LR_OA_ProjectMap.cs" />
     <Compile Include="LR_CRM\CrmCustomerContactMap.cs" />
     <Compile Include="LR_CRM\CrmChanceMap.cs" />
-    <Compile Include="LR_Desktop\MessageRemindMap.cs" />
     <Compile Include="LR_Desktop\WeChatDevelopMap.cs" />
     <Compile Include="LR_Excel\ExcelExportMap.cs" />
     <Compile Include="LR_Excel\ExcelImportFieldMap.cs" />
@@ -197,7 +194,6 @@
     <Compile Include="LR_WorkFlow\WfTaskHistoryMap.cs" />
     <Compile Include="LR_WorkFlow\WfTaskMap.cs" />
     <Compile Include="PersonnelManagement\JbjiabanMap.cs" />
-    <Compile Include="PersonnelManagement\MeetingNoticeMap.cs" />
     <Compile Include="PersonnelManagement\MP_ManageMentPlanMap.cs" />
     <Compile Include="PersonnelManagement\PMCadreMap.cs" />
     <Compile Include="PersonnelManagement\PMDuesMap.cs" />
@@ -551,8 +547,9 @@
     <Compile Include="EducationalAdministration\Sys_DefaultPwdConfigMap.cs" />
     <Compile Include="PersonnelManagement\MeetingSignInRecordMap.cs" />
     <Compile Include="PersonnelManagement\MeetingMinutesMap.cs" />
-    <Compile Include="LR_Desktop\SSO_Drag_DesktopManageMap.cs" />
-    <Compile Include="LR_Desktop\SSO_Drag_CardSortManageMap.cs" />
+    <Compile Include="PersonnelManagement\ResearchMentMap.cs" />
+    <Compile Include="PersonnelManagement\ResearchGERMap.cs" />
+    <Compile Include="PersonnelManagement\FundExaminerMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
index b3c58709e..9491a7863 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj	
@@ -70,11 +70,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Ask\Ask_MainOfTeacher\Ask_MainOfTeacherBLL.cs" />
-    <Compile Include="Ask\Ask_MainOfTeacher\Ask_MainOfTeacherEntity.cs" />
-    <Compile Include="Ask\Ask_MainOfTeacher\Ask_MainOfTeacherIBLL.cs" />
-    <Compile Include="Ask\Ask_MainOfTeacher\Ask_MainOfTeacherService.cs" />
-    <Compile Include="Ask\Ask_TeacherMain\Ask_TeacherMainEntity.cs" />
     <Compile Include="AssetManagementSystem\Allocation\AllocationBLL.cs" />
     <Compile Include="AssetManagementSystem\Allocation\AllocationIBLL.cs" />
     <Compile Include="AssetManagementSystem\Allocation\AllocationService.cs" />
@@ -261,10 +256,6 @@
     <Compile Include="LR_CodeDemo\WorkOrder\WorkOrderBLL.cs" />
     <Compile Include="LR_CodeDemo\WorkOrder\WorkOrderIBLL.cs" />
     <Compile Include="LR_CodeDemo\WorkOrder\WorkOrderService.cs" />
-    <Compile Include="LR_Desktop\MessageRind\MessageRemindEntity.cs" />
-    <Compile Include="LR_Desktop\MessageRind\MessageRindBLL.cs" />
-    <Compile Include="LR_Desktop\MessageRind\MessageRindIBLL.cs" />
-    <Compile Include="LR_Desktop\MessageRind\MessageRindService.cs" />
     <Compile Include="LR_Desktop\WeChatDevelop\WeChatDevelopBLL.cs" />
     <Compile Include="LR_Desktop\WeChatDevelop\WeChatDevelopEntity.cs" />
     <Compile Include="LR_Desktop\WeChatDevelop\WeChatDevelopIBLL.cs" />
@@ -294,10 +285,6 @@
     <Compile Include="PersonnelManagement\BC_PublishManagement\BC_PublishManagementEntity.cs" />
     <Compile Include="PersonnelManagement\BC_PublishManagement\BC_PublishManagementIBLL.cs" />
     <Compile Include="PersonnelManagement\BC_PublishManagement\BC_PublishManagementService.cs" />
-    <Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeBLL.cs" />
-    <Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeEntity.cs" />
-    <Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeIBLL.cs" />
-    <Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeService.cs" />
     <Compile Include="PersonnelManagement\MP_PerformanceTracking\MP_PerformanceTrackingBLL.cs" />
     <Compile Include="PersonnelManagement\MP_PerformanceTracking\MP_PerformanceTrackingIBLL.cs" />
     <Compile Include="PersonnelManagement\MP_PerformanceTracking\MP_PerformanceTrackingService.cs" />
@@ -1622,14 +1609,18 @@
     <Compile Include="PersonnelManagement\MeetingMinutes\MeetingMinutesService.cs" />
     <Compile Include="PersonnelManagement\MeetingMinutes\MeetingMinutesBLL.cs" />
     <Compile Include="PersonnelManagement\MeetingMinutes\MeetingMinutesIBLL.cs" />
-    <Compile Include="LR_Desktop\SSO_Drag_DesktopManage\SSO_Drag_DesktopManageEntity.cs" />
-    <Compile Include="LR_Desktop\SSO_Drag_DesktopManage\SSO_Drag_DesktopManageService.cs" />
-    <Compile Include="LR_Desktop\SSO_Drag_DesktopManage\SSO_Drag_DesktopManageIBLL.cs" />
-    <Compile Include="LR_Desktop\SSO_Drag_DesktopManage\SSO_Drag_DesktopManageBLL.cs" />
-    <Compile Include="LR_Desktop\SSO_Drag_CardSortManage\SSO_Drag_CardSortManageEntity.cs" />
-    <Compile Include="LR_Desktop\SSO_Drag_CardSortManage\SSO_Drag_CardSortManageService.cs" />
-    <Compile Include="LR_Desktop\SSO_Drag_CardSortManage\SSO_Drag_CardSortManageIBLL.cs" />
-    <Compile Include="LR_Desktop\SSO_Drag_CardSortManage\SSO_Drag_CardSortManageBLL.cs" />
+    <Compile Include="PersonnelManagement\ResearchMent\ResearchMentEntity.cs" />
+    <Compile Include="PersonnelManagement\ResearchMent\ResearchMentService.cs" />
+    <Compile Include="PersonnelManagement\ResearchMent\ResearchMentBLL.cs" />
+    <Compile Include="PersonnelManagement\ResearchMent\ResearchMentIBLL.cs" />
+    <Compile Include="PersonnelManagement\ResearchGER\ResearchGEREntity.cs" />
+    <Compile Include="PersonnelManagement\ResearchGER\ResearchGERService.cs" />
+    <Compile Include="PersonnelManagement\ResearchGER\ResearchGERBLL.cs" />
+    <Compile Include="PersonnelManagement\ResearchGER\ResearchGERIBLL.cs" />
+    <Compile Include="PersonnelManagement\FundExaminer\FundExaminerEntity.cs" />
+    <Compile Include="PersonnelManagement\FundExaminer\FundExaminerService.cs" />
+    <Compile Include="PersonnelManagement\FundExaminer\FundExaminerBLL.cs" />
+    <Compile Include="PersonnelManagement\FundExaminer\FundExaminerIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

From 4380cc7cb4fad561ed01ca1e646e8f2e5044951f Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Tue, 11 May 2021 10:32:20 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 8a18751f3..80e85bbe3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,3 +79,4 @@ Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
 /Learun.Framework.Ultimate V7/Learun.Application.Mobile/platforms/android/assets/www
 /Learun.Framework.Ultimate V7/Learun.Application.Mobile/www.7z
 /Learun.Framework.Ultimate V7/Learun.Application.WebApi/bin.7z
+*.cs~merged

From 9f26c724899be31f385fb50ce2241d73a8466504 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Tue, 11 May 2021 10:35:02 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpersonal=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/ADR_AddApplyController.cs     | 147 +++++
 ...roller.cs => ADR_RestrictionController.cs} |  39 +-
 .../Controllers/ActivityScheduleController.cs | 124 ++++
 .../Controllers/ActivityVenueController.cs    | 111 ++++
 .../BC_CostManagementController.cs            | 111 ++++
 .../BC_DiscussionResultsController.cs         | 111 ++++
 .../BC_EffectEvaluationController.cs          | 111 ++++
 ...C_ElectronicMaterialMangementController.cs | 111 ++++
 .../BC_EvaluationInformationController.cs     | 111 ++++
 .../Controllers/BC_ExaminationController.cs   | 111 ++++
 .../BC_ExcellentCourseController.cs           | 122 ++++
 .../BC_InternshipFileController.cs            | 111 ++++
 .../BC_MicroClassSystemController.cs          | 111 ++++
 .../Controllers/BC_MindMappingController.cs   | 111 ++++
 .../Controllers/BC_PopQuizController.cs       | 120 ++++
 .../BC_PracticeTemplateController.cs          | 111 ++++
 .../BC_PublishManagementController.cs         | 111 ++++
 .../BC_StudentEnrolmentController.cs          | 111 ++++
 .../BC_TrainingApplicationController.cs       | 111 ++++
 .../Controllers/ClassWorkController.cs        | 131 ++++
 .../CommunityActivityController.cs            | 111 ++++
 .../CommunityAttendanceController.cs          | 120 ++++
 .../Controllers/CommunityInfoController.cs    | 151 +++++
 .../Controllers/CommunityMemberController.cs  | 137 +++++
 .../CommunityMemberEncouragementController.cs | 111 ++++
 .../Controllers/ConferenceRoomController.cs   | 137 +++++
 .../Controllers/ContactsDetailsController.cs  | 124 ++++
 .../Controllers/ContractCategoryController.cs | 111 ++++
 .../ContractManagementController.cs           | 215 +++++++
 .../Controllers/DutyScheduleController.cs     | 111 ++++
 .../Controllers/EmpRepairController.cs        | 130 ++++
 .../Controllers/EpiPassPlaceController.cs     | 111 ++++
 .../Controllers/EpiPeopleDetailsController.cs | 118 ++++
 .../Controllers/EpidemicReportController.cs   | 203 +++++++
 .../EpidemicSituationController.cs            | 202 ++++++
 .../EpidemicSituationCopyController.cs        | 280 +++++++++
 .../Controllers/FundManagementController.cs   | 111 ++++
 .../LaborUnionActivityController.cs           | 111 ++++
 .../LaborUnionFeesExpendController.cs         | 111 ++++
 .../LaborUnionFeesIncomeController.cs         | 111 ++++
 .../Controllers/LaborUnionMemberController.cs | 111 ++++
 ...LaborUnionMemberEncouragementController.cs | 111 ++++
 .../LaborUnionOrganizationController.cs       | 111 ++++
 .../Controllers/LaborUnionPlanController.cs   | 111 ++++
 .../LaborUnionWelfareApplyController.cs       | 132 ++++
 .../LaborUnionWelfareController.cs            | 111 ++++
 .../Controllers/LeagueActivityController.cs   | 117 ++++
 .../LeagueMemberChangeController.cs           | 118 ++++
 .../Controllers/LeagueMemberController.cs     | 137 +++++
 .../Controllers/LeagueMemberDuesController.cs | 130 ++++
 .../LeagueMemberEncouragementController.cs    | 111 ++++
 .../LeagueMemberPunishmentController.cs       | 111 ++++
 .../LeagueMemberTrainController.cs            | 111 ++++
 .../Controllers/MP_BrowseRecordController.cs  | 123 ++++
 .../MP_ManagementPlanController.cs            | 307 ++++++++++
 .../MP_PerformanceTrackingController.cs       | 206 +++++++
 .../MP_QualityObjectivesController.cs         | 261 ++++++++
 .../MeetingManagementController.cs            |   9 -
 ...troller.cs => MeetingMinutesController.cs} |  46 +-
 .../MeetingSignInRecordController.cs          | 138 +++++
 .../OfficialSealManagerController.cs          | 111 ++++
 .../OvertimeApplicationController.cs          | 111 ++++
 .../Controllers/PMActivistsController.cs      | 116 ++++
 .../Controllers/PMCadreController.cs          | 111 ++++
 .../Controllers/PMDuesController.cs           | 111 ++++
 .../PMLearnArrangementController.cs           | 112 ++++
 .../Controllers/PMLifeController.cs           | 111 ++++
 .../Controllers/PMMeetingController.cs        | 115 ++++
 .../PMMembershipChangeController.cs           | 118 ++++
 .../Controllers/PMMembershipController.cs     | 111 ++++
 .../Controllers/PMOrganizationController.cs   | 122 ++++
 ...Controller.cs => PartyMemberController.cs} |  46 +-
 .../PartyMemberEncouragementController.cs     | 111 ++++
 .../PartyMemberPunishmentController.cs        | 111 ++++
 .../Controllers/PartyMemberTrainController.cs | 111 ++++
 .../Controllers/SRAchievementController.cs    | 111 ++++
 .../Controllers/SRAppraisalController.cs      | 111 ++++
 .../Controllers/SRConferenceController.cs     | 111 ++++
 .../Controllers/SRDocumentController.cs       | 111 ++++
 .../Controllers/SREncouragementController.cs  | 111 ++++
 .../Controllers/SRFeesExpendController.cs     | 111 ++++
 .../Controllers/SRFeesIncomeController.cs     | 111 ++++
 .../Controllers/SRFinalController.cs          | 111 ++++
 .../Controllers/SRPaperController.cs          | 111 ++++
 .../Controllers/SRProcessController.cs        | 111 ++++
 .../Controllers/SRProjectApplyController.cs   | 111 ++++
 .../Controllers/SRProjectController.cs        | 111 ++++
 .../Controllers/SRProjectSetUpController.cs   | 111 ++++
 .../Controllers/SRWinningController.cs        | 111 ++++
 .../Controllers/SRWorkController.cs           | 111 ++++
 .../Controllers/SRWorkloadController.cs       | 111 ++++
 .../Sal_SalaryTemplateController.cs           | 127 ++++
 .../Sal_SalaryTemplateItemController.cs       | 112 ++++
 .../Controllers/Sal_UserSalaryController.cs   | 320 ++++++++++
 .../Sal_UserSalaryItemController.cs           | 119 ++++
 .../Controllers/SalarySheetController.cs      | 111 ++++
 .../ScholarshipManagementController.cs        | 111 ++++
 .../SchoolWomenManagementController.cs        | 111 ++++
 .../Controllers/StuSaverecordController.cs    | 136 +++++
 .../TeacherCancelEmployController.cs          | 153 +++++
 .../TeacherCertificateController.cs           | 111 ++++
 .../Controllers/TeacherChangeController.cs    | 111 ++++
 .../Controllers/TeacherDimissionController.cs | 117 ++++
 .../TeacherEncourgementController.cs          | 111 ++++
 .../Controllers/TeacherGoAbroadController.cs  | 111 ++++
 .../TeacherJobAssessmentController.cs         | 111 ++++
 .../TeacherPartTimeJobController.cs           | 111 ++++
 .../Controllers/TeacherPassportController.cs  | 111 ++++
 .../TeacherPostChangeController.cs            | 111 ++++
 .../TeacherPunishmentController.cs            | 111 ++++
 .../TeacherRecruitPlanController.cs           | 111 ++++
 .../Controllers/TeacherRetireController.cs    | 111 ++++
 .../TeacherTitleChangeController.cs           | 111 ++++
 .../TeacherTitleEvaluationController.cs       | 111 ++++
 .../Controllers/TeacherTrainController.cs     | 111 ++++
 .../Controllers/TimeTableController.cs        | 573 ++++++++++++++++++
 .../Controllers/VenhicleManageController.cs   | 111 ++++
 .../VolunteerActivityController.cs            | 111 ++++
 .../Controllers/WP_CatalogController.cs       | 138 +++++
 .../Controllers/WP_FileListController.cs      | 132 ++++
 .../Controllers/WP_WorkPlanController.cs      | 112 ++++
 .../Controllers/WP_WorkSummaryController.cs   | 113 ++++
 .../WorkStudyPayMoneyController.cs            | 111 ++++
 .../WorkStudyPositionApplyController.cs       | 132 ++++
 .../WorkStudyPositionController.cs            | 111 ++++
 .../Learun.Application.Web.csproj             | 140 ++++-
 126 files changed, 15741 insertions(+), 83 deletions(-)
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ADR_AddApplyController.cs
 rename Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/{FundExaminerController.cs => ADR_RestrictionController.cs} (71%)
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ActivityScheduleController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ActivityVenueController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_CostManagementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_DiscussionResultsController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_EffectEvaluationController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_ElectronicMaterialMangementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_EvaluationInformationController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_ExaminationController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_ExcellentCourseController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_InternshipFileController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_MicroClassSystemController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_MindMappingController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_PopQuizController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_PracticeTemplateController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_PublishManagementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_StudentEnrolmentController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_TrainingApplicationController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ClassWorkController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityActivityController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityAttendanceController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityInfoController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityMemberController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityMemberEncouragementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ConferenceRoomController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ContactsDetailsController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ContractCategoryController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ContractManagementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/DutyScheduleController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EmpRepairController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpiPassPlaceController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpiPeopleDetailsController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicReportController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicSituationController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicSituationCopyController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/FundManagementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionActivityController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionFeesExpendController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionFeesIncomeController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionMemberController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionMemberEncouragementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionOrganizationController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionPlanController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionWelfareApplyController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionWelfareController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueActivityController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberChangeController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberDuesController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberEncouragementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberPunishmentController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberTrainController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_BrowseRecordController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_PerformanceTrackingController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_QualityObjectivesController.cs
 rename Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/{ResearchMentController.cs => MeetingMinutesController.cs} (70%)
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/OfficialSealManagerController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/OvertimeApplicationController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMActivistsController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMCadreController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMDuesController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMLearnArrangementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMLifeController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMMeetingController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMMembershipChangeController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMMembershipController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMOrganizationController.cs
 rename Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/{ResearchGERController.cs => PartyMemberController.cs} (67%)
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberEncouragementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberPunishmentController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberTrainController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRAchievementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRAppraisalController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRConferenceController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRDocumentController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SREncouragementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRFeesExpendController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRFeesIncomeController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRFinalController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRPaperController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProcessController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectApplyController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectSetUpController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWinningController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkloadController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_SalaryTemplateController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_SalaryTemplateItemController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryItemController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SalarySheetController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ScholarshipManagementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SchoolWomenManagementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/StuSaverecordController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherCancelEmployController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherCertificateController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherChangeController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherDimissionController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherEncourgementController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherGoAbroadController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherJobAssessmentController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPartTimeJobController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPassportController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPostChangeController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPunishmentController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherRecruitPlanController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherRetireController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTitleChangeController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTitleEvaluationController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/VenhicleManageController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/VolunteerActivityController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_CatalogController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_FileListController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_WorkPlanController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_WorkSummaryController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WorkStudyPayMoneyController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WorkStudyPositionApplyController.cs
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WorkStudyPositionController.cs

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ADR_AddApplyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ADR_AddApplyController.cs
new file mode 100644
index 000000000..9028f9db2
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ADR_AddApplyController.cs	
@@ -0,0 +1,147 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using Learun.Application.TwoDevelopment.LR_CodeDemo;
+using System.Collections.Generic;
+using Learun.Application.Base.SystemModule;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2020-09-09 16:23
+    /// 描 述：补卡申请
+    /// </summary>
+    public class ADR_AddApplyController : MvcControllerBase
+    {
+        private ADR_AddApplyIBLL aDR_AddApplyIBLL = new ADR_AddApplyBLL();
+        private CodeRuleIBLL codeRuleIBLL = new CodeRuleBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = aDR_AddApplyIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var ADR_AddApplyData = aDR_AddApplyIBLL.GetADR_AddApplyEntity( keyValue );
+            var jsonData = new {
+                ADR_AddApply = ADR_AddApplyData,
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="processId">流程实例主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDataByProcessId(string processId)
+        {
+            var ADR_AddApplyData = aDR_AddApplyIBLL.GetEntityByProcessId( processId );
+            var jsonData = new {
+                ADR_AddApply = ADR_AddApplyData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            aDR_AddApplyIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 修改审批状态
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult ChangeStatusById(string keyValue,string processId)
+        {
+            aDR_AddApplyIBLL.ChangeStatusById(keyValue,processId);
+            return Success("提交成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            ADR_AddApplyEntity entity = strEntity.ToObject<ADR_AddApplyEntity>();
+            aDR_AddApplyIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/FundExaminerController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ADR_RestrictionController.cs
similarity index 71%
rename from Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/FundExaminerController.cs
rename to Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ADR_RestrictionController.cs
index f8358ab1e..7854787e5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/FundExaminerController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ADR_RestrictionController.cs	
@@ -10,12 +10,12 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2021-05-10 11:32
-    /// 描 述：教科研经费审批人
+    /// 日 期：2020-09-03 14:57
+    /// 描 述：考勤限制
     /// </summary>
-    public class FundExaminerController : MvcControllerBase
+    public class ADR_RestrictionController : MvcControllerBase
     {
-        private FundExaminerIBLL fundExaminerIBLL = new FundExaminerBLL();
+        private ADR_RestrictionIBLL aDR_RestrictionIBLL = new ADR_RestrictionBLL();
 
         #region 视图功能
 
@@ -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
 
@@ -52,7 +52,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult GetPageList(string pagination, string queryJson)
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = fundExaminerIBLL.GetPageList(paginationobj, queryJson);
+            var data = aDR_RestrictionIBLL.GetPageList(paginationobj, queryJson);
             var jsonData = new
             {
                 rows = data,
@@ -71,9 +71,10 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var FundExaminerData = fundExaminerIBLL.GetFundExaminerList( keyValue );
-            var jsonData = new {
-                FundExaminer = FundExaminerData,
+            var ADR_RestrictionData = aDR_RestrictionIBLL.GetADR_RestrictionEntity(keyValue);
+            var jsonData = new
+            {
+                ADR_Restriction = ADR_RestrictionData,
             };
             return Success(jsonData);
         }
@@ -90,10 +91,22 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult DeleteForm(string keyValue)
         {
-            fundExaminerIBLL.DeleteEntity(keyValue);
+            aDR_RestrictionIBLL.DeleteEntity(keyValue);
             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>
@@ -104,8 +117,8 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
-            FundExaminerEntity entity = strEntity.ToObject<FundExaminerEntity>();
-            fundExaminerIBLL.SaveEntity(keyValue,entity);
+            ADR_RestrictionEntity entity = strEntity.ToObject<ADR_RestrictionEntity>();
+            aDR_RestrictionIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {
             }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ActivityScheduleController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ActivityScheduleController.cs
new file mode 100644
index 000000000..5a0040fca
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ActivityScheduleController.cs	
@@ -0,0 +1,124 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-25 14:53
+    /// 描 述：活动安排
+    /// </summary>
+    public class ActivityScheduleController : MvcControllerBase
+    {
+        private ActivityScheduleIBLL activityScheduleIBLL = new ActivityScheduleBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = activityScheduleIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = activityScheduleIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var ActivityScheduleData = activityScheduleIBLL.GetActivityScheduleEntity( keyValue );
+            var jsonData = new {
+                ActivitySchedule = ActivityScheduleData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            activityScheduleIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();            ActivityScheduleEntity entity = strEntity.ToObject<ActivityScheduleEntity>();
+            activityScheduleIBLL.SaveEntity(userInfo,keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ActivityVenueController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ActivityVenueController.cs
new file mode 100644
index 000000000..4df5737cd
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ActivityVenueController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-11-19 16:05
+    /// 描 述：活动场地管理
+    /// </summary>
+    public class ActivityVenueController : MvcControllerBase
+    {
+        private ActivityVenueIBLL activityVenueIBLL = new ActivityVenueBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = activityVenueIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var ActivityVenueData = activityVenueIBLL.GetActivityVenueEntity( keyValue );
+            var jsonData = new {
+                ActivityVenue = ActivityVenueData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            activityVenueIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            ActivityVenueEntity entity = strEntity.ToObject<ActivityVenueEntity>();
+            activityVenueIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_CostManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_CostManagementController.cs
new file mode 100644
index 000000000..608564d7a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_CostManagementController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 11:21
+    /// 描 述：培训费用管理
+    /// </summary>
+    public class BC_CostManagementController : MvcControllerBase
+    {
+        private BC_CostManagementIBLL bC_CostManagementIBLL = new BC_CostManagementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_CostManagementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_CostManagementData = bC_CostManagementIBLL.GetBC_CostManagementEntity( keyValue );
+            var jsonData = new {
+                BC_CostManagement = BC_CostManagementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_CostManagementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_CostManagementEntity entity = strEntity.ToObject<BC_CostManagementEntity>();
+            bC_CostManagementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_DiscussionResultsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_DiscussionResultsController.cs
new file mode 100644
index 000000000..9cd2915c6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_DiscussionResultsController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-18 13:10
+    /// 描 述：讨论结果管理
+    /// </summary>
+    public class BC_DiscussionResultsController : MvcControllerBase
+    {
+        private BC_DiscussionResultsIBLL bC_DiscussionResultsIBLL = new BC_DiscussionResultsBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_DiscussionResultsIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_DiscussionResultsData = bC_DiscussionResultsIBLL.GetBC_DiscussionResultsEntity( keyValue );
+            var jsonData = new {
+                BC_DiscussionResults = BC_DiscussionResultsData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_DiscussionResultsIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_DiscussionResultsEntity entity = strEntity.ToObject<BC_DiscussionResultsEntity>();
+            bC_DiscussionResultsIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_EffectEvaluationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_EffectEvaluationController.cs
new file mode 100644
index 000000000..d095eb2a7
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_EffectEvaluationController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-18 17:27
+    /// 描 述：实习结果评估
+    /// </summary>
+    public class BC_EffectEvaluationController : MvcControllerBase
+    {
+        private BC_EffectEvaluationIBLL bC_EffectEvaluationIBLL = new BC_EffectEvaluationBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_EffectEvaluationIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_EffectEvaluationData = bC_EffectEvaluationIBLL.GetBC_EffectEvaluationEntity( keyValue );
+            var jsonData = new {
+                BC_EffectEvaluation = BC_EffectEvaluationData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_EffectEvaluationIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_EffectEvaluationEntity entity = strEntity.ToObject<BC_EffectEvaluationEntity>();
+            bC_EffectEvaluationIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_ElectronicMaterialMangementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_ElectronicMaterialMangementController.cs
new file mode 100644
index 000000000..f18cbcbf6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_ElectronicMaterialMangementController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-18 12:33
+    /// 描 述：电子教材管理
+    /// </summary>
+    public class BC_ElectronicMaterialMangementController : MvcControllerBase
+    {
+        private BC_ElectronicMaterialMangementIBLL bC_ElectronicMaterialMangementIBLL = new BC_ElectronicMaterialMangementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_ElectronicMaterialMangementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_ElectronicMaterialMangementData = bC_ElectronicMaterialMangementIBLL.GetBC_ElectronicMaterialMangementEntity( keyValue );
+            var jsonData = new {
+                BC_ElectronicMaterialMangement = BC_ElectronicMaterialMangementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_ElectronicMaterialMangementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_ElectronicMaterialMangementEntity entity = strEntity.ToObject<BC_ElectronicMaterialMangementEntity>();
+            bC_ElectronicMaterialMangementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_EvaluationInformationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_EvaluationInformationController.cs
new file mode 100644
index 000000000..766d676c3
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_EvaluationInformationController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-18 15:55
+    /// 描 述：测评信息管理
+    /// </summary>
+    public class BC_EvaluationInformationController : MvcControllerBase
+    {
+        private BC_EvaluationInformationIBLL bC_EvaluationInformationIBLL = new BC_EvaluationInformationBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_EvaluationInformationIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_EvaluationInformationData = bC_EvaluationInformationIBLL.GetBC_EvaluationInformationEntity( keyValue );
+            var jsonData = new {
+                BC_EvaluationInformation = BC_EvaluationInformationData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_EvaluationInformationIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_EvaluationInformationEntity entity = strEntity.ToObject<BC_EvaluationInformationEntity>();
+            bC_EvaluationInformationIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_ExaminationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_ExaminationController.cs
new file mode 100644
index 000000000..75b2d7009
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_ExaminationController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 11:23
+    /// 描 述：培训考核认证
+    /// </summary>
+    public class BC_ExaminationController : MvcControllerBase
+    {
+        private BC_ExaminationIBLL bC_ExaminationIBLL = new BC_ExaminationBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_ExaminationIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_ExaminationData = bC_ExaminationIBLL.GetBC_ExaminationEntity( keyValue );
+            var jsonData = new {
+                BC_Examination = BC_ExaminationData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_ExaminationIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_ExaminationEntity entity = strEntity.ToObject<BC_ExaminationEntity>();
+            bC_ExaminationIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_ExcellentCourseController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_ExcellentCourseController.cs
new file mode 100644
index 000000000..ee0124a03
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_ExcellentCourseController.cs	
@@ -0,0 +1,122 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-18 15:59
+    /// 描 述：精品课程管理
+    /// </summary>
+    public class BC_ExcellentCourseController : MvcControllerBase
+    {
+        private BC_ExcellentCourseIBLL bC_ExcellentCourseIBLL = new BC_ExcellentCourseBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_ExcellentCourseIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_ExcellentCourseData = bC_ExcellentCourseIBLL.GetBC_ExcellentCourseEntity( keyValue );
+            var jsonData = new {
+                BC_ExcellentCourse = BC_ExcellentCourseData,
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取左侧树形数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetTree()
+        {
+            var data = bC_ExcellentCourseIBLL.GetTree();
+            return Success(data);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_ExcellentCourseIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_ExcellentCourseEntity entity = strEntity.ToObject<BC_ExcellentCourseEntity>();
+            bC_ExcellentCourseIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_InternshipFileController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_InternshipFileController.cs
new file mode 100644
index 000000000..18adb66f0
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_InternshipFileController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-18 17:13
+    /// 描 述：实习档案管理
+    /// </summary>
+    public class BC_InternshipFileController : MvcControllerBase
+    {
+        private BC_InternshipFileIBLL bC_InternshipFileIBLL = new BC_InternshipFileBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_InternshipFileIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_InternshipFileData = bC_InternshipFileIBLL.GetBC_InternshipFileEntity( keyValue );
+            var jsonData = new {
+                BC_InternshipFile = BC_InternshipFileData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_InternshipFileIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_InternshipFileEntity entity = strEntity.ToObject<BC_InternshipFileEntity>();
+            bC_InternshipFileIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_MicroClassSystemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_MicroClassSystemController.cs
new file mode 100644
index 000000000..b756df864
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_MicroClassSystemController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-18 13:05
+    /// 描 述：微课系统
+    /// </summary>
+    public class BC_MicroClassSystemController : MvcControllerBase
+    {
+        private BC_MicroClassSystemIBLL bC_MicroClassSystemIBLL = new BC_MicroClassSystemBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_MicroClassSystemIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_MicroClassSystemData = bC_MicroClassSystemIBLL.GetBC_MicroClassSystemEntity( keyValue );
+            var jsonData = new {
+                BC_MicroClassSystem = BC_MicroClassSystemData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_MicroClassSystemIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_MicroClassSystemEntity entity = strEntity.ToObject<BC_MicroClassSystemEntity>();
+            bC_MicroClassSystemIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_MindMappingController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_MindMappingController.cs
new file mode 100644
index 000000000..69ce475c3
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_MindMappingController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-18 13:07
+    /// 描 述：思维导图
+    /// </summary>
+    public class BC_MindMappingController : MvcControllerBase
+    {
+        private BC_MindMappingIBLL bC_MindMappingIBLL = new BC_MindMappingBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_MindMappingIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_MindMappingData = bC_MindMappingIBLL.GetBC_MindMappingEntity( keyValue );
+            var jsonData = new {
+                BC_MindMapping = BC_MindMappingData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_MindMappingIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_MindMappingEntity entity = strEntity.ToObject<BC_MindMappingEntity>();
+            bC_MindMappingIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_PopQuizController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_PopQuizController.cs
new file mode 100644
index 000000000..f537808ed
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_PopQuizController.cs	
@@ -0,0 +1,120 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-18 12:28
+    /// 描 述：随堂测试
+    /// </summary>
+    public class BC_PopQuizController : MvcControllerBase
+    {
+        private BC_PopQuizIBLL bC_PopQuizIBLL = new BC_PopQuizBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Report()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_PopQuizIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_PopQuizData = bC_PopQuizIBLL.GetBC_PopQuizEntity( keyValue );
+            var jsonData = new {
+                BC_PopQuiz = BC_PopQuizData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_PopQuizIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_PopQuizEntity entity = strEntity.ToObject<BC_PopQuizEntity>();
+            bC_PopQuizIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_PracticeTemplateController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_PracticeTemplateController.cs
new file mode 100644
index 000000000..c5bff3896
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_PracticeTemplateController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-18 17:12
+    /// 描 述：实习模板管理
+    /// </summary>
+    public class BC_PracticeTemplateController : MvcControllerBase
+    {
+        private BC_PracticeTemplateIBLL bC_PracticeTemplateIBLL = new BC_PracticeTemplateBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_PracticeTemplateIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_PracticeTemplateData = bC_PracticeTemplateIBLL.GetBC_PracticeTemplateEntity( keyValue );
+            var jsonData = new {
+                BC_PracticeTemplate = BC_PracticeTemplateData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_PracticeTemplateIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_PracticeTemplateEntity entity = strEntity.ToObject<BC_PracticeTemplateEntity>();
+            bC_PracticeTemplateIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_PublishManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_PublishManagementController.cs
new file mode 100644
index 000000000..b07a66444
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_PublishManagementController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-18 12:25
+    /// 描 述：发布工具管理
+    /// </summary>
+    public class BC_PublishManagementController : MvcControllerBase
+    {
+        private BC_PublishManagementIBLL bC_PublishManagementIBLL = new BC_PublishManagementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_PublishManagementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_PublishManagementData = bC_PublishManagementIBLL.GetBC_PublishManagementEntity( keyValue );
+            var jsonData = new {
+                BC_PublishManagement = BC_PublishManagementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_PublishManagementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_PublishManagementEntity entity = strEntity.ToObject<BC_PublishManagementEntity>();
+            bC_PublishManagementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_StudentEnrolmentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_StudentEnrolmentController.cs
new file mode 100644
index 000000000..9f606c27c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_StudentEnrolmentController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 11:27
+    /// 描 述：学校招生
+    /// </summary>
+    public class BC_StudentEnrolmentController : MvcControllerBase
+    {
+        private BC_StudentEnrolmentIBLL bC_StudentEnrolmentIBLL = new BC_StudentEnrolmentBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_StudentEnrolmentIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_StudentEnrolmentData = bC_StudentEnrolmentIBLL.GetBC_StudentEnrolmentEntity( keyValue );
+            var jsonData = new {
+                BC_StudentEnrolment = BC_StudentEnrolmentData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_StudentEnrolmentIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_StudentEnrolmentEntity entity = strEntity.ToObject<BC_StudentEnrolmentEntity>();
+            bC_StudentEnrolmentIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_TrainingApplicationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_TrainingApplicationController.cs
new file mode 100644
index 000000000..44870a59c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/BC_TrainingApplicationController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 11:25
+    /// 描 述：培训申请管理
+    /// </summary>
+    public class BC_TrainingApplicationController : MvcControllerBase
+    {
+        private BC_TrainingApplicationIBLL bC_TrainingApplicationIBLL = new BC_TrainingApplicationBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = bC_TrainingApplicationIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var BC_TrainingApplicationData = bC_TrainingApplicationIBLL.GetBC_TrainingApplicationEntity( keyValue );
+            var jsonData = new {
+                BC_TrainingApplication = BC_TrainingApplicationData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            bC_TrainingApplicationIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            BC_TrainingApplicationEntity entity = strEntity.ToObject<BC_TrainingApplicationEntity>();
+            bC_TrainingApplicationIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ClassWorkController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ClassWorkController.cs
new file mode 100644
index 000000000..b1afc5560
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ClassWorkController.cs	
@@ -0,0 +1,131 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-26 14:43
+    /// 描 述：班级工作记事
+    /// </summary>
+    public class ClassWorkController : MvcControllerBase
+    {
+        private ClassWorkIBLL classWorkIBLL = new ClassWorkBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = classWorkIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = classWorkIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var ClassWorkData = classWorkIBLL.GetClassWorkEntity(keyValue);
+            var jsonData = new
+            {
+                ClassWork = ClassWorkData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            classWorkIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();
+            ClassWorkEntity entity = strEntity.ToObject<ClassWorkEntity>();
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUserId = userInfo.userId;
+            entity.CreateUserName = userInfo.realName;
+
+            classWorkIBLL.SaveEntity(userInfo, keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityActivityController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityActivityController.cs
new file mode 100644
index 000000000..8c5f118c0
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityActivityController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 14:01
+    /// 描 述：社团活动管理
+    /// </summary>
+    public class CommunityActivityController : MvcControllerBase
+    {
+        private CommunityActivityIBLL communityActivityIBLL = new CommunityActivityBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = communityActivityIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var CommunityActivityData = communityActivityIBLL.GetCommunityActivityEntity( keyValue );
+            var jsonData = new {
+                CommunityActivity = CommunityActivityData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            communityActivityIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            CommunityActivityEntity entity = strEntity.ToObject<CommunityActivityEntity>();
+            communityActivityIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityAttendanceController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityAttendanceController.cs
new file mode 100644
index 000000000..398fae71b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityAttendanceController.cs	
@@ -0,0 +1,120 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-01-05 11:38
+    /// 描 述：社团签到
+    /// </summary>
+    public class CommunityAttendanceController : MvcControllerBase
+    {
+        private CommunityAttendanceIBLL communityAttendanceIBLL = new CommunityAttendanceBLL();
+        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = communityAttendanceIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var CommunityAttendanceData = communityAttendanceIBLL.GetCommunityAttendanceEntity(keyValue);
+            var jsonData = new
+            {
+                CommunityAttendance = CommunityAttendanceData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            communityAttendanceIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            CommunityAttendanceEntity entity = strEntity.ToObject<CommunityAttendanceEntity>();
+            var stuEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(entity.StuNo);
+            if (stuEntity == null)
+            {
+                return Fail("学生不存在！");
+            }
+            entity.StuName = stuEntity.StuName;
+            communityAttendanceIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityInfoController.cs
new file mode 100644
index 000000000..41c020649
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityInfoController.cs	
@@ -0,0 +1,151 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-01-04 11:47
+    /// 描 述：社团管理
+    /// </summary>
+    public class CommunityInfoController : MvcControllerBase
+    {
+        private CommunityInfoIBLL communityInfoIBLL = new CommunityInfoBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 签到码表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult QrcodeForm()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = communityInfoIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = communityInfoIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var CommunityInfoData = communityInfoIBLL.GetCommunityInfoEntity( keyValue );
+            var jsonData = new {
+                CommunityInfo = CommunityInfoData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            communityInfoIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();
+            CommunityInfoEntity entity = strEntity.ToObject<CommunityInfoEntity>();
+            //编号不能重复
+            var model = communityInfoIBLL.GetCommunityInfoEntityByCode(entity.CommunityCode);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                if (model != null)
+                {
+                    return Fail("社团编号已存在！");
+                }
+            }
+            else
+            {
+                if (model != null && model.Id != keyValue)
+                {
+                    return Fail("社团编号已存在！");
+                }
+            }
+
+            communityInfoIBLL.SaveEntity(userInfo,keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityMemberController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityMemberController.cs
new file mode 100644
index 000000000..840b88951
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityMemberController.cs	
@@ -0,0 +1,137 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-01-04 15:23
+    /// 描 述：社团会员
+    /// </summary>
+    public class CommunityMemberController : MvcControllerBase
+    {
+        private CommunityMemberIBLL communityMemberIBLL = new CommunityMemberBLL();
+        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = communityMemberIBLL.GetPageList(paginationobj, queryJson, string.Empty);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string communityId)
+        {
+            var data = communityMemberIBLL.GetList(communityId);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var CommunityMemberData = communityMemberIBLL.GetCommunityMemberEntity(keyValue);
+            var jsonData = new
+            {
+                CommunityMember = CommunityMemberData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            communityMemberIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            CommunityMemberEntity entity = strEntity.ToObject<CommunityMemberEntity>();
+            var stuEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(entity.StuNo);
+            if (stuEntity == null)
+            {
+                return Fail("学生不存在！");
+            }
+            entity.StuName = stuEntity.StuName;
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUserId = loginInfo.userId;
+            entity.CreateUserName = loginInfo.realName;
+            communityMemberIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityMemberEncouragementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityMemberEncouragementController.cs
new file mode 100644
index 000000000..d70194ce8
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/CommunityMemberEncouragementController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 14:05
+    /// 描 述：社团奖励管理
+    /// </summary>
+    public class CommunityMemberEncouragementController : MvcControllerBase
+    {
+        private CommunityMemberEncouragementIBLL communityMemberEncouragementIBLL = new CommunityMemberEncouragementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = communityMemberEncouragementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var CommunityMemberEncouragementData = communityMemberEncouragementIBLL.GetCommunityMemberEncouragementEntity( keyValue );
+            var jsonData = new {
+                CommunityMemberEncouragement = CommunityMemberEncouragementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            communityMemberEncouragementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            CommunityMemberEncouragementEntity entity = strEntity.ToObject<CommunityMemberEncouragementEntity>();
+            communityMemberEncouragementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ConferenceRoomController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ConferenceRoomController.cs
new file mode 100644
index 000000000..87c88b9d6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ConferenceRoomController.cs	
@@ -0,0 +1,137 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-11-19 16:03
+    /// 描 述：会议室管理
+    /// </summary>
+    public class ConferenceRoomController : MvcControllerBase
+    {
+        private ConferenceRoomIBLL conferenceRoomIBLL = new ConferenceRoomBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = conferenceRoomIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList()
+        {
+            var data = conferenceRoomIBLL.GetList();
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var ConferenceRoomData = conferenceRoomIBLL.GetConferenceRoomEntity(keyValue);
+            var jsonData = new
+            {
+                ConferenceRoom = ConferenceRoomData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            conferenceRoomIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            ConferenceRoomEntity entity = strEntity.ToObject<ConferenceRoomEntity>();
+            conferenceRoomIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// 启用禁用实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoEnable(string keyValue, string status)
+        {
+            conferenceRoomIBLL.DoEnable(keyValue, status);
+            return Success("操作成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ContactsDetailsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ContactsDetailsController.cs
new file mode 100644
index 000000000..ceba00e83
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ContactsDetailsController.cs	
@@ -0,0 +1,124 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-03 14:44
+    /// 描 述：疫情详细信息
+    /// </summary>
+    public class ContactsDetailsController : MvcControllerBase
+    {
+        private ContactsDetailsIBLL contactsDetailsIBLL = new ContactsDetailsBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = contactsDetailsIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = contactsDetailsIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var ContactsDetailsData = contactsDetailsIBLL.GetContactsDetailsEntity( keyValue );
+            var jsonData = new {
+                ContactsDetails = ContactsDetailsData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            contactsDetailsIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();            ContactsDetailsEntity entity = strEntity.ToObject<ContactsDetailsEntity>();
+            contactsDetailsIBLL.SaveEntity(userInfo,keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ContractCategoryController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ContractCategoryController.cs
new file mode 100644
index 000000000..00f8b5a0f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ContractCategoryController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-04-30 09:52
+    /// 描 述：合同类别管理
+    /// </summary>
+    public class ContractCategoryController : MvcControllerBase
+    {
+        private ContractCategoryIBLL contractCategoryIBLL = new ContractCategoryBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = contractCategoryIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var ContractCategoryData = contractCategoryIBLL.GetContractCategoryEntity( keyValue );
+            var jsonData = new {
+                ContractCategory = ContractCategoryData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            contractCategoryIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            ContractCategoryEntity entity = strEntity.ToObject<ContractCategoryEntity>();
+            contractCategoryIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ContractManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ContractManagementController.cs
new file mode 100644
index 000000000..e1b6e99d9
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ContractManagementController.cs	
@@ -0,0 +1,215 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using Learun.Application.Organization;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-04-30 10:32
+    /// 描 述：合同管理
+    /// </summary>
+    public class ContractManagementController : MvcControllerBase
+    {
+        private ContractManagementIBLL contractManagementIBLL = new ContractManagementBLL();
+        private UserIBLL userIBLL = new UserBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 查看表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 续签表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormRenew()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 终止表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormTerminate()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 解除表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormRemove()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = contractManagementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var ContractManagementData = contractManagementIBLL.GetContractManagementEntity(keyValue);
+            var jsonData = new
+            {
+                ContractManagement = ContractManagementData,
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetUserList()
+        {
+            var data = userIBLL.GetAllList();
+            return Success(data);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            contractManagementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            var userInfo = LoginUserInfo.Get();
+            ContractManagementEntity entity = strEntity.ToObject<ContractManagementEntity>();
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUserId = userInfo.userId;
+            entity.ContractStatus = "2";
+            contractManagementIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// 续签保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveFormRenew(string keyValue, string strEntity)
+        {
+            var userInfo = LoginUserInfo.Get();
+            ContractManagementEntity entity = strEntity.ToObject<ContractManagementEntity>();
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUserId = userInfo.userId;
+            entity.ContractStatus = "2";
+            contractManagementIBLL.SaveRenew(keyValue, entity);
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// 终止保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveFormTerminate(string keyValue, string strEntity)
+        {
+            ContractManagementEntity entity = strEntity.ToObject<ContractManagementEntity>();
+            contractManagementIBLL.SaveTerminate(keyValue, entity);
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// 解除保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveFormRemove(string keyValue, string strEntity)
+        {
+            ContractManagementEntity entity = strEntity.ToObject<ContractManagementEntity>();
+            contractManagementIBLL.SaveRemove(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/DutyScheduleController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/DutyScheduleController.cs
new file mode 100644
index 000000000..46cc6c328
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/DutyScheduleController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-11-19 15:30
+    /// 描 述：值班安排
+    /// </summary>
+    public class DutyScheduleController : MvcControllerBase
+    {
+        private DutyScheduleIBLL dutyScheduleIBLL = new DutyScheduleBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = dutyScheduleIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var DutyScheduleData = dutyScheduleIBLL.GetDutyScheduleEntity( keyValue );
+            var jsonData = new {
+                DutySchedule = DutyScheduleData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            dutyScheduleIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            DutyScheduleEntity entity = strEntity.ToObject<DutyScheduleEntity>();
+            dutyScheduleIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EmpRepairController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EmpRepairController.cs
new file mode 100644
index 000000000..339fce5ff
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EmpRepairController.cs	
@@ -0,0 +1,130 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-26 16:33
+    /// 描 述：掌上报修
+    /// </summary>
+    public class EmpRepairController : MvcControllerBase
+    {
+        private EmpRepairIBLL empRepairIBLL = new EmpRepairBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = empRepairIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = empRepairIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var EmpRepairData = empRepairIBLL.GetEmpRepairEntity(keyValue);
+            var jsonData = new
+            {
+                EmpRepair = EmpRepairData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            empRepairIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();
+            EmpRepairEntity entity = strEntity.ToObject<EmpRepairEntity>();
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUserId = userInfo.userId;
+            entity.CreateUserName = userInfo.realName;
+            empRepairIBLL.SaveEntity(userInfo, keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpiPassPlaceController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpiPassPlaceController.cs
new file mode 100644
index 000000000..1f88e4e2b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpiPassPlaceController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-10 16:32
+    /// 描 述：疫情经过记录
+    /// </summary>
+    public class EpiPassPlaceController : MvcControllerBase
+    {
+        private EpiPassPlaceIBLL epiPassPlaceIBLL = new EpiPassPlaceBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = epiPassPlaceIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PassPlaceData = epiPassPlaceIBLL.GetPassPlaceEntity( keyValue );
+            var jsonData = new {
+                PassPlace = PassPlaceData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            epiPassPlaceIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            PassPlaceEntity entity = strEntity.ToObject<PassPlaceEntity>();
+            epiPassPlaceIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpiPeopleDetailsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpiPeopleDetailsController.cs
new file mode 100644
index 000000000..76af9dc24
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpiPeopleDetailsController.cs	
@@ -0,0 +1,118 @@
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using Learun.Util;
+using System.Data;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-10 19:21
+    /// 描 述：疫情接触外人
+    /// </summary>
+    public class EpiPeopleDetailsController : MvcControllerBase
+    {
+        private EpiPeopleDetailsIBLL epiPeopleDetailsIBLL = new EpiPeopleDetailsBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = epiPeopleDetailsIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = epiPeopleDetailsIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = epiPeopleDetailsIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            epiPeopleDetailsIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,PeopleDetailsEntity entity)
+        {
+            epiPeopleDetailsIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicReportController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicReportController.cs
new file mode 100644
index 000000000..30ddd6aaf
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicReportController.cs	
@@ -0,0 +1,203 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Linq;
+using Learun.Application.Base.SystemModule;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-03 14:37
+    /// 描 述：疫情记录
+    /// </summary>
+    public class EpidemicReportController : MvcControllerBase
+    {
+        private EpidemicSituationIBLL epidemicSituationIBLL = new EpidemicSituationBLL();
+        private DataItemIBLL dataItemIbll = new DataItemBLL();
+        private DataSourceIBLL dataSourceIbll=new DataSourceBLL();
+        private DIC_PROVINCEIBLL dicProvinceibll=new DIC_PROVINCEBLL();
+
+        #region  视图功能
+
+       
+        /// <summary>
+        /// 外出原因统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult OutReasonReport()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 人员类别统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult PersonnelCategoryReport()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 各省份人数统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ProviceReport()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 交通工具人数统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult VehicleReport()
+        {
+            return View();
+        }
+
+        #endregion
+
+        #region  获取数据
+
+        public ActionResult OutReasonReportList()
+        {
+            var dataItemList = dataItemIbll.GetDetailList("OutReason");
+            var data = epidemicSituationIBLL.GetList("{}");
+            var list = data.GroupBy(a => a.OutReason).Select(a => new
+            {
+                name = dataItemList.FirstOrDefault(b => b.F_ItemValue == a.Key.ToString())?.F_ItemName,
+                value = a.Count()
+            });
+            return Success(list);
+        }
+        public ActionResult OutReasonReportData()
+        {
+            var dataItemList = dataItemIbll.GetDetailList("OutReason");
+            var data = epidemicSituationIBLL.GetList("{}");
+            var list = data.GroupBy(a => a.OutReason).Select(a => new
+            {
+                name = dataItemList.FirstOrDefault(b => b.F_ItemValue == a.Key.ToString())?.F_ItemName,
+                value = a.Count()
+            });
+            var rdata = new
+            {
+                name = list.Select(a => a.name),
+                value = list.Select(a => a.value)
+            };
+            return Success(rdata);
+
+
+        }
+
+
+
+        public ActionResult PersonnelCategoryReportList()
+        {
+            var dataItemList = dataItemIbll.GetDetailList("EUserType");
+            var data = epidemicSituationIBLL.GetList("{}");
+            var list = data.GroupBy(a => a.Type).Select(a => new
+            {
+                name = dataItemList.FirstOrDefault(b => b.F_ItemValue == a.Key.ToString())?.F_ItemName,
+                value = a.Count()
+            });
+            return Success(list);
+        }
+        public ActionResult PersonnelCategoryReportData()
+        {
+            var dataItemList = dataItemIbll.GetDetailList("EUserType");
+            var data = epidemicSituationIBLL.GetList("{}");
+            var list = data.GroupBy(a => a.Type).Select(a => new
+            {
+                name = dataItemList.FirstOrDefault(b => b.F_ItemValue == a.Key.ToString())?.F_ItemName,
+                value = a.Count()
+            });
+            var rdata = new
+            {
+                name = list.Select(a => a.name),
+                value = list.Select(a => a.value)
+            };
+            return Success(rdata);
+
+
+        }
+
+
+
+        
+        public ActionResult ProviceReportList()
+        {
+            var data = epidemicSituationIBLL.GetList("{}");
+            var list = data.GroupBy(a => a.Provice).Select(a => new
+            {
+                name = dicProvinceibll.GetDIC_PROVINCEEntityByCode(a.Key.ToString())?.PNAME,
+                value = a.Count()
+            });
+            return Success(list);
+        }
+        public ActionResult ProviceReportData()
+        {
+            var data = epidemicSituationIBLL.GetList("{}");
+            var list = data.GroupBy(a => a.Provice).Select(a => new
+            {
+                name = dicProvinceibll.GetDIC_PROVINCEEntityByCode(a.Key.ToString())?.PNAME,
+                value = a.Count()
+            });
+            var rdata = new
+            {
+                name = list.Select(a => a.name),
+                value = list.Select(a => a.value)
+            };
+            return Success(rdata);
+
+
+        }
+
+
+
+        
+        public ActionResult VehicleReportList()
+        {
+            var dataItemList = dataItemIbll.GetDetailList("Vehicle");
+            var data = epidemicSituationIBLL.GetList("{}");
+            var list = data.GroupBy(a => a.Vehicle).Select(a => new
+            {
+                name = dataItemList.FirstOrDefault(b => b.F_ItemValue == a.Key.ToString())?.F_ItemName,
+                value = a.Count()
+            });
+            return Success(list);
+        }
+        public ActionResult VehicleReportData()
+        {
+            var dataItemList = dataItemIbll.GetDetailList("Vehicle");
+            var data = epidemicSituationIBLL.GetList("{}");
+            var list = data.GroupBy(a => a.Vehicle).Select(a => new
+            {
+                name = dataItemList.FirstOrDefault(b => b.F_ItemValue == a.Key.ToString())?.F_ItemName,
+                value = a.Count()
+            });
+            var rdata = new
+            {
+                name = list.Select(a => a.name),
+                value = list.Select(a => a.value)
+            };
+            return Success(rdata);
+
+
+        }
+
+              #endregion
+
+      
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicSituationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicSituationController.cs
new file mode 100644
index 000000000..d6da8145b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicSituationController.cs	
@@ -0,0 +1,202 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Linq;
+using Learun.Application.Base.SystemModule;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-03 14:37
+    /// 描 述：疫情记录
+    /// </summary>
+    public class EpidemicSituationController : MvcControllerBase
+    {
+        private EpidemicSituationIBLL epidemicSituationIBLL = new EpidemicSituationBLL();
+        private DataItemIBLL dataItemIbll = new DataItemBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 外出原因统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult OutReasonReport()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 人员类别统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult PersonnelCategoryReport()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 各省份人数统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ProviceReport()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 交通工具人数统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult VehicleReport()
+        {
+            return View();
+        }
+
+        #endregion
+
+        #region  获取数据
+
+        public ActionResult OutReasonReportList()
+        {
+            var dataItemList = dataItemIbll.GetDetailList("OutReason");
+            var data = epidemicSituationIBLL.GetList("{}");
+            var list = data.GroupBy(a => a.OutReason).Select(a => new
+            {
+                name = dataItemList.FirstOrDefault(b => b.F_ItemValue == a.Key.ToString()).F_ItemName,
+                value = a.Count()
+            });
+            return Success(list);
+        }
+        public ActionResult OutReasonReportData()
+        {
+            var dataItemList = dataItemIbll.GetDetailList("OutReason");
+            var data = epidemicSituationIBLL.GetList("{}");
+            var list = data.GroupBy(a => a.OutReason).Select(a => new
+            {
+                name = dataItemList.FirstOrDefault(b => b.F_ItemValue == a.Key.ToString()).F_ItemName,
+                value = a.Count()
+            });
+            var rdata = new
+            {
+                name = list.Select(a => a.name),
+                value = list.Select(a => a.value)
+            };
+            return Success(new { list, data });
+
+
+        }
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = epidemicSituationIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = epidemicSituationIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var EpidemicSituationData = epidemicSituationIBLL.GetEpidemicSituationEntity( keyValue ); 
+            var ContactsDetailsData = epidemicSituationIBLL.GetContactsDetailsList( EpidemicSituationData.ID ); 
+            var jsonData = new { 
+                EpidemicSituation = EpidemicSituationData, 
+                ContactsDetails = ContactsDetailsData, 
+            }; 
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            epidemicSituationIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity, string strcontactsDetailsList)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();            
+            EpidemicSituationEntity entity = strEntity.ToObject<EpidemicSituationEntity>(); 
+            List<ContactsDetailsEntity> contactsDetailsList = strcontactsDetailsList.ToObject<List<ContactsDetailsEntity>>(); 
+            epidemicSituationIBLL.SaveEntity(userInfo,keyValue,entity,contactsDetailsList); 
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicSituationCopyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicSituationCopyController.cs
new file mode 100644
index 000000000..4aff3901c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicSituationCopyController.cs	
@@ -0,0 +1,280 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Linq;
+using Learun.Application.Base.SystemModule;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-03 14:37
+    /// 描 述：疫情记录
+    /// </summary>
+    public class EpidemicSituationCopyController : MvcControllerBase
+    {
+        private EpidemicSituationIBLL epidemicSituationIBLL = new EpidemicSituationBLL();
+        private DataItemIBLL dataItemIbll = new DataItemBLL();
+        private CdDeptIBLL cdDeptIbll = new CdDeptBLL();
+        private CdMajorIBLL cdMajorIbll = new CdMajorBLL();
+        private ClassInfoIBLL classInfoIbll = new ClassInfoBLL();
+        private StuInfoBasicIBLL stuInfoBasicIbll = new StuInfoBasicBLL();
+        private EmpInfoIBLL empInfoIBLL = new EmpInfoBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexReport()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 外出原因统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult OutReasonReport()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 人员类别统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult PersonnelCategoryReport()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 各省份人数统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ProviceReport()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 交通工具人数统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult VehicleReport()
+        {
+            return View();
+        }
+
+        #endregion
+
+        #region  获取数据
+
+        public ActionResult GetStudentSource(string studentId)
+        {
+            var res = "";
+            var stuEntity = stuInfoBasicIbll.GetStuInfoBasicEntityByStuNo(studentId);
+            if (stuEntity != null)
+            {
+                var detptName = cdDeptIbll.GetCdDeptEntityByNo(stuEntity.DeptNo)?.DeptName;
+                var majorName = cdMajorIbll.GetCdMajorEntityByMajorNo(stuEntity.MajorNo)?.MajorName;
+                var className = classInfoIbll.GetClassInfoEntityByClassNo(stuEntity.ClassNo)?.ClassName;
+                res = $"{detptName} {majorName} {className}";
+            }
+
+            return Success(new { res, Address = stuEntity?.MailAddress });
+
+        }
+
+
+        public ActionResult GetEmpSource(string empId)
+        {
+            var stuEntity = empInfoIBLL.GetEmpInfoEntity(empId);
+            return Success(new { Address = stuEntity?.Homeaddress });
+        }
+
+        public ActionResult OutReasonReportList()
+        {
+            var dataItemList = dataItemIbll.GetDetailList("OutReason");
+            var data = epidemicSituationIBLL.GetList("{}");
+            var list = data.GroupBy(a => a.OutReason).Select(a => new
+            {
+                name = dataItemList.FirstOrDefault(b => b.F_ItemValue == a.Key.ToString()).F_ItemName,
+                value = a.Count()
+            });
+            return Success(list);
+        }
+        public ActionResult OutReasonReportData()
+        {
+            var dataItemList = dataItemIbll.GetDetailList("OutReason");
+            var data = epidemicSituationIBLL.GetList("{}");
+            var list = data.GroupBy(a => a.OutReason).Select(a => new
+            {
+                name = dataItemList.FirstOrDefault(b => b.F_ItemValue == a.Key.ToString()).F_ItemName,
+                value = a.Count()
+            });
+            var rdata = new
+            {
+                name = list.Select(a => a.name),
+                value = list.Select(a => a.value)
+            };
+            return Success(new { list, data });
+
+
+        }
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = epidemicSituationIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetReportPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = epidemicSituationIBLL.GetReportPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = epidemicSituationIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var EpidemicSituationData = epidemicSituationIBLL.GetEpidemicSituationEntity(keyValue);
+            var ContactsDetailsData = epidemicSituationIBLL.GetContactsDetailsList(EpidemicSituationData.ID);
+            var PassPlaceData = epidemicSituationIBLL.GetPassPlaceList(EpidemicSituationData.ID);
+            var PeopleDetailData = epidemicSituationIBLL.GetPeopleDetailslist(EpidemicSituationData.ID);
+            var jsonData = new
+            {
+                EpidemicSituation = EpidemicSituationData,
+                ContactsDetails = ContactsDetailsData,
+                PassPlaces = PassPlaceData,
+                PeopleDetails = PeopleDetailData
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            epidemicSituationIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity, string strcontactsDetailsList, string passPlaceDetailsList, string strpeopleDetailsList)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();
+            EpidemicSituationEntity entity = strEntity.ToObject<EpidemicSituationEntity>();
+
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                var userId = entity.Creater;
+                if (epidemicSituationIBLL.HasTodayValue(userId))
+                {
+                    return Success("不能重复提交");
+                }
+            }
+
+            List<PassPlaceEntity> passDetailsList = passPlaceDetailsList.ToObject<List<PassPlaceEntity>>();
+            List<ContactsDetailsEntity> contactsDetailsList = strcontactsDetailsList.ToObject<List<ContactsDetailsEntity>>();
+            List<PeopleDetailsEntity> peopleDetailsList = strpeopleDetailsList.ToObject<List<PeopleDetailsEntity>>();
+            epidemicSituationIBLL.SaveEntity(userInfo, keyValue, entity, contactsDetailsList, passDetailsList, peopleDetailsList);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/FundManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/FundManagementController.cs
new file mode 100644
index 000000000..d6fa0033e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/FundManagementController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-04 16:23
+    /// 描 述：资助管理
+    /// </summary>
+    public class FundManagementController : MvcControllerBase
+    {
+        private FundManagementIBLL fundManagementIBLL = new FundManagementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = fundManagementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var FundManagementData = fundManagementIBLL.GetFundManagementEntity( keyValue );
+            var jsonData = new {
+                FundManagement = FundManagementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            fundManagementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            FundManagementEntity entity = strEntity.ToObject<FundManagementEntity>();
+            fundManagementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionActivityController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionActivityController.cs
new file mode 100644
index 000000000..b66f0ac92
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionActivityController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-03 12:32
+    /// 描 述：工会活动管理
+    /// </summary>
+    public class LaborUnionActivityController : MvcControllerBase
+    {
+        private LaborUnionActivityIBLL laborUnionActivityIBLL = new LaborUnionActivityBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = laborUnionActivityIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LaborUnionActivityData = laborUnionActivityIBLL.GetLaborUnionActivityEntity( keyValue );
+            var jsonData = new {
+                LaborUnionActivity = LaborUnionActivityData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            laborUnionActivityIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LaborUnionActivityEntity entity = strEntity.ToObject<LaborUnionActivityEntity>();
+            laborUnionActivityIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionFeesExpendController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionFeesExpendController.cs
new file mode 100644
index 000000000..2749e7ac6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionFeesExpendController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-03 12:12
+    /// 描 述：会费支出管理
+    /// </summary>
+    public class LaborUnionFeesExpendController : MvcControllerBase
+    {
+        private LaborUnionFeesExpendIBLL laborUnionFeesExpendIBLL = new LaborUnionFeesExpendBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = laborUnionFeesExpendIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LaborUnionFeesExpendData = laborUnionFeesExpendIBLL.GetLaborUnionFeesExpendEntity( keyValue );
+            var jsonData = new {
+                LaborUnionFeesExpend = LaborUnionFeesExpendData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            laborUnionFeesExpendIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LaborUnionFeesExpendEntity entity = strEntity.ToObject<LaborUnionFeesExpendEntity>();
+            laborUnionFeesExpendIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionFeesIncomeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionFeesIncomeController.cs
new file mode 100644
index 000000000..feac80c2a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionFeesIncomeController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-03 12:08
+    /// 描 述：会费收入管理
+    /// </summary>
+    public class LaborUnionFeesIncomeController : MvcControllerBase
+    {
+        private LaborUnionFeesIncomeIBLL laborUnionFeesIncomeIBLL = new LaborUnionFeesIncomeBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = laborUnionFeesIncomeIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LaborUnionFeesIncomeData = laborUnionFeesIncomeIBLL.GetLaborUnionFeesIncomeEntity( keyValue );
+            var jsonData = new {
+                LaborUnionFeesIncome = LaborUnionFeesIncomeData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            laborUnionFeesIncomeIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LaborUnionFeesIncomeEntity entity = strEntity.ToObject<LaborUnionFeesIncomeEntity>();
+            laborUnionFeesIncomeIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionMemberController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionMemberController.cs
new file mode 100644
index 000000000..3654a3e6c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionMemberController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-03 11:47
+    /// 描 述：工会成员管理
+    /// </summary>
+    public class LaborUnionMemberController : MvcControllerBase
+    {
+        private LaborUnionMemberIBLL laborUnionMemberIBLL = new LaborUnionMemberBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = laborUnionMemberIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LaborUnionMemberData = laborUnionMemberIBLL.GetLaborUnionMemberEntity( keyValue );
+            var jsonData = new {
+                LaborUnionMember = LaborUnionMemberData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            laborUnionMemberIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LaborUnionMemberEntity entity = strEntity.ToObject<LaborUnionMemberEntity>();
+            laborUnionMemberIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionMemberEncouragementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionMemberEncouragementController.cs
new file mode 100644
index 000000000..805bfc73c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionMemberEncouragementController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-03 11:58
+    /// 描 述：工会成员奖励管理
+    /// </summary>
+    public class LaborUnionMemberEncouragementController : MvcControllerBase
+    {
+        private LaborUnionMemberEncouragementIBLL laborUnionMemberEncouragementIBLL = new LaborUnionMemberEncouragementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = laborUnionMemberEncouragementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LaborUnionMemberEncouragementData = laborUnionMemberEncouragementIBLL.GetLaborUnionMemberEncouragementEntity( keyValue );
+            var jsonData = new {
+                LaborUnionMemberEncouragement = LaborUnionMemberEncouragementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            laborUnionMemberEncouragementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LaborUnionMemberEncouragementEntity entity = strEntity.ToObject<LaborUnionMemberEncouragementEntity>();
+            laborUnionMemberEncouragementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionOrganizationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionOrganizationController.cs
new file mode 100644
index 000000000..d24be6ec6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionOrganizationController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-03 11:37
+    /// 描 述：工会组织管理
+    /// </summary>
+    public class LaborUnionOrganizationController : MvcControllerBase
+    {
+        private LaborUnionOrganizationIBLL laborUnionOrganizationIBLL = new LaborUnionOrganizationBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = laborUnionOrganizationIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LaborUnionOrganizationData = laborUnionOrganizationIBLL.GetLaborUnionOrganizationEntity( keyValue );
+            var jsonData = new {
+                LaborUnionOrganization = LaborUnionOrganizationData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            laborUnionOrganizationIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LaborUnionOrganizationEntity entity = strEntity.ToObject<LaborUnionOrganizationEntity>();
+            laborUnionOrganizationIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionPlanController.cs
new file mode 100644
index 000000000..4cbed722f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionPlanController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-14 12:07
+    /// 描 述：工会帮扶计划
+    /// </summary>
+    public class LaborUnionPlanController : MvcControllerBase
+    {
+        private LaborUnionPlanIBLL laborUnionPlanIBLL = new LaborUnionPlanBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = laborUnionPlanIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LaborUnionPlanData = laborUnionPlanIBLL.GetLaborUnionPlanEntity( keyValue );
+            var jsonData = new {
+                LaborUnionPlan = LaborUnionPlanData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            laborUnionPlanIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LaborUnionPlanEntity entity = strEntity.ToObject<LaborUnionPlanEntity>();
+            laborUnionPlanIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionWelfareApplyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionWelfareApplyController.cs
new file mode 100644
index 000000000..af99adecb
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionWelfareApplyController.cs	
@@ -0,0 +1,132 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-03 12:27
+    /// 描 述：福利申请管理
+    /// </summary>
+    public class LaborUnionWelfareApplyController : MvcControllerBase
+    {
+        private LaborUnionWelfareApplyIBLL laborUnionWelfareApplyIBLL = new LaborUnionWelfareApplyBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = laborUnionWelfareApplyIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LaborUnionWelfareApplyData = laborUnionWelfareApplyIBLL.GetLaborUnionWelfareApplyEntity(keyValue);
+            var jsonData = new
+            {
+                LaborUnionWelfareApply = LaborUnionWelfareApplyData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            laborUnionWelfareApplyIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LaborUnionWelfareApplyEntity entity = strEntity.ToObject<LaborUnionWelfareApplyEntity>();
+            entity.CheckStatus = false;
+            laborUnionWelfareApplyIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        /// <summary>
+        /// 审核实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoCheck(string keyValue, bool checkStatus)
+        {
+            var entity = laborUnionWelfareApplyIBLL.GetLaborUnionWelfareApplyEntity(keyValue);
+            if (entity == null)
+            {
+                return Fail("数据不存在！");
+            }
+            entity.CheckStatus = checkStatus;
+            laborUnionWelfareApplyIBLL.SaveEntity(keyValue, entity);
+            return Success("操作成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionWelfareController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionWelfareController.cs
new file mode 100644
index 000000000..147f7c2a3
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LaborUnionWelfareController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-03 12:21
+    /// 描 述：福利活动管理
+    /// </summary>
+    public class LaborUnionWelfareController : MvcControllerBase
+    {
+        private LaborUnionWelfareIBLL laborUnionWelfareIBLL = new LaborUnionWelfareBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = laborUnionWelfareIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LaborUnionWelfareData = laborUnionWelfareIBLL.GetLaborUnionWelfareEntity( keyValue );
+            var jsonData = new {
+                LaborUnionWelfare = LaborUnionWelfareData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            laborUnionWelfareIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LaborUnionWelfareEntity entity = strEntity.ToObject<LaborUnionWelfareEntity>();
+            laborUnionWelfareIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueActivityController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueActivityController.cs
new file mode 100644
index 000000000..d2b6c639b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueActivityController.cs	
@@ -0,0 +1,117 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-01-03 17:08
+    /// 描 述：共青团团活动计划
+    /// </summary>
+    public class LeagueActivityController : MvcControllerBase
+    {
+        private LeagueActivityIBLL leagueActivityIBLL = new LeagueActivityBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = leagueActivityIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LeagueActivityData = leagueActivityIBLL.GetLeagueActivityEntity(keyValue);
+            var jsonData = new
+            {
+                LeagueActivity = LeagueActivityData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            leagueActivityIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            LeagueActivityEntity entity = strEntity.ToObject<LeagueActivityEntity>();
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUserId = loginInfo.userId;
+            entity.CreateUserName = loginInfo.realName;
+            leagueActivityIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberChangeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberChangeController.cs
new file mode 100644
index 000000000..16e449f0e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberChangeController.cs	
@@ -0,0 +1,118 @@
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using Learun.Util;
+using System.Data;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-01-03 17:17
+    /// 描 述：共青团团员异动
+    /// </summary>
+    public class LeagueMemberChangeController : MvcControllerBase
+    {
+        private LeagueMemberChangeIBLL leagueMemberChangeIBLL = new LeagueMemberChangeBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = leagueMemberChangeIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = leagueMemberChangeIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = leagueMemberChangeIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            leagueMemberChangeIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,LeagueMemberChangeEntity entity)
+        {
+            leagueMemberChangeIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberController.cs
new file mode 100644
index 000000000..cd7a7da7e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberController.cs	
@@ -0,0 +1,137 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-01-04 10:19
+    /// 描 述：共青团团员
+    /// </summary>
+    public class LeagueMemberController : MvcControllerBase
+    {
+        private LeagueMemberIBLL leagueMemberIBLL = new LeagueMemberBLL();
+        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 编辑表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ModifyForm()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = leagueMemberIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LeagueMemberData = leagueMemberIBLL.GetLeagueMemberEntity(keyValue);
+            var jsonData = new
+            {
+                LeagueMember = LeagueMemberData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            leagueMemberIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            LeagueMemberEntity entity = strEntity.ToObject<LeagueMemberEntity>();
+            //var stuEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(entity.StuNo);
+            //if (stuEntity == null)
+            //{
+            //    return Fail("学生不存在！");
+            //}
+            //entity.StuName = stuEntity.StuName;
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.CreateTime = DateTime.Now;
+                entity.CreateUserId = loginInfo.userId;
+                entity.CreateUserName = loginInfo.realName;
+            }
+            leagueMemberIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberDuesController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberDuesController.cs
new file mode 100644
index 000000000..73c4d42da
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberDuesController.cs	
@@ -0,0 +1,130 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-28 17:37
+    /// 描 述：团费管理
+    /// </summary>
+    public class LeagueMemberDuesController : MvcControllerBase
+    {
+        private LeagueMemberDuesIBLL leagueMemberDuesIBLL = new LeagueMemberDuesBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = leagueMemberDuesIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LeagueMemberDuesData = leagueMemberDuesIBLL.GetLeagueMemberDuesEntity(keyValue);
+            var jsonData = new
+            {
+                LeagueMemberDues = LeagueMemberDuesData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            leagueMemberDuesIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LeagueMemberDuesEntity entity = strEntity.ToObject<LeagueMemberDuesEntity>();
+            leagueMemberDuesIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// 审核实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoCheck(string keyValue, bool checkStatus)
+        {
+            var entity = leagueMemberDuesIBLL.GetLeagueMemberDuesEntity(keyValue);
+            if (entity == null)
+            {
+                return Fail("数据不存在！");
+            }
+            entity.CheckStatus = checkStatus;
+            leagueMemberDuesIBLL.SaveEntity(keyValue, entity);
+            return Success("操作成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberEncouragementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberEncouragementController.cs
new file mode 100644
index 000000000..6a779d76c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberEncouragementController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-28 17:43
+    /// 描 述：团员奖励管理
+    /// </summary>
+    public class LeagueMemberEncouragementController : MvcControllerBase
+    {
+        private LeagueMemberEncouragementIBLL leagueMemberEncouragementIBLL = new LeagueMemberEncouragementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = leagueMemberEncouragementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LeagueMemberEncouragementData = leagueMemberEncouragementIBLL.GetLeagueMemberEncouragementEntity( keyValue );
+            var jsonData = new {
+                LeagueMemberEncouragement = LeagueMemberEncouragementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            leagueMemberEncouragementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LeagueMemberEncouragementEntity entity = strEntity.ToObject<LeagueMemberEncouragementEntity>();
+            leagueMemberEncouragementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberPunishmentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberPunishmentController.cs
new file mode 100644
index 000000000..77a16395a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberPunishmentController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-28 17:48
+    /// 描 述：团员处分管理
+    /// </summary>
+    public class LeagueMemberPunishmentController : MvcControllerBase
+    {
+        private LeagueMemberPunishmentIBLL leagueMemberPunishmentIBLL = new LeagueMemberPunishmentBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = leagueMemberPunishmentIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LeagueMemberPunishmentData = leagueMemberPunishmentIBLL.GetLeagueMemberPunishmentEntity( keyValue );
+            var jsonData = new {
+                LeagueMemberPunishment = LeagueMemberPunishmentData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            leagueMemberPunishmentIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LeagueMemberPunishmentEntity entity = strEntity.ToObject<LeagueMemberPunishmentEntity>();
+            leagueMemberPunishmentIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberTrainController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberTrainController.cs
new file mode 100644
index 000000000..bbbda0951
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/LeagueMemberTrainController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-28 17:55
+    /// 描 述：团校培训
+    /// </summary>
+    public class LeagueMemberTrainController : MvcControllerBase
+    {
+        private LeagueMemberTrainIBLL leagueMemberTrainIBLL = new LeagueMemberTrainBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = leagueMemberTrainIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LeagueMemberTrainData = leagueMemberTrainIBLL.GetLeagueMemberTrainEntity( keyValue );
+            var jsonData = new {
+                LeagueMemberTrain = LeagueMemberTrainData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            leagueMemberTrainIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LeagueMemberTrainEntity entity = strEntity.ToObject<LeagueMemberTrainEntity>();
+            leagueMemberTrainIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_BrowseRecordController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_BrowseRecordController.cs
new file mode 100644
index 000000000..9e468bb48
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_BrowseRecordController.cs	
@@ -0,0 +1,123 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-09-27 11:47
+    /// 描 述：浏览记录
+    /// </summary>
+    public class MP_BrowseRecordController : MvcControllerBase
+    {
+        private MP_BrowseRecordIBLL mP_BrowseRecordIBLL = new MP_BrowseRecordBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexFile()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = mP_BrowseRecordIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var MP_BrowseRecordData = mP_BrowseRecordIBLL.GetMP_BrowseRecordEntity(keyValue);
+            var jsonData = new
+            {
+                MP_BrowseRecord = MP_BrowseRecordData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            mP_BrowseRecordIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            MP_BrowseRecordEntity entity = strEntity.ToObject<MP_BrowseRecordEntity>();
+            mP_BrowseRecordIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs
new file mode 100644
index 000000000..9b59e2ef7
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs	
@@ -0,0 +1,307 @@
+using System;
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Linq;
+using Learun.Application.Organization;
+using Learun.Application.TwoDevelopment.LR_Desktop;
+using Learun.Util.Operat;
+using Newtonsoft.Json;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 力软敏捷开发框架 
+    /// Copyright (c) 2013-2018 上海力软信息技术有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-09-24 15:32
+    /// 描 述：内控管理
+    /// </summary>
+    public class MP_ManagementPlanController : MvcControllerBase
+    {
+        private WeChatConfigIBLL weChatConfigIbll = new WeChatConfigBLL();
+        private WeChatTempletIBLL weChatTempletIbll = new WeChatTempletBLL();
+        private UserIBLL userIBLL=new UserBLL();
+        private MP_ManagementPlanIBLL mP_ManagementPlanIBLL = new MP_ManagementPlanBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 管理员页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexManagement()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 提交材料页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexChildren()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult UploadForm()
+        {
+            return View();
+        }
+
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = mP_ManagementPlanIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var MP_ManageMentPlanData = mP_ManagementPlanIBLL.GetMP_ManageMentPlanEntity(keyValue);
+            var jsonData = new
+            {
+                MP_ManageMentPlan = MP_ManageMentPlanData,
+            };
+            return Success(jsonData);
+        }
+
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetAcademicYear()
+        {
+            var data = WebHelper.GenerateNearByAcademicTwo();
+            return Success(data);
+        }
+
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            mP_ManagementPlanIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 合格/不合格
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult Qqualified(string keyValue, bool status)
+        {
+            var entity = mP_ManagementPlanIBLL.GetMP_ManageMentPlanEntity(keyValue);
+            entity.MPConclusion = status?1:0;
+            mP_ManagementPlanIBLL.SaveEntity(keyValue, entity);
+            return Success("修改成功！");
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            MP_ManageMentPlanEntity entity = strEntity.ToObject<MP_ManageMentPlanEntity>();
+            entity.MPType = 0;
+            mP_ManagementPlanIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult UploadForm(string keyValue, string strEntity)
+        {
+            MP_ManageMentPlanEntity entity = strEntity.ToObject<MP_ManageMentPlanEntity>();
+            if (!string.IsNullOrEmpty(keyValue))
+            {
+                var entity2 = mP_ManagementPlanIBLL.GetMP_ManageMentPlanEntity(keyValue);
+                if (!string.IsNullOrEmpty(entity.MPFileTwo))
+                {
+                    entity.MPStatus = 0;//已提交
+                    entity.MPUploadTimes = $"{DateTime.Now.ToString()},   {entity2.MPUploadTimes}";
+                    entity.SUpdateTime = entity2.SUpdateTime + 1;
+                }
+
+            }
+            else
+            {
+                entity.Create();
+                if (!string.IsNullOrEmpty(entity.MPFileTwo))
+                {
+                    entity.MPStatus = 0;//已提交
+                    entity.MPUploadTimes = DateTime.Now.ToString();
+                    entity.SUpdateTime = 1;
+                    entity.MPType = 0;
+                }
+
+            }
+
+            entity.MPUploaderTwo = LoginUserInfo.Get().userId;
+            mP_ManagementPlanIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        public void PushWeixin(string MPId)
+        {
+            var title = "";
+            //获取内控模板信息
+            var mpEntity = mP_ManagementPlanIBLL.GetMP_ManageMentPlanEntity(MPId);
+            //根据部门获取所有需要推送的人员
+            var UserList = new List<UserEntity>();
+            if (mpEntity != null)
+            {
+                var departmentList = mpEntity.MPDepartment.Split(',').ToList();
+                foreach (var departmentId in departmentList)
+                {
+                    var entityList=userIBLL.GetListByDepartmentId(departmentId);
+                    if (entityList.Count>0)
+                    {
+                        UserList.Union(entityList);
+                    }
+                }
+
+
+                switch (mpEntity.MPType)
+                {
+                    case 0:
+                        title = "您有内控检查材料需要上传，请查看";
+                        break;
+                    case 1:
+                        title = "您有绩效测试材料需要上传，请查看";
+                        break;
+                    case 2:
+                        title = "您有质量测试材料需要上传，请查看";
+                        break;
+                }
+            }
+
+           
+
+
+            var WeChatConfigentity = weChatConfigIbll.GetEnableEntity();
+            string appid = WeChatConfigentity.APPId;
+            string secret = WeChatConfigentity.secret;
+            var wechatemplete = weChatTempletIbll.GetWeChatTemplateEntityByCodeConfigId(WeChatConfigentity.ID, "task");
+            string weixintaskurl = wechatemplete.TUrl;
+            string weixintasktempid = wechatemplete.TempId;
+            var responsejson = Util.HttpMethods.HttpGet("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret);
+
+            OperateLogModel operateLogModel = new OperateLogModel();
+            operateLogModel.title = title;
+            operateLogModel.type = OperationType.Other;
+            operateLogModel.url = "NoticeController";
+            operateLogModel.sourceObjectId = "002";
+            operateLogModel.sourceContentJson = responsejson;
+            OperatorHelper.Instance.WriteOperateLog(operateLogModel);
+
+            foreach (UserEntity userinfo in UserList)
+            {
+                if (userinfo != null && !string.IsNullOrEmpty(userinfo.OpenIdForWeixin))
+                {
+                    //执行推送任务
+                    if (!string.IsNullOrEmpty(appid) && !string.IsNullOrEmpty(secret) && !string.IsNullOrEmpty(weixintaskurl) && !string.IsNullOrEmpty(weixintasktempid))
+                    {
+                        if (!string.IsNullOrEmpty(responsejson))
+                        {
+                            var weixintokenobj = JsonConvert.DeserializeObject<dynamic>(responsejson);
+                            if (string.IsNullOrEmpty(weixintokenobj.errcode))
+                            {
+                                string access_token = weixintokenobj.access_token;
+                                string jsondata = "{\"touser\":\"" + userinfo.OpenIdForWeixin + "\"," +
+                                "\"template_id\":\"" + weixintasktempid + "\"," +
+                                "\"url\":\"" + weixintaskurl + "\"," +
+                                "\"data\":{" +
+                                "\"first\": {\"value\":\"您有新的未读通知公告\",\"color\":\"#173177\"}," +
+                                "\"keyword1\":{\"value\":\"未读通知公告\",\"color\":\"#173177\"}," +
+                                "\"keyword2\": {\"value\":\"" + title + "\",\"color\":\"#173177\"}," +
+                                "\"keyword3\": {\"value\":\"待查看\",\"color\":\"#173177\"}," +
+                                "\"keyword4\": {\"value\":\"您有新的未读通知公告【" + title + "】\",\"color\":\"#173177\"}" +
+                                "}" +
+                            "}";
+                                string pushresult = Util.HttpMethods.HttpPost("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + access_token, jsondata);
+                                
+                                operateLogModel.title = title;
+                                operateLogModel.type = OperationType.Other;
+                                operateLogModel.url = "NoticeController";
+                                operateLogModel.sourceObjectId = "002";
+                                operateLogModel.sourceContentJson = pushresult;
+                                OperatorHelper.Instance.WriteOperateLog(operateLogModel);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_PerformanceTrackingController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_PerformanceTrackingController.cs
new file mode 100644
index 000000000..c8b62e793
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_PerformanceTrackingController.cs	
@@ -0,0 +1,206 @@
+using System;
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using ClosedXML.Excel;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 力软敏捷开发框架 
+    /// Copyright (c) 2013-2018 上海力软信息技术有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-09-24 15:35
+    /// 描 述：绩效跟踪
+    /// </summary>
+    public class MP_PerformanceTrackingController : MvcControllerBase
+    {
+        private MP_PerformanceTrackingIBLL mP_PerformanceTrackingIBLL = new MP_PerformanceTrackingBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 管理员页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexManagement()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 提交材料页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexChildren()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 提交材料页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult UploadForm()
+        {
+            return View();
+        }
+
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = mP_PerformanceTrackingIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var MP_ManageMentPlanData = mP_PerformanceTrackingIBLL.GetMP_ManageMentPlanEntity(keyValue);
+            var jsonData = new
+            {
+                MP_ManageMentPlan = MP_ManageMentPlanData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            mP_PerformanceTrackingIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+
+        /// <summary>
+        /// 合格/不合格
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult Qqualified(string keyValue,bool status)
+        {
+            var entity = mP_PerformanceTrackingIBLL.GetMP_ManageMentPlanEntity(keyValue);
+            entity.MPConclusion = status?1:0;
+            mP_PerformanceTrackingIBLL.SaveEntity(keyValue,entity);
+            return Success("操作成功！");
+        }
+
+
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            MP_ManageMentPlanEntity entity = strEntity.ToObject<MP_ManageMentPlanEntity>();
+            entity.MPType = 1;
+            mP_PerformanceTrackingIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult UploadForm(string keyValue, string strEntity)
+        {
+            MP_ManageMentPlanEntity entity = strEntity.ToObject<MP_ManageMentPlanEntity>();
+            if (!string.IsNullOrEmpty(keyValue))
+            {
+                var entity2 = mP_PerformanceTrackingIBLL.GetMP_ManageMentPlanEntity(keyValue);
+                if (!string.IsNullOrEmpty(entity.MPFileTwo))
+                {
+                    entity.MPStatus = 0;//已提交
+                    entity.MPUploadTimes = $"{DateTime.Now.ToString()},   {entity2.MPUploadTimes}";
+                    entity.SUpdateTime = entity2.SUpdateTime + 1;
+                }
+
+            }
+            else
+            {
+                entity.Create();
+                if (!string.IsNullOrEmpty(entity.MPFileTwo))
+                {
+                    entity.MPStatus = 0;//已提交
+                    entity.MPUploadTimes = DateTime.Now.ToString();
+                    entity.SUpdateTime = 1;
+                    entity.MPType = 1;
+                }
+
+            }
+
+            entity.MPUploaderTwo = LoginUserInfo.Get().userId;
+
+
+            mP_PerformanceTrackingIBLL.SaveEntity(keyValue, entity);
+            return Success("提交成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_QualityObjectivesController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_QualityObjectivesController.cs
new file mode 100644
index 000000000..90a357c94
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_QualityObjectivesController.cs	
@@ -0,0 +1,261 @@
+using System;
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using Learun.Application.Base.SystemModule;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 力软敏捷开发框架 
+    /// Copyright (c) 2013-2018 上海力软信息技术有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-09-24 15:37
+    /// 描 述：质量目标管理计划
+    /// </summary>
+    public class MP_QualityObjectivesController : MvcControllerBase
+    {
+        private MP_QualityObjectivesIBLL mP_QualityObjectivesIBLL = new MP_QualityObjectivesBLL();
+        private MP_BrowseRecordIBLL mpBrowseRecordIbll = new MP_BrowseRecordBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 管理员页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexManagement()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 提交材料页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexChildren()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult UploadForm()
+        {
+            return View();
+        }
+
+
+
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = mP_QualityObjectivesIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var MP_ManageMentPlanData = mP_QualityObjectivesIBLL.GetMP_ManageMentPlanEntity(keyValue);
+            var jsonData = new
+            {
+                MP_ManageMentPlan = MP_ManageMentPlanData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            mP_QualityObjectivesIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+
+        /// <summary>
+        /// 合格/不合格
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult Qqualified(string keyValue, bool status)
+        {
+            var entity = mP_QualityObjectivesIBLL.GetMP_ManageMentPlanEntity(keyValue);
+            entity.MPConclusion = status?1:0;
+            mP_QualityObjectivesIBLL.SaveEntity(keyValue, entity);
+            return Success("删除成功！");
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            MP_ManageMentPlanEntity entity = strEntity.ToObject<MP_ManageMentPlanEntity>();
+            entity.MPType = 2;
+            mP_QualityObjectivesIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult UploadForm(string keyValue, string strEntity)
+        {
+            MP_ManageMentPlanEntity entity = strEntity.ToObject<MP_ManageMentPlanEntity>();
+            if (!string.IsNullOrEmpty(keyValue))
+            {
+                var entity2 = mP_QualityObjectivesIBLL.GetMP_ManageMentPlanEntity(keyValue);
+                if (!string.IsNullOrEmpty(entity.MPFileTwo))
+                {
+                    entity.MPStatus = 0;//已提交
+                    entity.MPUploadTimes = $"{DateTime.Now.ToString()},   {entity2.MPUploadTimes}";
+                    entity.SUpdateTime = entity2.SUpdateTime + 1;
+                }
+
+            }
+            else
+            {
+                entity.Create();
+                if (!string.IsNullOrEmpty(entity.MPFileTwo))
+                {
+                    entity.MPStatus = 0;//已提交
+                    entity.MPUploadTimes = DateTime.Now.ToString();
+                    entity.SUpdateTime = 1;
+                    entity.MPType = 2;
+                }
+
+            }
+
+            entity.MPUploaderTwo = LoginUserInfo.Get().userId;
+
+
+
+            mP_QualityObjectivesIBLL.SaveEntity(keyValue, entity);
+            return Success("提交成功！");
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult AddRecord(string fileId)
+        {
+            var loginUser = LoginUserInfo.Get();
+
+            var entity = mP_QualityObjectivesIBLL.GetMP_ManageMentPlanEntityByFileTwo(fileId);
+            var record = new MP_BrowseRecordEntity();
+            record.MPId = entity.MPId;
+            record.BRViewTime = DateTime.Now;
+            record.BRViewers = loginUser.userId;
+            record.BRViewerAddress = loginUser.iPAddress;
+            record.Create();
+            mpBrowseRecordIbll.SaveEntity("", record);
+
+            return Success("提交成功！");
+        }
+
+
+        /// <summary>
+        /// 保存文件浏览记录
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult AddFileRecord(string fileId)
+        {
+            var loginUser = LoginUserInfo.Get();
+
+            var record = new MP_BrowseRecordEntity();
+            record.FileId = fileId;
+            record.Department = loginUser.departmentId;
+            record.BRViewTime = DateTime.Now;
+            record.BRViewers = loginUser.userId;
+            record.BRViewerAddress = loginUser.iPAddress;
+            record.Create();
+            mpBrowseRecordIbll.SaveEntity("", record);
+
+            return Success("提交成功！");
+        }
+
+
+
+
+
+
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs
index 590a8783e..fec54ffd9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs	
@@ -56,15 +56,6 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             return View();
         }
-        /// <summary>
-        /// 主页面-我申请的会议
-        /// <summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult IndexOfMyJoin()
-        {
-            return View();
-        }
         #endregion
 
         #region 获取数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ResearchMentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs
similarity index 70%
rename from Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ResearchMentController.cs
rename to Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs
index b444856f3..a6a5233fd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ResearchMentController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs	
@@ -3,7 +3,6 @@ using System.Data;
 using Learun.Application.TwoDevelopment.PersonnelManagement;
 using System.Web.Mvc;
 using System.Collections.Generic;
-using System;
 
 namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
 {
@@ -11,12 +10,12 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2021-05-08 18:08
-    /// 描 述：教科研人员管理
+    /// 日 期：2021-03-08 10:36
+    /// 描 述：会议纪要
     /// </summary>
-    public class ResearchMentController : MvcControllerBase
+    public class MeetingMinutesController : MvcControllerBase
     {
-        private ResearchMentIBLL researchMentIBLL = new ResearchMentBLL();
+        private MeetingMinutesIBLL meetingMinutesIBLL = new MeetingMinutesBLL();
 
         #region 视图功能
 
@@ -43,8 +42,8 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         #region 获取数据
 
         /// <summary>
-        /// 获取页面显示列表数据
-        /// </summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
         /// <param name="pagination">分页参数</param>
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
@@ -53,7 +52,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult GetPageList(string pagination, string queryJson)
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = researchMentIBLL.GetPageList(paginationobj, queryJson);
+            var data = meetingMinutesIBLL.GetPageList(paginationobj, queryJson);
             var jsonData = new
             {
                 rows = data,
@@ -64,17 +63,28 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             return Success(jsonData);
         }
         /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = meetingMinutesIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
         /// 获取表单数据
-        /// </summary>
-        /// <param name="keyValue">主键</param>
+        /// <summary>
         /// <returns></returns>
         [HttpGet]
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var ResearchMentData = researchMentIBLL.GetResearchMentEntity( keyValue );
+            var MeetingMinutesData = meetingMinutesIBLL.GetMeetingMinutesEntity( keyValue );
             var jsonData = new {
-                ResearchMent = ResearchMentData,
+                MeetingMinutes = MeetingMinutesData,
             };
             return Success(jsonData);
         }
@@ -84,31 +94,27 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
 
         /// <summary>
         /// 删除实体数据
-        /// </summary>
         /// <param name="keyValue">主键</param>
+        /// <summary>
         /// <returns></returns>
         [HttpPost]
         [AjaxOnly]
         public ActionResult DeleteForm(string keyValue)
         {
-            researchMentIBLL.DeleteEntity(keyValue);
+            meetingMinutesIBLL.DeleteEntity(keyValue);
             return Success("删除成功！");
         }
         /// <summary>
         /// 保存实体数据（新增、修改）
-        /// </summary>
         /// <param name="keyValue">主键</param>
-        /// <param name="strEntity">实体</param>
+        /// <summary>
         /// <returns></returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
-            UserInfo userInfo = LoginUserInfo.Get();
-            MeetingMinutesEntity entity = strEntity.ToObject<MeetingMinutesEntity>();
-            entity.CreateTime = DateTime.Now;
-            entity.CreateUser = userInfo.userId;
+            UserInfo userInfo = LoginUserInfo.Get();            MeetingMinutesEntity entity = strEntity.ToObject<MeetingMinutesEntity>();
             meetingMinutesIBLL.SaveEntity(userInfo,keyValue,entity);
             return Success("保存成功！");
         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs
new file mode 100644
index 000000000..f899ed8c9
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs	
@@ -0,0 +1,138 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-02-21 10:16
+    /// 描 述：会议签到记录
+    /// </summary>
+    public class MeetingSignInRecordController : MvcControllerBase
+    {
+        private MeetingSignInRecordIBLL meetingSignInRecordIBLL = new MeetingSignInRecordBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = meetingSignInRecordIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = meetingSignInRecordIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var MeetingSignInRecordData = meetingSignInRecordIBLL.GetMeetingSignInRecordEntity(keyValue);
+            var jsonData = new
+            {
+                MeetingSignInRecord = MeetingSignInRecordData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            meetingSignInRecordIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            UserInfo userInfo = LoginUserInfo.Get(); MeetingSignInRecordEntity entity = strEntity.ToObject<MeetingSignInRecordEntity>();
+            meetingSignInRecordIBLL.SaveEntity(userInfo, keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        /// <summary>
+        /// 签到实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoSignIn(string keyValue, bool isSignIn)
+        {
+            meetingSignInRecordIBLL.DoSignIn(keyValue, isSignIn);
+            return Success("操作成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/OfficialSealManagerController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/OfficialSealManagerController.cs
new file mode 100644
index 000000000..b9163ad8a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/OfficialSealManagerController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-11-19 16:01
+    /// 描 述：公章管理
+    /// </summary>
+    public class OfficialSealManagerController : MvcControllerBase
+    {
+        private OfficialSealManagerIBLL officialSealManagerIBLL = new OfficialSealManagerBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = officialSealManagerIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var OfficialSealManagerData = officialSealManagerIBLL.GetOfficialSealManagerEntity( keyValue );
+            var jsonData = new {
+                OfficialSealManager = OfficialSealManagerData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            officialSealManagerIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            OfficialSealManagerEntity entity = strEntity.ToObject<OfficialSealManagerEntity>();
+            officialSealManagerIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/OvertimeApplicationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/OvertimeApplicationController.cs
new file mode 100644
index 000000000..9fda816bb
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/OvertimeApplicationController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-18 10:04
+    /// 描 述：加班申请
+    /// </summary>
+    public class OvertimeApplicationController : MvcControllerBase
+    {
+        private OvertimeApplicationIBLL overtimeApplicationIBLL = new OvertimeApplicationBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = overtimeApplicationIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var JbjiabanData = overtimeApplicationIBLL.GetJbjiabanEntity( keyValue );
+            var jsonData = new {
+                Jbjiaban = JbjiabanData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            overtimeApplicationIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            JbjiabanEntity entity = strEntity.ToObject<JbjiabanEntity>();
+            overtimeApplicationIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMActivistsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMActivistsController.cs
new file mode 100644
index 000000000..39b8cf303
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMActivistsController.cs	
@@ -0,0 +1,116 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-08-10 10:05
+    /// 描 述：入党积极分子管理
+    /// </summary>
+    public class PMActivistsController : MvcControllerBase
+    {
+        private PMActivistsIBLL pMActivistsIBLL = new PMActivistsBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pMActivistsIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PMActivistsData = pMActivistsIBLL.GetPMActivistsEntity(keyValue);
+            var jsonData = new
+            {
+                PMActivists = PMActivistsData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            pMActivistsIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            var userInfo = LoginUserInfo.Get();
+            PMActivistsEntity entity = strEntity.ToObject<PMActivistsEntity>();
+            entity.CreateUserId = userInfo.userId;
+            entity.CreateTime = DateTime.Now;
+            pMActivistsIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMCadreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMCadreController.cs
new file mode 100644
index 000000000..47a978291
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMCadreController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-31 10:32
+    /// 描 述：党干部管理
+    /// </summary>
+    public class PMCadreController : MvcControllerBase
+    {
+        private PMCadreIBLL pMCadreIBLL = new PMCadreBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pMCadreIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PMCadreData = pMCadreIBLL.GetPMCadreEntity( keyValue );
+            var jsonData = new {
+                PMCadre = PMCadreData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            pMCadreIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            PMCadreEntity entity = strEntity.ToObject<PMCadreEntity>();
+            pMCadreIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMDuesController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMDuesController.cs
new file mode 100644
index 000000000..85193714e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMDuesController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-31 10:42
+    /// 描 述：党费管理
+    /// </summary>
+    public class PMDuesController : MvcControllerBase
+    {
+        private PMDuesIBLL pMDuesIBLL = new PMDuesBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pMDuesIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PMDuesData = pMDuesIBLL.GetPMDuesEntity( keyValue );
+            var jsonData = new {
+                PMDues = PMDuesData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            pMDuesIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            PMDuesEntity entity = strEntity.ToObject<PMDuesEntity>();
+            pMDuesIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMLearnArrangementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMLearnArrangementController.cs
new file mode 100644
index 000000000..9c9220327
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMLearnArrangementController.cs	
@@ -0,0 +1,112 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-11-19 15:37
+    /// 描 述：党员学习安排
+    /// </summary>
+    public class PMLearnArrangementController : MvcControllerBase
+    {
+        private PMLearnArrangementIBLL pMLearnArrangementIBLL = new PMLearnArrangementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pMLearnArrangementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PMLearnArrangementData = pMLearnArrangementIBLL.GetPMLearnArrangementEntity( keyValue );
+            var jsonData = new {
+                PMLearnArrangement = PMLearnArrangementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            pMLearnArrangementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        [ValidateInput(false)]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            PMLearnArrangementEntity entity = strEntity.ToObject<PMLearnArrangementEntity>();
+            pMLearnArrangementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMLifeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMLifeController.cs
new file mode 100644
index 000000000..2c97c8199
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMLifeController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-31 10:40
+    /// 描 述：党组织生活管理
+    /// </summary>
+    public class PMLifeController : MvcControllerBase
+    {
+        private PMLifeIBLL pMLifeIBLL = new PMLifeBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pMLifeIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PMLifeData = pMLifeIBLL.GetPMLifeEntity( keyValue );
+            var jsonData = new {
+                PMLife = PMLifeData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            pMLifeIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            PMLifeEntity entity = strEntity.ToObject<PMLifeEntity>();
+            pMLifeIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMMeetingController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMMeetingController.cs
new file mode 100644
index 000000000..95120f15d
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMMeetingController.cs	
@@ -0,0 +1,115 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-08-10 10:02
+    /// 描 述：党建会议管理
+    /// </summary>
+    public class PMMeetingController : MvcControllerBase
+    {
+        private PMMeetingIBLL pMMeetingIBLL = new PMMeetingBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pMMeetingIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PMMeetingData = pMMeetingIBLL.GetPMMeetingEntity( keyValue );
+            var jsonData = new {
+                PMMeeting = PMMeetingData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            pMMeetingIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            var userInfo = LoginUserInfo.Get();
+            PMMeetingEntity entity = strEntity.ToObject<PMMeetingEntity>();
+            entity.CreateUserId = userInfo.userId;
+            entity.CreateTime = DateTime.Now;
+            pMMeetingIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMMembershipChangeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMMembershipChangeController.cs
new file mode 100644
index 000000000..6aba55cfd
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMMembershipChangeController.cs	
@@ -0,0 +1,118 @@
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using Learun.Util;
+using System.Data;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-28 16:19
+    /// 描 述：党籍异动管理
+    /// </summary>
+    public class PMMembershipChangeController : MvcControllerBase
+    {
+        private PMMembershipChangeIBLL pMMembershipChangeIBLL = new PMMembershipChangeBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = pMMembershipChangeIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pMMembershipChangeIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = pMMembershipChangeIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            pMMembershipChangeIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,PMMembershipChangeEntity entity)
+        {
+            pMMembershipChangeIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMMembershipController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMMembershipController.cs
new file mode 100644
index 000000000..8f38f986c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMMembershipController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-31 10:38
+    /// 描 述：党籍管理
+    /// </summary>
+    public class PMMembershipController : MvcControllerBase
+    {
+        private PMMembershipIBLL pMMembershipIBLL = new PMMembershipBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pMMembershipIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PMMembershipData = pMMembershipIBLL.GetPMMembershipEntity( keyValue );
+            var jsonData = new {
+                PMMembership = PMMembershipData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            pMMembershipIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            PMMembershipEntity entity = strEntity.ToObject<PMMembershipEntity>();
+            pMMembershipIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMOrganizationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMOrganizationController.cs
new file mode 100644
index 000000000..bbac1a387
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PMOrganizationController.cs	
@@ -0,0 +1,122 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-31 10:25
+    /// 描 述：党组织管理架构表
+    /// </summary>
+    public class PMOrganizationController : MvcControllerBase
+    {
+        private PMOrganizationIBLL pMOrganizationIBLL = new PMOrganizationBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pMOrganizationIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PMOrganizationData = pMOrganizationIBLL.GetPMOrganizationEntity( keyValue );
+            var jsonData = new {
+                PMOrganization = PMOrganizationData,
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取左侧树形数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetTree()
+        {
+            var data = pMOrganizationIBLL.GetTree();
+            return Success(data);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            pMOrganizationIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            PMOrganizationEntity entity = strEntity.ToObject<PMOrganizationEntity>();
+            pMOrganizationIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ResearchGERController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberController.cs
similarity index 67%
rename from Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ResearchGERController.cs
rename to Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberController.cs
index 0c7093fe4..5774a2863 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ResearchGERController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberController.cs	
@@ -7,23 +7,23 @@ using System.Collections.Generic;
 namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
 {
     /// <summary>
-    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
-    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
     /// 创 建：超级管理员
-    /// 日 期：2021-05-08 18:17
-    /// 描 述：教科研组管理
+    /// 日 期：2019-11-19 15:35
+    /// 描 述：党员信息管理
     /// </summary>
-    public class ResearchGERController : MvcControllerBase
+    public class PartyMemberController : MvcControllerBase
     {
-        private ResearchGERIBLL researchGERIBLL = new ResearchGERBLL();
+        private PartyMemberIBLL partyMemberIBLL = new PartyMemberBLL();
 
-        #region 视图功能
+        #region  视图功能
 
         /// <summary>
         /// 主页面
         /// <summary>
         /// <returns></returns>
-        [HttpGet]   
+        [HttpGet]
         public ActionResult Index()
         {
              return View();
@@ -39,12 +39,11 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         }
         #endregion
 
-        #region 获取数据
+        #region  获取数据
 
         /// <summary>
         /// 获取页面显示列表数据
-        /// </summary>
-        /// <param name="pagination">分页参数</param>
+        /// <summary>
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         [HttpGet]
@@ -52,7 +51,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult GetPageList(string pagination, string queryJson)
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = researchGERIBLL.GetPageList(paginationobj, queryJson);
+            var data = partyMemberIBLL.GetPageList(paginationobj, queryJson);
             var jsonData = new
             {
                 rows = data,
@@ -64,51 +63,46 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         }
         /// <summary>
         /// 获取表单数据
-        /// </summary>
-        /// <param name="keyValue">主键</param>
+        /// <summary>
         /// <returns></returns>
         [HttpGet]
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var ResearchGERData = researchGERIBLL.GetResearchGEREntity( keyValue );
+            var PartyMemberData = partyMemberIBLL.GetPartyMemberEntity( keyValue );
             var jsonData = new {
-                ResearchGER = ResearchGERData,
+                PartyMember = PartyMemberData,
             };
             return Success(jsonData);
         }
         #endregion
 
-        #region 提交数据
+        #region  提交数据
 
         /// <summary>
         /// 删除实体数据
-        /// </summary>
         /// <param name="keyValue">主键</param>
+        /// <summary>
         /// <returns></returns>
         [HttpPost]
         [AjaxOnly]
         public ActionResult DeleteForm(string keyValue)
         {
-            researchGERIBLL.DeleteEntity(keyValue);
+            partyMemberIBLL.DeleteEntity(keyValue);
             return Success("删除成功！");
         }
         /// <summary>
         /// 保存实体数据（新增、修改）
-        /// </summary>
         /// <param name="keyValue">主键</param>
-        /// <param name="strEntity">实体</param>
+        /// <summary>
         /// <returns></returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
-            ResearchGEREntity entity = strEntity.ToObject<ResearchGEREntity>();
-            researchGERIBLL.SaveEntity(keyValue,entity);
-            if (string.IsNullOrEmpty(keyValue))
-            {
-            }
+            PartyMemberEntity entity = strEntity.ToObject<PartyMemberEntity>();
+            partyMemberIBLL.SaveEntity(keyValue,entity);
             return Success("保存成功！");
         }
         #endregion
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberEncouragementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberEncouragementController.cs
new file mode 100644
index 000000000..ca951b698
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberEncouragementController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-28 16:07
+    /// 描 述：党员奖励管理
+    /// </summary>
+    public class PartyMemberEncouragementController : MvcControllerBase
+    {
+        private PartyMemberEncouragementIBLL partyMemberEncouragementIBLL = new PartyMemberEncouragementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = partyMemberEncouragementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PartyMemberEncouragementData = partyMemberEncouragementIBLL.GetPartyMemberEncouragementEntity( keyValue );
+            var jsonData = new {
+                PartyMemberEncouragement = PartyMemberEncouragementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            partyMemberEncouragementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            PartyMemberEncouragementEntity entity = strEntity.ToObject<PartyMemberEncouragementEntity>();
+            partyMemberEncouragementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberPunishmentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberPunishmentController.cs
new file mode 100644
index 000000000..061e972e2
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberPunishmentController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-28 16:12
+    /// 描 述：党员处分管理
+    /// </summary>
+    public class PartyMemberPunishmentController : MvcControllerBase
+    {
+        private PartyMemberPunishmentIBLL partyMemberPunishmentIBLL = new PartyMemberPunishmentBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = partyMemberPunishmentIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PartyMemberPunishmentData = partyMemberPunishmentIBLL.GetPartyMemberPunishmentEntity( keyValue );
+            var jsonData = new {
+                PartyMemberPunishment = PartyMemberPunishmentData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            partyMemberPunishmentIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            PartyMemberPunishmentEntity entity = strEntity.ToObject<PartyMemberPunishmentEntity>();
+            partyMemberPunishmentIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberTrainController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberTrainController.cs
new file mode 100644
index 000000000..f41d83df8
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/PartyMemberTrainController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-28 16:29
+    /// 描 述：党校培训
+    /// </summary>
+    public class PartyMemberTrainController : MvcControllerBase
+    {
+        private PartyMemberTrainIBLL partyMemberTrainIBLL = new PartyMemberTrainBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = partyMemberTrainIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PartyMemberTrainData = partyMemberTrainIBLL.GetPartyMemberTrainEntity( keyValue );
+            var jsonData = new {
+                PartyMemberTrain = PartyMemberTrainData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            partyMemberTrainIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            PartyMemberTrainEntity entity = strEntity.ToObject<PartyMemberTrainEntity>();
+            partyMemberTrainIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRAchievementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRAchievementController.cs
new file mode 100644
index 000000000..702fb1e0e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRAchievementController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 14:46
+    /// 描 述：成果管理
+    /// </summary>
+    public class SRAchievementController : MvcControllerBase
+    {
+        private SRAchievementIBLL sRAchievementIBLL = new SRAchievementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRAchievementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRAchievementData = sRAchievementIBLL.GetSRAchievementEntity( keyValue );
+            var jsonData = new {
+                SRAchievement = SRAchievementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRAchievementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRAchievementEntity entity = strEntity.ToObject<SRAchievementEntity>();
+            sRAchievementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRAppraisalController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRAppraisalController.cs
new file mode 100644
index 000000000..6c56fbc6d
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRAppraisalController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-31 10:59
+    /// 描 述：鉴定结果
+    /// </summary>
+    public class SRAppraisalController : MvcControllerBase
+    {
+        private SRAppraisalIBLL sRAppraisalIBLL = new SRAppraisalBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRAppraisalIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRAppraisalData = sRAppraisalIBLL.GetSRAppraisalEntity( keyValue );
+            var jsonData = new {
+                SRAppraisal = SRAppraisalData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRAppraisalIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRAppraisalEntity entity = strEntity.ToObject<SRAppraisalEntity>();
+            sRAppraisalIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRConferenceController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRConferenceController.cs
new file mode 100644
index 000000000..d017e8c41
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRConferenceController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-31 10:57
+    /// 描 述：学术会议
+    /// </summary>
+    public class SRConferenceController : MvcControllerBase
+    {
+        private SRConferenceIBLL sRConferenceIBLL = new SRConferenceBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRConferenceIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRConferenceData = sRConferenceIBLL.GetSRConferenceEntity( keyValue );
+            var jsonData = new {
+                SRConference = SRConferenceData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRConferenceIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRConferenceEntity entity = strEntity.ToObject<SRConferenceEntity>();
+            sRConferenceIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRDocumentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRDocumentController.cs
new file mode 100644
index 000000000..8d39a6501
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRDocumentController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 14:57
+    /// 描 述：文档管理
+    /// </summary>
+    public class SRDocumentController : MvcControllerBase
+    {
+        private SRDocumentIBLL sRDocumentIBLL = new SRDocumentBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRDocumentIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRDocumentData = sRDocumentIBLL.GetSRDocumentEntity( keyValue );
+            var jsonData = new {
+                SRDocument = SRDocumentData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRDocumentIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRDocumentEntity entity = strEntity.ToObject<SRDocumentEntity>();
+            sRDocumentIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SREncouragementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SREncouragementController.cs
new file mode 100644
index 000000000..f882555d8
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SREncouragementController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 14:54
+    /// 描 述：教科研奖励
+    /// </summary>
+    public class SREncouragementController : MvcControllerBase
+    {
+        private SREncouragementIBLL sREncouragementIBLL = new SREncouragementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sREncouragementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SREncouragementData = sREncouragementIBLL.GetSREncouragementEntity( keyValue );
+            var jsonData = new {
+                SREncouragement = SREncouragementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sREncouragementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SREncouragementEntity entity = strEntity.ToObject<SREncouragementEntity>();
+            sREncouragementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRFeesExpendController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRFeesExpendController.cs
new file mode 100644
index 000000000..6ea7a4e4e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRFeesExpendController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 14:37
+    /// 描 述：使用明细
+    /// </summary>
+    public class SRFeesExpendController : MvcControllerBase
+    {
+        private SRFeesExpendIBLL sRFeesExpendIBLL = new SRFeesExpendBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRFeesExpendIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRFeesExpendData = sRFeesExpendIBLL.GetSRFeesExpendEntity( keyValue );
+            var jsonData = new {
+                SRFeesExpend = SRFeesExpendData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRFeesExpendIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRFeesExpendEntity entity = strEntity.ToObject<SRFeesExpendEntity>();
+            sRFeesExpendIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRFeesIncomeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRFeesIncomeController.cs
new file mode 100644
index 000000000..584471649
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRFeesIncomeController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 14:34
+    /// 描 述：入账明细
+    /// </summary>
+    public class SRFeesIncomeController : MvcControllerBase
+    {
+        private SRFeesIncomeIBLL sRFeesIncomeIBLL = new SRFeesIncomeBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRFeesIncomeIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRFeesIncomeData = sRFeesIncomeIBLL.GetSRFeesIncomeEntity( keyValue );
+            var jsonData = new {
+                SRFeesIncome = SRFeesIncomeData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRFeesIncomeIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRFeesIncomeEntity entity = strEntity.ToObject<SRFeesIncomeEntity>();
+            sRFeesIncomeIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRFinalController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRFinalController.cs
new file mode 100644
index 000000000..eb4d1a900
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRFinalController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 14:41
+    /// 描 述：结题管理
+    /// </summary>
+    public class SRFinalController : MvcControllerBase
+    {
+        private SRFinalIBLL sRFinalIBLL = new SRFinalBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRFinalIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRFinalData = sRFinalIBLL.GetSRFinalEntity( keyValue );
+            var jsonData = new {
+                SRFinal = SRFinalData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRFinalIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRFinalEntity entity = strEntity.ToObject<SRFinalEntity>();
+            sRFinalIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRPaperController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRPaperController.cs
new file mode 100644
index 000000000..73a13d3fa
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRPaperController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-31 10:54
+    /// 描 述：科技论文
+    /// </summary>
+    public class SRPaperController : MvcControllerBase
+    {
+        private SRPaperIBLL sRPaperIBLL = new SRPaperBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRPaperIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRPaperData = sRPaperIBLL.GetSRPaperEntity( keyValue );
+            var jsonData = new {
+                SRPaper = SRPaperData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRPaperIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRPaperEntity entity = strEntity.ToObject<SRPaperEntity>();
+            sRPaperIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProcessController.cs
new file mode 100644
index 000000000..c5a5b5c50
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProcessController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 14:39
+    /// 描 述：过程管理
+    /// </summary>
+    public class SRProcessController : MvcControllerBase
+    {
+        private SRProcessIBLL sRProcessIBLL = new SRProcessBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRProcessIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRProcessData = sRProcessIBLL.GetSRProcessEntity( keyValue );
+            var jsonData = new {
+                SRProcess = SRProcessData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRProcessIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRProcessEntity entity = strEntity.ToObject<SRProcessEntity>();
+            sRProcessIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectApplyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectApplyController.cs
new file mode 100644
index 000000000..537589401
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectApplyController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 14:27
+    /// 描 述：教科研项目申报
+    /// </summary>
+    public class SRProjectApplyController : MvcControllerBase
+    {
+        private SRProjectApplyIBLL sRProjectApplyIBLL = new SRProjectApplyBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRProjectApplyIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRProjectApplyData = sRProjectApplyIBLL.GetSRProjectApplyEntity( keyValue );
+            var jsonData = new {
+                SRProjectApply = SRProjectApplyData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRProjectApplyIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRProjectApplyEntity entity = strEntity.ToObject<SRProjectApplyEntity>();
+            sRProjectApplyIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectController.cs
new file mode 100644
index 000000000..b35745ad4
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-31 10:49
+    /// 描 述：科技项目
+    /// </summary>
+    public class SRProjectController : MvcControllerBase
+    {
+        private SRProjectIBLL sRProjectIBLL = new SRProjectBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRProjectIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRProjectData = sRProjectIBLL.GetSRProjectEntity( keyValue );
+            var jsonData = new {
+                SRProject = SRProjectData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRProjectIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRProjectEntity entity = strEntity.ToObject<SRProjectEntity>();
+            sRProjectIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectSetUpController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectSetUpController.cs
new file mode 100644
index 000000000..5de199a82
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectSetUpController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 14:31
+    /// 描 述：项目立项
+    /// </summary>
+    public class SRProjectSetUpController : MvcControllerBase
+    {
+        private SRProjectSetUpIBLL sRProjectSetUpIBLL = new SRProjectSetUpBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRProjectSetUpIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRProjectSetUpData = sRProjectSetUpIBLL.GetSRProjectSetUpEntity( keyValue );
+            var jsonData = new {
+                SRProjectSetUp = SRProjectSetUpData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRProjectSetUpIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRProjectSetUpEntity entity = strEntity.ToObject<SRProjectSetUpEntity>();
+            sRProjectSetUpIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWinningController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWinningController.cs
new file mode 100644
index 000000000..0bf802ba5
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWinningController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 14:49
+    /// 描 述：获奖管理
+    /// </summary>
+    public class SRWinningController : MvcControllerBase
+    {
+        private SRWinningIBLL sRWinningIBLL = new SRWinningBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRWinningIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRWinningData = sRWinningIBLL.GetSRWinningEntity( keyValue );
+            var jsonData = new {
+                SRWinning = SRWinningData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRWinningIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRWinningEntity entity = strEntity.ToObject<SRWinningEntity>();
+            sRWinningIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkController.cs
new file mode 100644
index 000000000..e3b57712b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-12-31 10:52
+    /// 描 述：科技著作
+    /// </summary>
+    public class SRWorkController : MvcControllerBase
+    {
+        private SRWorkIBLL sRWorkIBLL = new SRWorkBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRWorkIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRWorkData = sRWorkIBLL.GetSRWorkEntity( keyValue );
+            var jsonData = new {
+                SRWork = SRWorkData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRWorkIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRWorkEntity entity = strEntity.ToObject<SRWorkEntity>();
+            sRWorkIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkloadController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkloadController.cs
new file mode 100644
index 000000000..6c2d5926e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkloadController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 14:52
+    /// 描 述：教科研工作量计算
+    /// </summary>
+    public class SRWorkloadController : MvcControllerBase
+    {
+        private SRWorkloadIBLL sRWorkloadIBLL = new SRWorkloadBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRWorkloadIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SRWorkloadData = sRWorkloadIBLL.GetSRWorkloadEntity( keyValue );
+            var jsonData = new {
+                SRWorkload = SRWorkloadData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRWorkloadIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SRWorkloadEntity entity = strEntity.ToObject<SRWorkloadEntity>();
+            sRWorkloadIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_SalaryTemplateController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_SalaryTemplateController.cs
new file mode 100644
index 000000000..bb3444fe7
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_SalaryTemplateController.cs	
@@ -0,0 +1,127 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-27 17:38
+    /// 描 述：工资模板管理
+    /// </summary>
+    public class Sal_SalaryTemplateController : MvcControllerBase
+    {
+        private Sal_SalaryTemplateIBLL sal_SalaryTemplateIBLL = new Sal_SalaryTemplateBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sal_SalaryTemplateIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var Sal_SalaryTemplateData = sal_SalaryTemplateIBLL.GetSal_SalaryTemplateEntity( keyValue );
+            var jsonData = new {
+                Sal_SalaryTemplate = Sal_SalaryTemplateData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sal_SalaryTemplateIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            Sal_SalaryTemplateEntity entity = strEntity.ToObject<Sal_SalaryTemplateEntity>();
+            sal_SalaryTemplateIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+
+
+        /// <summary>
+        /// 启用当前模板
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult EnableTemplate(string keyValue)
+        {
+            sal_SalaryTemplateIBLL.EnableTemplate(keyValue);
+            return Success("保存成功！");
+        }
+
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_SalaryTemplateItemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_SalaryTemplateItemController.cs
new file mode 100644
index 000000000..e7582df65
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_SalaryTemplateItemController.cs	
@@ -0,0 +1,112 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-27 17:43
+    /// 描 述：工资条模板列管理
+    /// </summary>
+    public class Sal_SalaryTemplateItemController : MvcControllerBase
+    {
+        private Sal_SalaryTemplateItemIBLL sal_SalaryTemplateItemIBLL = new Sal_SalaryTemplateItemBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sal_SalaryTemplateItemIBLL.GetPageList(paginationobj, queryJson).ToList().OrderBy(a=>a.STIOrder);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var Sal_SalaryTemplateItemData = sal_SalaryTemplateItemIBLL.GetSal_SalaryTemplateItemEntity( keyValue );
+            var jsonData = new {
+                Sal_SalaryTemplateItem = Sal_SalaryTemplateItemData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sal_SalaryTemplateItemIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            Sal_SalaryTemplateItemEntity entity = strEntity.ToObject<Sal_SalaryTemplateItemEntity>();
+            sal_SalaryTemplateItemIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryController.cs
new file mode 100644
index 000000000..e03d43a2f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryController.cs	
@@ -0,0 +1,320 @@
+using System;
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-27 17:52
+    /// 描 述：工资记录表
+    /// </summary>
+    public class Sal_UserSalaryController : MvcControllerBase
+    {
+        private Sal_UserSalaryIBLL sal_UserSalaryIBLL = new Sal_UserSalaryBLL();
+        private Sal_UserSalaryItemIBLL sal_UserSalaryItemIBLL = new Sal_UserSalaryItemBLL();
+        private Sal_SalaryTemplateItemIBLL sal_SalaryTemplateItemIBLL = new Sal_SalaryTemplateItemBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 我的工资
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexOfMy()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 工资导入
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ImportForm()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            var itemList = sal_UserSalaryIBLL.GetAllTemplateInfo();
+            ViewBag.ItemList = itemList.ToList();
+            return View();
+        }
+        /// <summary>
+        /// 详情页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            var itemList = sal_UserSalaryIBLL.GetAllTemplateInfo();
+            ViewBag.ItemList = itemList.ToList();
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sal_UserSalaryIBLL.GetPageList(paginationobj, queryJson);
+            var objectList = new List<Object>();
+            foreach (var userSalary in data)
+            {
+                dynamic dataItem = new System.Dynamic.ExpandoObject();
+                var dataItemDic = dataItem as IDictionary<string, object>;
+                dataItemDic["F_UserId"] = userSalary.F_UserId;
+                dataItemDic["USId"] = userSalary.USId;
+                dataItemDic["STAll"] = userSalary.STAll;
+                dataItemDic["STActual"] = userSalary.STActual;
+                dataItemDic["USDate"] = userSalary.USDate;
+                var ListItem = sal_SalaryTemplateItemIBLL.GetListByUSId(userSalary.USId);
+
+                foreach (var itemEntity in ListItem)
+                {
+                    var name = itemEntity.STIId;
+                    var val = itemEntity.STIValue;
+                    dataItemDic[name] = val;
+                }
+                objectList.Add(dataItem);
+
+            }
+
+
+            var jsonData = new
+            {
+                rows = objectList,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var Sal_UserSalaryData = sal_UserSalaryIBLL.GetSal_UserSalaryEntity(keyValue);
+            dynamic dataItem = new System.Dynamic.ExpandoObject();
+            var dataItemDic = dataItem as IDictionary<string, object>;
+            dataItemDic["F_UserId"] = Sal_UserSalaryData.F_UserId;
+            dataItemDic["USId"] = Sal_UserSalaryData.USId;
+            dataItemDic["STAll"] = Sal_UserSalaryData.STAll;
+            dataItemDic["STActual"] = Sal_UserSalaryData.STActual;
+            dataItemDic["USDate"] = Sal_UserSalaryData.USDate;
+            var ListItem = sal_SalaryTemplateItemIBLL.GetListByUSId(Sal_UserSalaryData.USId);
+
+            foreach (var itemEntity in ListItem)
+            {
+                var name = itemEntity.STIId;
+                var val = itemEntity.STIValue;
+                dataItemDic[name] = val;
+            }
+
+            var jsonData = new
+            {
+                Sal_UserSalary = dataItem,
+            };
+            return Success(jsonData);
+        }
+
+
+
+        /// <summary>
+        /// 获取已经启用的工资模板信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetEnableTemplateInfo()
+        {
+            var TemplateItems = sal_UserSalaryIBLL.GetEnableTemplateInfo();
+            var jsonData = new
+            {
+                ItemList = TemplateItems,
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取全部工资模板信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetAllTemplateInfo()
+        {
+            var TemplateItems = sal_UserSalaryIBLL.GetAllTemplateInfo();
+            var jsonData = new
+            {
+                ItemList = TemplateItems,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sal_UserSalaryIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity, string strDetail)
+        {
+            Sal_UserSalaryEntity entity = strEntity.ToObject<Sal_UserSalaryEntity>();
+            List<Sal_UserSalaryItemEntity> itemList = strDetail.ToList<Sal_UserSalaryItemEntity>();
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.Create();
+            }
+            entity.STActual = 0;
+            entity.STAll = 0;
+
+
+            foreach (var item in itemList)
+            {
+                var Sal_SalaryTemplateItemEntity =
+                    sal_SalaryTemplateItemIBLL.GetSal_SalaryTemplateItemEntity(item.STIId);
+                if (Sal_SalaryTemplateItemEntity != null)
+                {
+
+                    if (Sal_SalaryTemplateItemEntity.STIParticipation == "true")
+                    {
+                        if (Sal_SalaryTemplateItemEntity.STIAdd == "true")
+                        {
+                            entity.STActual += Convert.ToDecimal(item.STIValue);
+                        }
+                        else
+                        {
+                            entity.STActual -= Convert.ToDecimal(item.STIValue);
+                        }
+                    }
+                    if (Sal_SalaryTemplateItemEntity.STIAdd == "true")
+                    {
+                        entity.STAll += Convert.ToDecimal(item.STIValue);
+                    }
+                    else
+                    {
+                        entity.STAll -= Convert.ToDecimal(item.STIValue);
+                    }
+                    if (string.IsNullOrEmpty(keyValue))
+                    {
+                        item.USId = entity.USId;
+                        sal_UserSalaryItemIBLL.SaveEntity("", item);
+                    }
+                    else
+                    {
+                        sal_UserSalaryItemIBLL.SaveEntity(keyValue, item);
+                    }
+
+                }
+
+            }
+
+            sal_UserSalaryIBLL.SaveEntity(keyValue, entity);
+
+            return Success("保存成功！");
+        }
+        #endregion
+
+        #region 获取模板
+
+        /// <summary>
+        /// 下载工资导入模板
+        /// </summary>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public void DownTemplate()
+        {
+            //设置导出格式
+            ExcelConfig excelConfig=new ExcelConfig();
+            excelConfig.FileName = "工资导入模板.xls";
+            excelConfig.IsAllSizeColumn = true;
+            excelConfig.ColumnEntity=new List<ColumnModel>();
+            //获取工资列
+            var itemList = sal_UserSalaryIBLL.GetAllTemplateInfo();
+            //表头
+            DataTable dt=new DataTable();
+            excelConfig.ColumnEntity.Add(new ColumnModel()
+            {
+                Column = "姓名",
+                ExcelColumn = "姓名",
+                Alignment = "center",
+                Background = new Color()
+            });
+            dt.Columns.Add("姓名", typeof(string));
+            excelConfig.ColumnEntity.Add(new ColumnModel()
+            {
+                Column = "发放时间",
+                ExcelColumn = "发放时间",
+                Alignment = "center",
+                Background = new Color()
+            });
+            dt.Columns.Add("发放时间", typeof(string));
+            foreach (var item in itemList)
+            {
+                excelConfig.ColumnEntity.Add(new ColumnModel()
+                {
+                    Column = item.STIName,
+                    ExcelColumn = item.STIName,
+                    Alignment = "center",
+                    Background = new Color()
+                });
+                dt.Columns.Add(item.STIName, typeof(string));
+            }
+            ExcelHelper.ExcelDownload(dt, excelConfig);
+
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryItemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryItemController.cs
new file mode 100644
index 000000000..fe78534cb
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryItemController.cs	
@@ -0,0 +1,119 @@
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using Learun.Util;
+using System.Data;
+using System.Linq;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-27 17:56
+    /// 描 述：工资记录明细表
+    /// </summary>
+    public class Sal_UserSalaryItemController : MvcControllerBase
+    {
+        private Sal_UserSalaryItemIBLL sal_UserSalaryItemIBLL = new Sal_UserSalaryItemBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = sal_UserSalaryItemIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sal_UserSalaryItemIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = sal_UserSalaryItemIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sal_UserSalaryItemIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,Sal_UserSalaryItemEntity entity)
+        {
+            sal_UserSalaryItemIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SalarySheetController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SalarySheetController.cs
new file mode 100644
index 000000000..000e8ab79
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SalarySheetController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-03-25 11:16
+    /// 描 述：工资条
+    /// </summary>
+    public class SalarySheetController : MvcControllerBase
+    {
+        private SalarySheetIBLL salarySheetIBLL = new SalarySheetBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = salarySheetIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SalarySheetData = salarySheetIBLL.GetSalarySheetEntity( keyValue );
+            var jsonData = new {
+                SalarySheet = SalarySheetData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            salarySheetIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SalarySheetEntity entity = strEntity.ToObject<SalarySheetEntity>();
+            salarySheetIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ScholarshipManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ScholarshipManagementController.cs
new file mode 100644
index 000000000..e9172ed54
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ScholarshipManagementController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-04 16:17
+    /// 描 述：奖学金管理
+    /// </summary>
+    public class ScholarshipManagementController : MvcControllerBase
+    {
+        private ScholarshipManagementIBLL scholarshipManagementIBLL = new ScholarshipManagementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = scholarshipManagementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var ScholarshipManagementData = scholarshipManagementIBLL.GetScholarshipManagementEntity( keyValue );
+            var jsonData = new {
+                ScholarshipManagement = ScholarshipManagementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            scholarshipManagementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            ScholarshipManagementEntity entity = strEntity.ToObject<ScholarshipManagementEntity>();
+            scholarshipManagementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SchoolWomenManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SchoolWomenManagementController.cs
new file mode 100644
index 000000000..febfd6cf0
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SchoolWomenManagementController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-14 12:15
+    /// 描 述：校妇联管理
+    /// </summary>
+    public class SchoolWomenManagementController : MvcControllerBase
+    {
+        private SchoolWomenManagementIBLL schoolWomenManagementIBLL = new SchoolWomenManagementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = schoolWomenManagementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var SchoolWomenManagementData = schoolWomenManagementIBLL.GetSchoolWomenManagementEntity( keyValue );
+            var jsonData = new {
+                SchoolWomenManagement = SchoolWomenManagementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            schoolWomenManagementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SchoolWomenManagementEntity entity = strEntity.ToObject<SchoolWomenManagementEntity>();
+            schoolWomenManagementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/StuSaverecordController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/StuSaverecordController.cs
new file mode 100644
index 000000000..8b31f2e56
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/StuSaverecordController.cs	
@@ -0,0 +1,136 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-08 15:48
+    /// 描 述：学生充值记录
+    /// </summary>
+    public class StuSaverecordController : MvcControllerBase
+    {
+        private StuSaverecordIBLL stuSaverecordIBLL = new StuSaverecordBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        [HttpGet]
+        public ActionResult IndexForTeacher()
+        {
+             return View();
+        }
+        [HttpGet]
+        public ActionResult IndexForStudent()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuSaverecordIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListAll(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuSaverecordIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var StuSaveRecordData = stuSaverecordIBLL.GetStuSaveRecordEntity( keyValue );
+            var jsonData = new {
+                StuSaveRecord = StuSaveRecordData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            stuSaverecordIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            StuSaveRecordEntity entity = strEntity.ToObject<StuSaveRecordEntity>();
+            stuSaverecordIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherCancelEmployController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherCancelEmployController.cs
new file mode 100644
index 000000000..4183d9f58
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherCancelEmployController.cs	
@@ -0,0 +1,153 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-10 11:03
+    /// 描 述：教职工解聘管理
+    /// </summary>
+    public class TeacherCancelEmployController : MvcControllerBase
+    {
+        private TeacherCancelEmployIBLL teacherCancelEmployIBLL = new TeacherCancelEmployBLL();
+        private TeacherChangeIBLL teacherChangeIBLL = new TeacherChangeBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherCancelEmployIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherCancelEmployData = teacherCancelEmployIBLL.GetTeacherCancelEmployEntity(keyValue);
+            var jsonData = new
+            {
+                TeacherCancelEmploy = TeacherCancelEmployData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherCancelEmployIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherCancelEmployEntity entity = strEntity.ToObject<TeacherCancelEmployEntity>();
+            entity.CheckMark = false;
+            teacherCancelEmployIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        /// <summary>
+        /// 审核、去审核
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoCheck(string keyValue, bool checkMark)
+        {
+            var model = teacherCancelEmployIBLL.GetTeacherCancelEmployEntity(keyValue);
+            if (model == null)
+            {
+                return Fail("当前记录不存在！");
+            }
+            model.CheckMark = checkMark;
+            teacherCancelEmployIBLL.SaveEntity(keyValue, model);
+            //人事异动
+            if (checkMark)
+            {
+                var tcModel = new TeacherChangeEntity()
+                {
+                    EmpId = model.EmpId,
+                    ChangeTime = DateTime.Now,
+                    ChangeType = "03"
+                };
+                teacherChangeIBLL.SaveEntity("", tcModel);
+            }
+            else
+            {
+                var tcModel = teacherChangeIBLL.GetTeacherChangeEntityByEmpIdAndType(model.EmpId, "03");
+                if (tcModel != null)
+                {
+                    teacherChangeIBLL.DeleteEntity(tcModel.Id);
+                }
+            }
+            return Success("操作成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherCertificateController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherCertificateController.cs
new file mode 100644
index 000000000..75b6bc21f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherCertificateController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-03-19 10:52
+    /// 描 述：教师证书信息
+    /// </summary>
+    public class TeacherCertificateController : MvcControllerBase
+    {
+        private TeacherCertificateIBLL teacherCertificateIBLL = new TeacherCertificateBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherCertificateIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherCertificateData = teacherCertificateIBLL.GetTeacherCertificateEntity( keyValue );
+            var jsonData = new {
+                TeacherCertificate = TeacherCertificateData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherCertificateIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherCertificateEntity entity = strEntity.ToObject<TeacherCertificateEntity>();
+            teacherCertificateIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherChangeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherChangeController.cs
new file mode 100644
index 000000000..41a9f1125
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherChangeController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-10 12:10
+    /// 描 述：人事异动管理
+    /// </summary>
+    public class TeacherChangeController : MvcControllerBase
+    {
+        private TeacherChangeIBLL teacherChangeIBLL = new TeacherChangeBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherChangeIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherChangeData = teacherChangeIBLL.GetTeacherChangeEntity( keyValue );
+            var jsonData = new {
+                TeacherChange = TeacherChangeData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherChangeIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherChangeEntity entity = strEntity.ToObject<TeacherChangeEntity>();
+            teacherChangeIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherDimissionController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherDimissionController.cs
new file mode 100644
index 000000000..0e9b04420
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherDimissionController.cs	
@@ -0,0 +1,117 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using Learun.Application.Organization;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-03-19 16:42
+    /// 描 述：离职教职工
+    /// </summary>
+    public class TeacherDimissionController : MvcControllerBase
+    {
+        private TeacherDimissionIBLL teacherDimissionIBLL = new TeacherDimissionBLL();
+        private UserIBLL userIBLL = new UserBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherDimissionIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherDimissionData = teacherDimissionIBLL.GetTeacherDimissionEntity(keyValue);
+            var jsonData = new
+            {
+                TeacherDimission = TeacherDimissionData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            var entity = teacherDimissionIBLL.GetTeacherDimissionEntity(keyValue);
+            teacherDimissionIBLL.DeleteEntity(keyValue);
+            
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherDimissionEntity entity = strEntity.ToObject<TeacherDimissionEntity>();
+            teacherDimissionIBLL.SaveEntity(keyValue, entity);
+            
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherEncourgementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherEncourgementController.cs
new file mode 100644
index 000000000..2f272f831
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherEncourgementController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-10 12:00
+    /// 描 述：教师奖励管理
+    /// </summary>
+    public class TeacherEncourgementController : MvcControllerBase
+    {
+        private TeacherEncourgementIBLL teacherEncourgementIBLL = new TeacherEncourgementBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherEncourgementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherEncourgementData = teacherEncourgementIBLL.GetTeacherEncourgementEntity( keyValue );
+            var jsonData = new {
+                TeacherEncourgement = TeacherEncourgementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherEncourgementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherEncourgementEntity entity = strEntity.ToObject<TeacherEncourgementEntity>();
+            teacherEncourgementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherGoAbroadController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherGoAbroadController.cs
new file mode 100644
index 000000000..7ed32647f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherGoAbroadController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 15:23
+    /// 描 述：教职工出国（境）情况
+    /// </summary>
+    public class TeacherGoAbroadController : MvcControllerBase
+    {
+        private TeacherGoAbroadIBLL teacherGoAbroadIBLL = new TeacherGoAbroadBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherGoAbroadIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherGoAbroadData = teacherGoAbroadIBLL.GetTeacherGoAbroadEntity( keyValue );
+            var jsonData = new {
+                TeacherGoAbroad = TeacherGoAbroadData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherGoAbroadIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherGoAbroadEntity entity = strEntity.ToObject<TeacherGoAbroadEntity>();
+            teacherGoAbroadIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherJobAssessmentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherJobAssessmentController.cs
new file mode 100644
index 000000000..e6d80be9a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherJobAssessmentController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-10 11:39
+    /// 描 述：教师工作考核
+    /// </summary>
+    public class TeacherJobAssessmentController : MvcControllerBase
+    {
+        private TeacherJobAssessmentIBLL teacherJobAssessmentIBLL = new TeacherJobAssessmentBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherJobAssessmentIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherJobAssessmentData = teacherJobAssessmentIBLL.GetTeacherJobAssessmentEntity( keyValue );
+            var jsonData = new {
+                TeacherJobAssessment = TeacherJobAssessmentData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherJobAssessmentIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherJobAssessmentEntity entity = strEntity.ToObject<TeacherJobAssessmentEntity>();
+            teacherJobAssessmentIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPartTimeJobController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPartTimeJobController.cs
new file mode 100644
index 000000000..e03cc6f9f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPartTimeJobController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-10 11:53
+    /// 描 述：在职教职工校外兼职管理
+    /// </summary>
+    public class TeacherPartTimeJobController : MvcControllerBase
+    {
+        private TeacherPartTimeJobIBLL teacherPartTimeJobIBLL = new TeacherPartTimeJobBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherPartTimeJobIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherPartTimeJobData = teacherPartTimeJobIBLL.GetTeacherPartTimeJobEntity( keyValue );
+            var jsonData = new {
+                TeacherPartTimeJob = TeacherPartTimeJobData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherPartTimeJobIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherPartTimeJobEntity entity = strEntity.ToObject<TeacherPartTimeJobEntity>();
+            teacherPartTimeJobIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPassportController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPassportController.cs
new file mode 100644
index 000000000..3a8426c3a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPassportController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-23 15:20
+    /// 描 述：教职工护照
+    /// </summary>
+    public class TeacherPassportController : MvcControllerBase
+    {
+        private TeacherPassportIBLL teacherPassportIBLL = new TeacherPassportBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherPassportIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherPassportData = teacherPassportIBLL.GetTeacherPassportEntity( keyValue );
+            var jsonData = new {
+                TeacherPassport = TeacherPassportData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherPassportIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherPassportEntity entity = strEntity.ToObject<TeacherPassportEntity>();
+            teacherPassportIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPostChangeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPostChangeController.cs
new file mode 100644
index 000000000..59d9df35a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPostChangeController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-03-19 17:31
+    /// 描 述：教师职务变
+    /// </summary>
+    public class TeacherPostChangeController : MvcControllerBase
+    {
+        private TeacherPostChangeIBLL teacherPostChangeIBLL = new TeacherPostChangeBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherPostChangeIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherPostChangeData = teacherPostChangeIBLL.GetTeacherPostChangeEntity( keyValue );
+            var jsonData = new {
+                TeacherPostChange = TeacherPostChangeData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherPostChangeIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherPostChangeEntity entity = strEntity.ToObject<TeacherPostChangeEntity>();
+            teacherPostChangeIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPunishmentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPunishmentController.cs
new file mode 100644
index 000000000..3fef6b11a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherPunishmentController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-04-29 16:13
+    /// 描 述：教师处分管理
+    /// </summary>
+    public class TeacherPunishmentController : MvcControllerBase
+    {
+        private TeacherPunishmentIBLL teacherPunishmentIBLL = new TeacherPunishmentBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherPunishmentIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherPunishmentData = teacherPunishmentIBLL.GetTeacherPunishmentEntity( keyValue );
+            var jsonData = new {
+                TeacherPunishment = TeacherPunishmentData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherPunishmentIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherPunishmentEntity entity = strEntity.ToObject<TeacherPunishmentEntity>();
+            teacherPunishmentIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherRecruitPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherRecruitPlanController.cs
new file mode 100644
index 000000000..37a2d908c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherRecruitPlanController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-10 10:51
+    /// 描 述：教职工招聘计划
+    /// </summary>
+    public class TeacherRecruitPlanController : MvcControllerBase
+    {
+        private TeacherRecruitPlanIBLL teacherRecruitPlanIBLL = new TeacherRecruitPlanBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherRecruitPlanIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherRecruitPlanData = teacherRecruitPlanIBLL.GetTeacherRecruitPlanEntity( keyValue );
+            var jsonData = new {
+                TeacherRecruitPlan = TeacherRecruitPlanData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherRecruitPlanIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherRecruitPlanEntity entity = strEntity.ToObject<TeacherRecruitPlanEntity>();
+            teacherRecruitPlanIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherRetireController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherRetireController.cs
new file mode 100644
index 000000000..e6a180115
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherRetireController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-03-19 14:27
+    /// 描 述：退休教职工
+    /// </summary>
+    public class TeacherRetireController : MvcControllerBase
+    {
+        private TeacherRetireIBLL teacherRetireIBLL = new TeacherRetireBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherRetireIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherRetireData = teacherRetireIBLL.GetTeacherRetireEntity( keyValue );
+            var jsonData = new {
+                TeacherRetire = TeacherRetireData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherRetireIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherRetireEntity entity = strEntity.ToObject<TeacherRetireEntity>();
+            teacherRetireIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTitleChangeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTitleChangeController.cs
new file mode 100644
index 000000000..80357d704
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTitleChangeController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-03-19 17:02
+    /// 描 述：教师职称变更
+    /// </summary>
+    public class TeacherTitleChangeController : MvcControllerBase
+    {
+        private TeacherTitleChangeIBLL teacherTitleChangeIBLL = new TeacherTitleChangeBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherTitleChangeIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherTitleChangeData = teacherTitleChangeIBLL.GetTeacherTitleChangeEntity( keyValue );
+            var jsonData = new {
+                TeacherTitleChange = TeacherTitleChangeData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherTitleChangeIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherTitleChangeEntity entity = strEntity.ToObject<TeacherTitleChangeEntity>();
+            teacherTitleChangeIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTitleEvaluationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTitleEvaluationController.cs
new file mode 100644
index 000000000..3534c9c28
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTitleEvaluationController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-03-19 14:16
+    /// 描 述：教师职称评定
+    /// </summary>
+    public class TeacherTitleEvaluationController : MvcControllerBase
+    {
+        private TeacherTitleEvaluationIBLL teacherTitleEvaluationIBLL = new TeacherTitleEvaluationBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherTitleEvaluationIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherTitleEvaluationData = teacherTitleEvaluationIBLL.GetTeacherTitleEvaluationEntity( keyValue );
+            var jsonData = new {
+                TeacherTitleEvaluation = TeacherTitleEvaluationData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherTitleEvaluationIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherTitleEvaluationEntity entity = strEntity.ToObject<TeacherTitleEvaluationEntity>();
+            teacherTitleEvaluationIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs
new file mode 100644
index 000000000..4e077d511
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-03-19 11:34
+    /// 描 述：教师培训信息
+    /// </summary>
+    public class TeacherTrainController : MvcControllerBase
+    {
+        private TeacherTrainIBLL teacherTrainIBLL = new TeacherTrainBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teacherTrainIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeacherTrainData = teacherTrainIBLL.GetTeacherTrainEntity( keyValue );
+            var jsonData = new {
+                TeacherTrain = TeacherTrainData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherTrainIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeacherTrainEntity entity = strEntity.ToObject<TeacherTrainEntity>();
+            teacherTrainIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs
new file mode 100644
index 000000000..2b26e1d62
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs	
@@ -0,0 +1,573 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-03-25 11:16
+    /// 描 述：课程表
+    /// </summary>
+    public class TimeTableController : MvcControllerBase
+    {
+
+        private ArrangeLessonTermIBLL arrangeLessonTermIBLL = new ArrangeLessonTermBLL();
+        private StuAttendanceIBLL stuAttendanceIBLL = new StuAttendanceBLL();
+        private ArrangeLessonTermOfElectiveIBLL arrangeLessonTermOfElectiveIBLL = new ArrangeLessonTermOfElectiveBLL();
+        private StuAttendanceLeaveIBLL stuAttendanceLeaveIBLL = new StuAttendanceLeaveBLL();
+        private StuSelectLessonListOfElectiveIBLL stuSelectLessonList = new StuSelectLessonListOfElectiveBLL();
+        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
+        private LessonInfoIBLL lessonInfoIBLL = new LessonInfoBLL();
+        private Edu_ChangeTeacherLessonIBLL edu_ChangeTeacherLessonIBLL = new Edu_ChangeTeacherLessonBLL();
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 考勤
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Attendance()
+        {
+            return View();
+        }
+
+        [HttpGet]
+        public ActionResult AttendanceDetail()
+        {
+            return View();
+        }
+
+        [HttpGet]
+        public ActionResult AttendanceStatistic()
+        {
+            return View();
+        }
+        [HttpGet]
+        public ActionResult AttendanceList()
+        {
+            return View();
+        }
+
+        [HttpGet]
+        public ActionResult Leave()
+        {
+            return View();
+        }
+
+
+        /// <summary>
+        /// 课程表【教务】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexInEducation()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 课程表【教学调度】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexInEducationSelect()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 课程表--修改教师所带的课程【教务】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexInEducationModify()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单--修改教师所带的课程【教务】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ModifyLessonForm()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData()
+        {
+            var userInfo = LoginUserInfo.Get();
+            var stuInfo = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(userInfo.account);
+            StuAttendanceLeaveEntity entity = new StuAttendanceLeaveEntity();
+            entity.ClassNo = stuInfo.ClassNo;
+            entity.DeptNo = stuInfo.DeptNo;
+            entity.Grade = stuInfo.Grade;
+            entity.MajorNo = stuInfo.MajorNo;
+            entity.StuNo = userInfo.account;
+            entity.StuName = userInfo.realName;
+
+
+
+            var jsonData = new
+            {
+                StuAttendanceLeave = entity,
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取相关课程考勤的学生信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult AttendanceStudents(string pagination, string queryJson, string lessonSortNo)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = new List<StuSelectLessonListEntity>();
+            if (lessonSortNo == "1")//必修课
+            {
+                data = arrangeLessonTermIBLL.AttendanceStudents(paginationobj, queryJson).ToList();
+            }
+            else if (lessonSortNo == "2")//选修课
+            {
+                data = arrangeLessonTermOfElectiveIBLL.AttendanceStudents(paginationobj, queryJson).ToList();
+            }
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 提交课程考勤
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public async Task<ActionResult> AttendanceApply(string kqType, string lessonTime, string lessonDate, string classRoomNo, string dataJson, decimal? attenScore, string attenCondition)
+        {
+            var data = await stuAttendanceIBLL.AttendanceApply(kqType, lessonTime, lessonDate, classRoomNo, dataJson, attenScore, attenCondition);
+            return Success(data);
+        }
+
+        /// <summary>
+        /// 教师/学生课程表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetData(string startTime, string endTime)
+        {
+            var userInfo = LoginUserInfo.Get();
+            //var startDate = startTime ?? Common.CalculateFirstDateOfWeek(DateTime.Today).ToString("yyyy-MM-dd");
+            //var endDate = endTime ?? Common.CalculateLastDateOfWeek(DateTime.Today).ToString("yyyy-MM-dd");
+            //开始时间
+            var startdate = string.IsNullOrEmpty(startTime) ? DateTime.Today : Convert.ToDateTime(startTime);
+            var startDate = Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd");
+            var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
+
+            var semesterAndYear = Common.GetSemesterAndYear(startDate);
+            var strAcademicYear = semesterAndYear.AcademicYearLong;
+            var strSemester = semesterAndYear.Semester;
+
+            var timeTableList = new List<TimeTable>();
+            //课程表
+            var data = arrangeLessonTermIBLL.GetTimeTable(userInfo.account, userInfo.Description, startDate, endDate);
+            timeTableList.AddRange(data);
+            //选修课课程表
+            var dataOfElective = arrangeLessonTermOfElectiveIBLL.GetTimeTable(userInfo.account, userInfo.Description, startDate, endDate);
+            timeTableList.AddRange(dataOfElective);
+
+
+            //var timeTables = data.ToList();
+            var timeTables = timeTableList.ToList();
+            var noDataResult = new
+            { schoolName = "课程表", semester = $"{strAcademicYear}学年度  第{strSemester}学期", weekList = "", teacherName = userInfo.realName };
+            if (!timeTables.Any())
+            {
+                return JsonResult(noDataResult);
+            }
+            var formatDataa = from d in timeTables
+                              let tt = d.LessonTime.Substring(1)
+                              group d by tt into g
+                              orderby g.Key
+                              select new
+                              {
+                                  time = g.Key,
+                                  list = from e in timeTables
+                                         let ee = e.LessonTime.Substring(1)
+                                         where ee == g.Key
+                                         select new
+                                         {
+                                             day = e.LessonTime.ToCharArray()[0],
+                                             curriculum = string.IsNullOrEmpty(e.EnName) ? (e.LessonSortNo == "2" ? e.LessonName + "[选修]" : e.LessonName) : (e.LessonSortNo == "2" ? e.EnName + "[选修]" : e.EnName),
+                                             lessonName = e.LessonName,
+                                             teacher = e.EmpName,
+                                             classRoom = e.ClassroomName.Trim(),
+                                             academicyear = semesterAndYear.AcademicYearShort,
+                                             semester = strSemester,
+                                             lessonNo = e?.LessonNo,
+                                             teachClassNo = e?.TeachClassNo,
+                                             empno = e?.EmpNo,
+                                             lessonTime = e.LessonTime,
+                                             lessonDate = e.LessonDate.ToString("yyyy-MM-dd"),
+                                             classRoomNo = e?.ClassRoomNo.Trim(),
+                                             lessonSortNo = e.LessonSortNo,
+                                             e.OLPEId,
+                                             className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName
+                                         }
+                              }
+
+                ;
+
+
+            var leaveList = stuAttendanceLeaveIBLL.GetList();
+            var formatData = timeTables.OrderBy(a => a.LessonTime.Substring(1))
+                .Select(a => new
+                {
+                    time = a.LessonTime.Substring(1),
+                    list = timeTables.Where(b => b.LessonTime.Substring(1) == a.LessonTime.Substring(1))
+                    .Select(b => new
+                    {
+                        day = b.LessonTime.ToCharArray()[0],
+                        curriculum = string.IsNullOrEmpty(b.EnName) ? (b.LessonSortNo == "2" ? b.LessonName + "[选修]" : b.LessonName) : (b.LessonSortNo == "2" ? b.EnName + "[选修]" : b.EnName),
+                        lessonName = b.LessonName,
+                        teacher = b.EmpName,
+                        classRoom = b.ClassroomName.Trim(),
+                        academicyear = semesterAndYear.AcademicYearShort,
+                        semester = strSemester,
+                        lessonNo = b?.LessonNo,
+                        teachClassNo = b?.TeachClassNo,
+                        empno = b?.EmpNo,
+                        lessonTime = b.LessonTime,
+                        lessonDate = b.LessonDate.ToString("yyyy-MM-dd"),
+                        classRoomNo = b?.ClassRoomNo.Trim(),
+                        lessonSortNo = b.LessonSortNo,
+                        b.OLPEId,
+                        className = string.IsNullOrEmpty(b.ClassName) ? "" : b.ClassName,
+                        leaveType = leaveList.Any(c => c.LessonNo == b.LessonNo && c.StuNo == userInfo.account && c.LessonDate == b.LessonDate && c.LessonTime == b.LessonTime) ? 1 : 0,
+                        checkType = leaveList.FirstOrDefault(c => c.LessonNo == b.LessonNo && c.StuNo == userInfo.account && c.LessonDate == b.LessonDate && c.LessonTime == b.LessonTime)?.IsCheck,
+
+                    })
+
+                });
+            //foreach (var item in formatData.list)
+            //{
+
+            //    if(leaveList.Any(a=>a.LessonNo==item.))
+            //}
+            var result = new
+            { schoolName = "课程表", semester = $"{strAcademicYear}学年度  第{strSemester}学期", teacherName = userInfo.realName, weekList = formatData };
+            return JsonResult(result);
+        }
+
+        /// <summary>
+        /// 课程表【教务】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetDataInEducation(string startTime, string endTime, string classNo, string empNo, string schoolId)
+        {
+            var userInfo = LoginUserInfo.Get();
+            //开始时间
+            var startdate = string.IsNullOrEmpty(startTime) ? DateTime.Today : Convert.ToDateTime(startTime);
+            var startDate = Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd");
+            var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
+
+            var semesterAndYear = Common.GetSemesterAndYear(startDate);
+            var strAcademicYear = semesterAndYear.AcademicYearLong;
+            var strSemester = semesterAndYear.Semester;
+
+            var timeTableList = new List<TimeTable>();
+            //课程表
+            var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId);
+            timeTableList.AddRange(data);
+            //选修课课程表
+            var dataOfElective = arrangeLessonTermOfElectiveIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId);
+            timeTableList.AddRange(dataOfElective);
+
+            var timeTables = timeTableList.ToList();
+            var noDataResult = new
+            { schoolName = "课程表", semester = $"{strAcademicYear}学年度  第{strSemester}学期", weekList = "" };
+            if (!timeTables.Any())
+            {
+                return JsonResult(noDataResult);
+            }
+            var formatData = from d in timeTables
+                             let tt = d.LessonTime.Substring(1)
+                             group d by tt into g
+                             orderby g.Key
+                             select new
+                             {
+                                 time = g.Key,
+                                 list = from e in timeTables
+                                        let ee = e.LessonTime.Substring(1)
+                                        where ee == g.Key
+                                        select new
+                                        {
+                                            day = e.LessonTime.ToCharArray()[0],
+                                            curriculum = e.LessonSortNo == "2" ? e.LessonName + "[选修]" : e.LessonName,
+                                            teacher = e?.EmpName,
+                                            classRoom = string.IsNullOrEmpty(e.ClassroomName) ? "" : e.ClassroomName.Trim(),
+                                            academicyear = semesterAndYear.AcademicYearShort,
+                                            semester = strSemester,
+                                            lessonNo = e?.LessonNo,
+                                            teachClassNo = e?.TeachClassNo,
+                                            empno = e?.EmpNo,
+                                            lessonTime = e.LessonTime,
+                                            lessonDate = e.LessonDate.ToString("yyyy-MM-dd"),
+                                            classRoomNo = string.IsNullOrEmpty(e.ClassRoomNo) ? "" : e.ClassRoomNo.Trim(),
+                                            lessonSortNo = e.LessonSortNo,
+                                            e?.OLPEId,
+                                            className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName
+                                        }
+                             }
+                ;
+
+            var result = new
+            { schoolName = "课程表", semester = $"{strAcademicYear}学年度  第{strSemester}学期", weekList = formatData };
+            return JsonResult(result);
+        }
+
+        /// <summary>
+        /// 课程表【教务】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetDataInEducationSelect(string startTime, string endTime, string classNo, string empNo, string schoolId)
+        {
+            var userInfo = LoginUserInfo.Get();
+            //开始时间
+            var startdate = string.IsNullOrEmpty(startTime) ? DateTime.Today : Convert.ToDateTime(startTime);
+            var startDate = Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd");
+            var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
+
+            var semesterAndYear = Common.GetSemesterAndYear(startDate);
+            var strAcademicYear = semesterAndYear.AcademicYearLong;
+            var strSemester = semesterAndYear.Semester;
+
+            var timeTableList = new List<TimeTable>();
+            //课程表
+            var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId);
+            timeTableList.AddRange(data);
+            //选修课课程表
+            //var dataOfElective = arrangeLessonTermOfElectiveIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId);
+            //timeTableList.AddRange(dataOfElective);
+
+            var timeTables = timeTableList.ToList();
+            var noDataResult = new
+            { schoolName = "课程表", semester = $"{strAcademicYear}学年度  第{strSemester}学期", weekList = "" };
+            if (!timeTables.Any())
+            {
+                return JsonResult(noDataResult);
+            }
+            var formatData = from d in timeTables
+                             let tt = d.LessonTime.Substring(1)
+                             group d by tt into g
+                             orderby g.Key
+                             select new
+                             {
+                                 time = g.Key,
+                                 list = from e in timeTables
+                                        let ee = e.LessonTime.Substring(1)
+                                        where ee == g.Key
+                                        select new
+                                        {
+                                            day = e.LessonTime.ToCharArray()[0],
+                                            lessonTime = e.LessonTime,
+                                            lessonDate = e.LessonDate.ToString("yyyy-MM-dd"),
+                                            schooldId = e?.F_SchoolId,
+                                            academicyear = semesterAndYear.AcademicYearShort,
+                                            semester = strSemester,
+                                            deptNo = e?.DeptNo,
+                                            majorNo = e?.MajorNo,
+                                            lessonNo = e?.LessonNo,
+                                            curriculum = e.LessonSortNo == "2" ? e.LessonName + "[选修]" : e.LessonName,
+                                            teachClassNo = e?.TeachClassNo,
+                                            className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName,
+                                            empno = e?.EmpNo,
+                                            teacher = e?.EmpName,
+                                            classRoomNo = string.IsNullOrEmpty(e.ClassRoomNo) ? "" : e.ClassRoomNo.Trim(),
+                                            classRoom = string.IsNullOrEmpty(e.ClassroomName) ? "" : e.ClassroomName.Trim(),
+                                            lessonSortNo = e.LessonSortNo
+                                        }
+                             }
+                ;
+
+            var result = new
+            { schoolName = "课程表", semester = $"{strAcademicYear}学年度  第{strSemester}学期", weekList = formatData };
+            return JsonResult(result);
+        }
+
+        /// <summary>
+        /// 课程表【教务】--班级下拉框信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetClassData(string schoolId = "")
+        {
+            var data = arrangeLessonTermIBLL.GetClassData(schoolId);
+
+            return Success(data);
+        }
+
+        /// <summary>
+        /// 课程表【教务】--教师下拉框信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetTeacherData(string schoolId = "")
+        {
+            var data = arrangeLessonTermIBLL.GetTeacherData(schoolId);
+
+            return Success(data);
+        }
+
+        /// <summary>
+        /// 表单--修改教师所带的课程【教务】--课程下拉框信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetLessonData()
+        {
+            var lessonList = lessonInfoIBLL.GetAllLesson().OrderBy(x => x.LessonNo);
+            var data = lessonList.Select(x => new { value = x.LessonId, text = x.LessonName + "(" + x.LessonNo + ")" });
+
+            return Success(data);
+        }
+
+        #endregion
+
+        #region 保存数据
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            StuAttendanceLeaveEntity entity = strEntity.ToObject<StuAttendanceLeaveEntity>();
+            entity.TeachClassNo = entity.ClassNo;
+            stuAttendanceLeaveIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        /// <summary>
+        /// 修改教师课程--保存
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="strEntity"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveChangeTeacherLesson(string strEntity)
+        {
+            Edu_ChangeTeacherLessonEntity entity = strEntity.ToObject<Edu_ChangeTeacherLessonEntity>();
+            entity.CToTeacherId = entity.CFromTeacherId;
+            entity.CToTeacherName = entity.CFromTeacherName;
+            //获取目标课程
+            var lessonInfoEntity = lessonInfoIBLL.GetLessonInfoEntity(entity.CToLessonId);
+            if (lessonInfoEntity == null)
+            {
+                return Fail("目标课程不存在！");
+            }
+            entity.CToLessonId = lessonInfoEntity.LessonNo;
+            entity.CToLessonName = lessonInfoEntity.LessonName;
+            entity.CreateTime = DateTime.Now;
+            if (entity.CFromLessonId == entity.CToLessonId)
+            {
+                return Fail("目标课程与原目标一致！");
+            }
+
+            //修改排课、成绩录入相关表
+            edu_ChangeTeacherLessonIBLL.ModifyTableAboutTeacherLesson(entity);
+            //新增Edu_ChangeTeacherLesson记录
+            edu_ChangeTeacherLessonIBLL.SaveEntity("", entity);
+
+            return Success("保存成功！");
+        }
+
+
+        /// <summary>
+        /// 考勤统计
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetAttendanceStatisticPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuAttendanceIBLL.GetAttendanceStatisticPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 全校学生课程考勤
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetAttendancePageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuAttendanceIBLL.GetAttendancePageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/VenhicleManageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/VenhicleManageController.cs
new file mode 100644
index 000000000..d53e2e707
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/VenhicleManageController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-11-19 16:07
+    /// 描 述：车辆信息管理
+    /// </summary>
+    public class VenhicleManageController : MvcControllerBase
+    {
+        private VenhicleManageIBLL venhicleManageIBLL = new VenhicleManageBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = venhicleManageIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var VenhicleManageData = venhicleManageIBLL.GetVenhicleManageEntity( keyValue );
+            var jsonData = new {
+                VenhicleManage = VenhicleManageData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            venhicleManageIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            VenhicleManageEntity entity = strEntity.ToObject<VenhicleManageEntity>();
+            venhicleManageIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/VolunteerActivityController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/VolunteerActivityController.cs
new file mode 100644
index 000000000..b29bb6e33
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/VolunteerActivityController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-02-28 18:00
+    /// 描 述：志愿者活动管理
+    /// </summary>
+    public class VolunteerActivityController : MvcControllerBase
+    {
+        private VolunteerActivityIBLL volunteerActivityIBLL = new VolunteerActivityBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = volunteerActivityIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var VolunteerActivityData = volunteerActivityIBLL.GetVolunteerActivityEntity( keyValue );
+            var jsonData = new {
+                VolunteerActivity = VolunteerActivityData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            volunteerActivityIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            VolunteerActivityEntity entity = strEntity.ToObject<VolunteerActivityEntity>();
+            volunteerActivityIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_CatalogController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_CatalogController.cs
new file mode 100644
index 000000000..da0f96ffd
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_CatalogController.cs	
@@ -0,0 +1,138 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-09-29 09:48
+    /// 描 述：文件目录管理
+    /// </summary>
+    public class WP_CatalogController : MvcControllerBase
+    {
+        private WP_CatalogIBLL wP_CatalogIBLL = new WP_CatalogBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = wP_CatalogIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
+
+        /// <summary>
+        /// 获取字典分类列表(树结构)
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetClassifyTree(string CType)
+        {
+            var data = wP_CatalogIBLL.GetClassifyTree(CType);
+            return this.JsonResult(data);
+        }
+
+        /// <summary>
+        /// 获取目录分类列表
+        /// </summary>
+        /// <param name="keyword">关键词（名称/编码）</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetClassifyList(string keyword,string CType)
+        {
+            var data = wP_CatalogIBLL.GetClassifyList(keyword,CType);
+            return this.JsonResult(data);
+        }
+
+
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var WP_CatalogData = wP_CatalogIBLL.GetWP_CatalogEntity( keyValue );
+            var jsonData = new {
+                WP_Catalog = WP_CatalogData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            wP_CatalogIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, WP_CatalogEntity entity)
+        {
+            wP_CatalogIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_FileListController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_FileListController.cs
new file mode 100644
index 000000000..474633b15
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_FileListController.cs	
@@ -0,0 +1,132 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-09-29 12:04
+    /// 描 述：文件管理
+    /// </summary>
+    public class WP_FileListController : MvcControllerBase
+    {
+        private WP_FileListIBLL wP_FileListIBLL = new WP_FileListBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 安全管理页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult SecuritySetting()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = wP_FileListIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var WP_FileListData = wP_FileListIBLL.GetWP_FileListEntity(keyValue);
+            var jsonData = new
+            {
+                WP_FileList = WP_FileListData,
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取左侧树形数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetTree(string CType)
+        {
+            var data = wP_FileListIBLL.GetTree(CType);
+            return Success(data);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            wP_FileListIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            WP_FileListEntity entity = strEntity.ToObject<WP_FileListEntity>();
+            wP_FileListIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_WorkPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_WorkPlanController.cs
new file mode 100644
index 000000000..82b3199cc
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_WorkPlanController.cs	
@@ -0,0 +1,112 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-09-28 13:15
+    /// 描 述：工作计划
+    /// </summary>
+    public class WP_WorkPlanController : MvcControllerBase
+    {
+        private WP_WorkPlanIBLL wP_WorkPlanIBLL = new WP_WorkPlanBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = wP_WorkPlanIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var WP_WorkPlanData = wP_WorkPlanIBLL.GetWP_WorkPlanEntity( keyValue );
+            var jsonData = new {
+                WP_WorkPlan = WP_WorkPlanData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            wP_WorkPlanIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [ValidateInput(false)]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            WP_WorkPlanEntity entity = strEntity.ToObject<WP_WorkPlanEntity>();
+            wP_WorkPlanIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_WorkSummaryController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_WorkSummaryController.cs
new file mode 100644
index 000000000..20c5cf1d4
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WP_WorkSummaryController.cs	
@@ -0,0 +1,113 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-09-28 13:25
+    /// 描 述：工作总结
+    /// </summary>
+    public class WP_WorkSummaryController : MvcControllerBase
+    {
+        private WP_WorkSummaryIBLL wP_WorkSummaryIBLL = new WP_WorkSummaryBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = wP_WorkSummaryIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var WP_WorkSummaryData = wP_WorkSummaryIBLL.GetWP_WorkSummaryEntity(keyValue);
+            var jsonData = new
+            {
+                WP_WorkSummary = WP_WorkSummaryData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            wP_WorkSummaryIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        [ValidateInput(false)]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            WP_WorkSummaryEntity entity = strEntity.ToObject<WP_WorkSummaryEntity>();
+            wP_WorkSummaryIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WorkStudyPayMoneyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WorkStudyPayMoneyController.cs
new file mode 100644
index 000000000..a1a99de90
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WorkStudyPayMoneyController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-04 16:07
+    /// 描 述：酬金发放
+    /// </summary>
+    public class WorkStudyPayMoneyController : MvcControllerBase
+    {
+        private WorkStudyPayMoneyIBLL workStudyPayMoneyIBLL = new WorkStudyPayMoneyBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = workStudyPayMoneyIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var WorkStudyPayMoneyData = workStudyPayMoneyIBLL.GetWorkStudyPayMoneyEntity( keyValue );
+            var jsonData = new {
+                WorkStudyPayMoney = WorkStudyPayMoneyData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            workStudyPayMoneyIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            WorkStudyPayMoneyEntity entity = strEntity.ToObject<WorkStudyPayMoneyEntity>();
+            workStudyPayMoneyIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WorkStudyPositionApplyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WorkStudyPositionApplyController.cs
new file mode 100644
index 000000000..a0ece9a87
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WorkStudyPositionApplyController.cs	
@@ -0,0 +1,132 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-04 16:01
+    /// 描 述：岗位申请
+    /// </summary>
+    public class WorkStudyPositionApplyController : MvcControllerBase
+    {
+        private WorkStudyPositionApplyIBLL workStudyPositionApplyIBLL = new WorkStudyPositionApplyBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = workStudyPositionApplyIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var WorkStudyPositionApplyData = workStudyPositionApplyIBLL.GetWorkStudyPositionApplyEntity(keyValue);
+            var jsonData = new
+            {
+                WorkStudyPositionApply = WorkStudyPositionApplyData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            workStudyPositionApplyIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            WorkStudyPositionApplyEntity entity = strEntity.ToObject<WorkStudyPositionApplyEntity>();
+            entity.CheckStatus = false;
+            workStudyPositionApplyIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        /// <summary>
+        /// 审核实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoCheck(string keyValue, bool checkStatus)
+        {
+            var entity = workStudyPositionApplyIBLL.GetWorkStudyPositionApplyEntity(keyValue);
+            if (entity == null)
+            {
+                return Fail("数据不存在！");
+            }
+            entity.CheckStatus = checkStatus;
+            workStudyPositionApplyIBLL.SaveEntity(keyValue, entity);
+            return Success("操作成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WorkStudyPositionController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WorkStudyPositionController.cs
new file mode 100644
index 000000000..c5573715d
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/WorkStudyPositionController.cs	
@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-03-04 15:54
+    /// 描 述：岗位管理
+    /// </summary>
+    public class WorkStudyPositionController : MvcControllerBase
+    {
+        private WorkStudyPositionIBLL workStudyPositionIBLL = new WorkStudyPositionBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = workStudyPositionIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var WorkStudyPositionData = workStudyPositionIBLL.GetWorkStudyPositionEntity( keyValue );
+            var jsonData = new {
+                WorkStudyPosition = WorkStudyPositionData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            workStudyPositionIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            WorkStudyPositionEntity entity = strEntity.ToObject<WorkStudyPositionEntity>();
+            workStudyPositionIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 8bb851850..278c7b6ee 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -470,6 +470,14 @@
     <Compile Include="Areas\LR_WorkFlowModule\Controllers\WfSystemDemoController.cs" />
     <Compile Include="Areas\LR_WorkFlowModule\LR_WorkFlowModuleAreaRegistration.cs" />
     <Compile Include="Areas\Permission\PermissionAreaRegistration.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\EpidemicReportController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\EpidemicSituationCopyController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\MP_PerformanceTrackingController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\MP_QualityObjectivesController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\MP_ManagementPlanController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\OvertimeApplicationController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\StuSaverecordController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TimeTableController.cs" />
     <Compile Include="Areas\PersonnelManagement\PersonnelManagementAreaRegistration.cs" />
     <Compile Include="Areas\ReceiveSendFeeManagement\ReceiveSendFeeManagementAreaRegistration.cs" />
     <Compile Include="Areas\StudentWork\Controllers\SW_Ask_MainController.cs" />
@@ -516,6 +524,14 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\JournalSendController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\JournalReceiveController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\AddressBookController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherCertificateController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherTrainController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherTitleEvaluationController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherRetireController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherDimissionController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherTitleChangeController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherPostChangeController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SalarySheetController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_ReceiveFileController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_SendFileController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_SendComplaintController.cs" />
@@ -565,6 +581,11 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\OpenLessonPlanOfElectiveDelController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ElectiveMajorController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\OpenLessonPlanOfElectiveChangeController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\MP_BrowseRecordController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\WP_WorkPlanController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\WP_WorkSummaryController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\WP_CatalogController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\WP_FileListController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuScoreNotPassTwoController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\WeChatConfigController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\WeChatTempletController.cs" />
@@ -584,15 +605,53 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\InternShipSummaryController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\InternshipAchievementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\InternshipExcellentController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\DutyScheduleController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\PartyMemberController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\PMLearnArrangementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\InformationSectionController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\SealManagerController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\OfficialSealManagerController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ConferenceRoomController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ActivityVenueController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\VenhicleManageController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\HomeWorkController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\LeaveSchoolController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\LoginModelController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuMailController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ActivityScheduleController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ClassWorkController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\EmpRepairController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\PMOrganizationController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\PMCadreController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\PMMembershipController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\PMLifeController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\PMDuesController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRProjectController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRWorkController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRPaperController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRConferenceController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRAppraisalController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuCancelExamController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LeagueActivityController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LeagueMemberChangeController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LeagueMemberController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\CommunityInfoController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\CommunityMemberController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\CommunityAttendanceController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuConsumptionController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\EpidemicSituationController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ContactsDetailsController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ArrangeLessonButtController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherRecruitPlanController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherCancelEmployController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherJobAssessmentController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherPartTimeJobController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherEncourgementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherChangeController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\EpiPassPlaceController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\EpiPeopleDetailsController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LaborUnionPlanController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SchoolWomenManagementController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\ThematicManagementController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\DTTitleController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\BC_EmpViolationRecordController.cs" />
@@ -611,12 +670,69 @@
     <Compile Include="Areas\LogisticsManagement\Controllers\BC_RegisterOutController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\BC_ISPManagementController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\BC_ISPShowController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\PartyMemberEncouragementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\PartyMemberPunishmentController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\PMMembershipChangeController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\PartyMemberTrainController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LeagueMemberDuesController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LeagueMemberEncouragementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LeagueMemberPunishmentController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LeagueMemberTrainController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\VolunteerActivityController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LaborUnionOrganizationController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LaborUnionMemberController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LaborUnionMemberEncouragementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LaborUnionFeesIncomeController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LaborUnionFeesExpendController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LaborUnionWelfareController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LaborUnionWelfareApplyController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\LaborUnionActivityController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\WorkStudyPositionController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\WorkStudyPositionApplyController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\WorkStudyPayMoneyController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ScholarshipManagementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\FundManagementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_PublishManagementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_PopQuizController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_ElectronicMaterialMangementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_MicroClassSystemController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_MindMappingController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_DiscussionResultsController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_EvaluationInformationController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_ExcellentCourseController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_PracticeTemplateController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_InternshipFileController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_EffectEvaluationController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuMoralEducationController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\InsuranceHandleController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\InsuranceClaimController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_CostManagementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_ExaminationController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_TrainingApplicationController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\BC_StudentEnrolmentController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\MoralEducationSetController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ClassMoralEducationController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ClassDataHandInController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\CommunityActivityController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\CommunityMemberEncouragementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRProjectApplyController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRProjectSetUpController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRFeesIncomeController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRFeesExpendController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRProcessController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRFinalController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRAchievementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRWinningController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRWorkloadController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SREncouragementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\SRDocumentController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\MeetingManagementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherPassportController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherGoAbroadController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\Sal_SalaryTemplateController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\Sal_SalaryTemplateItemController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\Sal_UserSalaryController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\Sal_UserSalaryItemController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\PM_EducationExperienceController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\PM_TechnicalPostController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\PM_WorkerTechnologyController.cs" />
@@ -625,6 +741,9 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\ThermographyController.cs" />
     <Compile Include="Areas\AdmissionsPlatform\Controllers\AP_OnlineUserInfoController.cs" />
     <Compile Include="Areas\AdmissionsPlatform\Controllers\AP_OnlineStudentInfoController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherPunishmentController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ContractCategoryController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ContractManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\SignUpAboutOnlineController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\SignUpAboutTrainController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuInfoBasicTwoController.cs" />
@@ -649,6 +768,8 @@
     <Compile Include="Areas\LogisticsManagement\Controllers\AJ_FYController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\SupportManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\PBPostController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\PMMeetingController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\PMActivistsController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\Acc_CleanManagementController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\Acc_RewardController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\Acc_PunishmentController.cs" />
@@ -664,15 +785,16 @@
     <Compile Include="Startup1.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ADR_DeviceController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ADR_DeviceLogController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ADR_RestrictionController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ADR_AddApplyController.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\Ass_AcceptanceController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\LoginUserBindController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_InformationPushController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuLeaveManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\EATalentTrainController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_DefaultPwdConfigController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\ResearchMentController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\ResearchGERController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\FundExaminerController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\MeetingSignInRecordController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\MeetingMinutesController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6019,18 +6141,6 @@
     <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Form.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Form.js" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Index.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Index.js" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Form.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Form.js" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Index.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Index.js" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Form.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Form.js" />
-    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Index.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Index.js" />
-    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Form.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\LR_Desktop\Models\" />

From c819f88b67921c89fe1e4cdcdc33846a73a9a262 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Tue, 11 May 2021 10:42:16 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BC=9A=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Learun.Application.Web.csproj             | 33 +++++++++++++++++++
 .../Learun.Application.Mapping.csproj         |  4 +++
 .../Learun.Application.TwoDevelopment.csproj  | 16 +++++++++
 3 files changed, 53 insertions(+)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 278c7b6ee..dbeb29b24 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -389,6 +389,9 @@
     <Compile Include="Areas\LR_Desktop\Controllers\DTListController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\DTSettingController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\DTTargetController.cs" />
+    <Compile Include="Areas\LR_Desktop\Controllers\MessageRindController.cs" />
+    <Compile Include="Areas\LR_Desktop\Controllers\SSO_Drag_CardSortManageController.cs" />
+    <Compile Include="Areas\LR_Desktop\Controllers\SSO_Drag_DesktopManageController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\WeChatDevelopController.cs" />
     <Compile Include="Areas\LR_Desktop\LR_DesktopAreaRegistration.cs" />
     <Compile Include="Areas\LR_DisplayBoard\Controllers\LR_KBConfigInfoController.cs" />
@@ -472,6 +475,7 @@
     <Compile Include="Areas\Permission\PermissionAreaRegistration.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\EpidemicReportController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\EpidemicSituationCopyController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\MeetingNoticeController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MP_PerformanceTrackingController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MP_QualityObjectivesController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MP_ManagementPlanController.cs" />
@@ -1237,6 +1241,12 @@
     <Content Include="Areas\LR_Desktop\Views\DTSetting\App\AppIndex.js" />
     <Content Include="Areas\LR_Desktop\Views\DTSetting\PC\PcIndex.css" />
     <Content Include="Areas\LR_Desktop\Views\DTSetting\PC\PcIndex.js" />
+    <Content Include="Areas\LR_Desktop\Views\MessageRind\Form.js" />
+    <Content Include="Areas\LR_Desktop\Views\MessageRind\Index.js" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CardSortManage\Form.js" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CardSortManage\Index.js" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Form.js" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Index.js" />
     <Content Include="Areas\LR_Desktop\Views\WeChatDevelop\Form.js" />
     <Content Include="Areas\LR_Desktop\Views\WeChatDevelop\Index.js" />
     <Content Include="Areas\LR_DisplayBoard\Views\LR_KBConfigInfo\ChartForm.css" />
@@ -1345,8 +1355,16 @@
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRemove.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormTerminate.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRenew.js" />
+    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyApply.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.css" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.js" />
     <Content Include="Areas\PersonnelManagement\Views\StuSaverecord\IndexForStudent.js" />
@@ -6909,6 +6927,21 @@
     <Content Include="Areas\EducationalAdministration\Views\Thermography\IndexResult.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\FormView.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyApply.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Index.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\MessageRind\Form.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\MessageRind\Index.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\MessageRind\UnreadIndex.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CardSortManage\Form.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CardSortManage\Index.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Form.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Index.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
index 784c033b6..0135a55d9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj	
@@ -110,6 +110,9 @@
     <Compile Include="LR_CodeDemo\LR_OA_ProjectMap.cs" />
     <Compile Include="LR_CRM\CrmCustomerContactMap.cs" />
     <Compile Include="LR_CRM\CrmChanceMap.cs" />
+    <Compile Include="LR_Desktop\MessageRemindMap.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CardSortManageMap.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_DesktopManageMap.cs" />
     <Compile Include="LR_Desktop\WeChatDevelopMap.cs" />
     <Compile Include="LR_Excel\ExcelExportMap.cs" />
     <Compile Include="LR_Excel\ExcelImportFieldMap.cs" />
@@ -194,6 +197,7 @@
     <Compile Include="LR_WorkFlow\WfTaskHistoryMap.cs" />
     <Compile Include="LR_WorkFlow\WfTaskMap.cs" />
     <Compile Include="PersonnelManagement\JbjiabanMap.cs" />
+    <Compile Include="PersonnelManagement\MeetingNoticeMap.cs" />
     <Compile Include="PersonnelManagement\MP_ManageMentPlanMap.cs" />
     <Compile Include="PersonnelManagement\PMCadreMap.cs" />
     <Compile Include="PersonnelManagement\PMDuesMap.cs" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
index 9491a7863..324aeabfa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj	
@@ -256,6 +256,18 @@
     <Compile Include="LR_CodeDemo\WorkOrder\WorkOrderBLL.cs" />
     <Compile Include="LR_CodeDemo\WorkOrder\WorkOrderIBLL.cs" />
     <Compile Include="LR_CodeDemo\WorkOrder\WorkOrderService.cs" />
+    <Compile Include="LR_Desktop\MessageRind\MessageRemindEntity.cs" />
+    <Compile Include="LR_Desktop\MessageRind\MessageRindBLL.cs" />
+    <Compile Include="LR_Desktop\MessageRind\MessageRindIBLL.cs" />
+    <Compile Include="LR_Desktop\MessageRind\MessageRindService.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CardSortManage\SSO_Drag_CardSortManageBLL.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CardSortManage\SSO_Drag_CardSortManageEntity.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CardSortManage\SSO_Drag_CardSortManageIBLL.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CardSortManage\SSO_Drag_CardSortManageService.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_DesktopManage\SSO_Drag_DesktopManageBLL.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_DesktopManage\SSO_Drag_DesktopManageEntity.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_DesktopManage\SSO_Drag_DesktopManageIBLL.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_DesktopManage\SSO_Drag_DesktopManageService.cs" />
     <Compile Include="LR_Desktop\WeChatDevelop\WeChatDevelopBLL.cs" />
     <Compile Include="LR_Desktop\WeChatDevelop\WeChatDevelopEntity.cs" />
     <Compile Include="LR_Desktop\WeChatDevelop\WeChatDevelopIBLL.cs" />
@@ -285,6 +297,10 @@
     <Compile Include="PersonnelManagement\BC_PublishManagement\BC_PublishManagementEntity.cs" />
     <Compile Include="PersonnelManagement\BC_PublishManagement\BC_PublishManagementIBLL.cs" />
     <Compile Include="PersonnelManagement\BC_PublishManagement\BC_PublishManagementService.cs" />
+    <Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeBLL.cs" />
+    <Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeEntity.cs" />
+    <Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeIBLL.cs" />
+    <Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeService.cs" />
     <Compile Include="PersonnelManagement\MP_PerformanceTracking\MP_PerformanceTrackingBLL.cs" />
     <Compile Include="PersonnelManagement\MP_PerformanceTracking\MP_PerformanceTrackingIBLL.cs" />
     <Compile Include="PersonnelManagement\MP_PerformanceTracking\MP_PerformanceTrackingService.cs" />

From 0080461b126b516e43ffe0f293b2f1f509fd7471 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Tue, 11 May 2021 10:43:10 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E9=9F=B3=E9=A2=91=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Learun.Application.Web/Learun.Application.Web.csproj         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index dbeb29b24..4e00677af 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -3758,6 +3758,7 @@
     <Content Include="Content\webuploader\webuploader.withoutimage.min.js" />
     <Content Include="Areas\LR_WorkFlowModule\Views\WfScheme\Form.cshtml" />
     <Content Include="Areas\LR_WorkFlowModule\Views\WfScheme\HistoryForm.cshtml" />
+    <Content Include="Resource\wav\收到新消息.wav" />
     <Content Include="Views\Home\AdminAccordion\Index.css" />
     <Content Include="Views\Home\AdminAccordion\Index.js" />
     <Content Include="Views\Home\AdminDefault\indexNavigation.js" />

From 718e109e5f648a119fb4697953c3f10da793609f Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Sun, 25 Apr 2021 18:01:29 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?=
 =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E5=A4=A7=E5=8E=85-=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=95=88=E7=8E=87=E5=88=86=E6=9E=90=EF=BC=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=97=B6=E9=97=B4=E7=BB=9F=E8=AE=A1=E3=80=81?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=AC=A1=E6=95=B0=E7=BB=9F=E8=AE=A1=E3=80=81?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8A=A5=E8=A1=A8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Learun.Application.Web/Learun.Application.Web.csproj    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 4e00677af..2a742ae0c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -1283,6 +1283,9 @@
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\PersonalFiling.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\SelectUserForm.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\SignForm.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticCountIndex.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticTimeForm.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticTimeIndex.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\EqualForm.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\Form.css" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\Form.js" />
@@ -6943,6 +6946,9 @@
     <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CardSortManage\Index.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Form.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Index.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticCountIndex.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticTimeForm.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticTimeIndex.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />