From 87f5eb65aaaa2aaa3061a395e3f14e980dd1e034 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Fri, 25 Feb 2022 18:18:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=BF=E8=88=8D=E5=BA=8A=E4=BD=8D=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Learun.Application.Web.csproj             | 44 ++++++++-----------
 .../Accommodation/AccommodationBLL.cs         | 30 -------------
 .../Accommodation/AccommodationService.cs     |  2 +-
 3 files changed, 19 insertions(+), 57 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 369f542c8..1acab8b68 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	
@@ -1300,23 +1300,17 @@
     <Content Include="Areas\EducationalAdministration\Views\TeachPlan\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\TeachSwitch\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\TeachSwitch\Index.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormClassify.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Allocation.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\DormitoryAdd.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Form.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormBed.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormRoom.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormClass.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormDept.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormClassify.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormBed.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormRoom.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormClass.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormDept.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Allocation.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\DormitoryAdd.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexClassify.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormRoom.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexBed.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexDistribution.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexClassify.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexBed.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexDistribution.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticDetailIndex.js" />
@@ -5583,10 +5577,6 @@
     <Content Include="Areas\LR_Desktop\Views\Sys_QRCodeInLogin\Index.js" />
     <Content Include="Areas\LR_Desktop\Views\Sys_QRCodeInLogin\Form.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\Sys_QRCodeInLogin\Form.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Index.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Index.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Form.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Form.js" />
     <Content Include="Areas\Permission\Views\Perm_ChartGroup\Index.cshtml" />
     <Content Include="Areas\Permission\Views\Perm_ChartGroup\Index.js" />
     <Content Include="Areas\Permission\Views\Perm_ChartGroup\Form.cshtml" />
@@ -6856,16 +6846,9 @@
     <Content Include="Areas\Ask\Views\Ask_Main\StudentIndex.cshtml" />
     <Content Include="Areas\Ask\Views\Ask_Main\Paper.cshtml" />
     <Content Include="Areas\Ask\Views\Ask_Main\PaperView.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\DormitoryAdd.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Allocation.cshtml" />
     <Content Include="Areas\Ask\Views\Ask_Main\PaperAdminView.cshtml" />
     <Content Include="Areas\Permission\Views\Perm_Function\TeacherIndex.cshtml" />
     <Content Include="Areas\Permission\Views\Perm_Function\FormTeacher.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Floor.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Unit.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Corridor.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Dormitory.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Room.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElective\StudentIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuSelectLessonListOfElective\AuditIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuSelectLessonListOfElective\FinishIndex.cshtml" />
@@ -7584,14 +7567,23 @@
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\MajorIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormView.cshtml" />
     <Content Include="Areas\LR_SystemModule\Views\Log\ApiIndex.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexDistribution.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormDept.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Allocation.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Corridor.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Dormitory.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\DormitoryAdd.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Floor.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Form.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormBed.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormClass.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormClassify.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormDept.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormRoom.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Index.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexBed.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormBed.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexClassify.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormClassify.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexDistribution.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Room.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\Unit.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs
index fcff22718..d63fd9665 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs	
@@ -400,36 +400,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 }
             }
         }
-
-        
-        public List<TreeModel> GetClassifyTree()
-        {
-            try
-            {
-                List<Acc_DormitoryBuildEntity> list = accommodationService.GetClassifyTree();
-                List<TreeModel> treeList = new List<TreeModel>();
-                foreach (Acc_DormitoryBuildEntity item in list)
-                {
-                    TreeModel node = new TreeModel
-                    {
-                        id = item.ID.ToString(),
-                        text = item.Name.ToString(),
-                        value = item.ID.ToString(),
-                        showcheck = false,
-                        checkstate = 0,
-                        isexpand = false,
-                        parentId = item.ParentID == null ? "" : item.ParentID,
-                        title =string.IsNullOrEmpty(item.BuildType)?"":(Convert.ToInt32(item.BuildType)+1).ToString() ,
-
-                    };
-
-
-                    treeList.Add(node);
-
-
-                }
-
-        
         public List<TreeModel> GetClassifyTree()
         {
             try
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs
index d24c3b099..74cab8b6c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs	
@@ -1032,7 +1032,7 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<Acc_RewardEntity>(t => t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<Acc_DormitoryBuildEntity>(t => t.ID == keyValue);
                 UpdateCheckInNum(ParentID);
             }
             catch (Exception ex)