挑拣宿舍管理缺失代码

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -144,6 +144,14 @@
     <Compile Include="EducationalAdministration\ClassPlan\ClassPlanBLL.cs" />
     <Compile Include="EducationalAdministration\ClassPlan\ClassPlanIBLL.cs" />
     <Compile Include="EducationalAdministration\ClassPlan\ClassPlanService.cs" />
+    <Compile Include="EducationalAdministration\DispatchAudit\DispatchAuditBLL.cs" />
+    <Compile Include="EducationalAdministration\DispatchAudit\DispatchAuditEntity.cs" />
+    <Compile Include="EducationalAdministration\DispatchAudit\DispatchAuditIBLL.cs" />
+    <Compile Include="EducationalAdministration\DispatchAudit\DispatchAuditService.cs" />
+    <Compile Include="EducationalAdministration\Dispatch\DispatchBLL.cs" />
+    <Compile Include="EducationalAdministration\Dispatch\DispatchEntity.cs" />
+    <Compile Include="EducationalAdministration\Dispatch\DispatchIBLL.cs" />
+    <Compile Include="EducationalAdministration\Dispatch\DispatchService.cs" />
     <Compile Include="EducationalAdministration\EADateArrange\EADateArrangeBLL.cs" />
     <Compile Include="EducationalAdministration\EADateArrange\EADateArrangeEntity.cs" />
     <Compile Include="EducationalAdministration\EADateArrange\EADateArrangeIBLL.cs" />
@@ -184,6 +192,10 @@
     <Compile Include="EducationalAdministration\StuCancelLeaveManagement\StuCancelLeaveManagementEntity.cs" />
     <Compile Include="EducationalAdministration\StuCancelLeaveManagement\StuCancelLeaveManagementIBLL.cs" />
     <Compile Include="EducationalAdministration\StuCancelLeaveManagement\StuCancelLeaveManagementService.cs" />
+    <Compile Include="EducationalAdministration\StuDisciplineManagement\StuDisciplineManagementBLL.cs" />
+    <Compile Include="EducationalAdministration\StuDisciplineManagement\StuDisciplineManagementEntity.cs" />
+    <Compile Include="EducationalAdministration\StuDisciplineManagement\StuDisciplineManagementIBLL.cs" />
+    <Compile Include="EducationalAdministration\StuDisciplineManagement\StuDisciplineManagementService.cs" />
     <Compile Include="EducationalAdministration\StuEnrollAmountRecord\StuEnrollAmountRecordBLL.cs" />
     <Compile Include="EducationalAdministration\StuEnrollAmountRecord\StuEnrollAmountRecordEntity.cs" />
     <Compile Include="EducationalAdministration\StuEnrollAmountRecord\StuEnrollAmountRecordIBLL.cs" />
@@ -362,6 +374,22 @@
     <Compile Include="PersonnelManagement\PMOrganization\PMOrganizationEntity.cs" />
     <Compile Include="PersonnelManagement\PMOrganization\PMOrganizationIBLL.cs" />
     <Compile Include="PersonnelManagement\PMOrganization\PMOrganizationService.cs" />
+    <Compile Include="PersonnelManagement\ReleaseMetting\ReleaseMettingBLL.cs" />
+    <Compile Include="PersonnelManagement\ReleaseMetting\ReleaseMettingEntity.cs" />
+    <Compile Include="PersonnelManagement\ReleaseMetting\ReleaseMettingIBLL.cs" />
+    <Compile Include="PersonnelManagement\ReleaseMetting\ReleaseMettingService.cs" />
+    <Compile Include="PersonnelManagement\ResearchGER\ResearchGERBLL.cs" />
+    <Compile Include="PersonnelManagement\ResearchGER\ResearchGEREntity.cs" />
+    <Compile Include="PersonnelManagement\ResearchGER\ResearchGERIBLL.cs" />
+    <Compile Include="PersonnelManagement\ResearchGER\ResearchGERService.cs" />
+    <Compile Include="PersonnelManagement\ResearchMent\ResearchMentBLL.cs" />
+    <Compile Include="PersonnelManagement\ResearchMent\ResearchMentEntity.cs" />
+    <Compile Include="PersonnelManagement\ResearchMent\ResearchMentIBLL.cs" />
+    <Compile Include="PersonnelManagement\ResearchMent\ResearchMentService.cs" />
+    <Compile Include="PersonnelManagement\ResourceImport\ResourceImportBLL.cs" />
+    <Compile Include="PersonnelManagement\ResourceImport\ResourceImportEntity.cs" />
+    <Compile Include="PersonnelManagement\ResourceImport\ResourceImportIBLL.cs" />
+    <Compile Include="PersonnelManagement\ResourceImport\ResourceImportService.cs" />
     <Compile Include="PersonnelManagement\SRAppraisal\SRAppraisalBLL.cs" />
     <Compile Include="PersonnelManagement\SRAppraisal\SRAppraisalEntity.cs" />
     <Compile Include="PersonnelManagement\SRAppraisal\SRAppraisalIBLL.cs" />
@@ -382,10 +410,22 @@
     <Compile Include="PersonnelManagement\SRWork\SRWorkEntity.cs" />
     <Compile Include="PersonnelManagement\SRWork\SRWorkIBLL.cs" />
     <Compile Include="PersonnelManagement\SRWork\SRWorkService.cs" />
+    <Compile Include="PersonnelManagement\StudyGuide\StudyGuideBLL.cs" />
+    <Compile Include="PersonnelManagement\StudyGuide\StudyGuideEntity.cs" />
+    <Compile Include="PersonnelManagement\StudyGuide\StudyGuideIBLL.cs" />
+    <Compile Include="PersonnelManagement\StudyGuide\StudyGuideService.cs" />
+    <Compile Include="PersonnelManagement\TeacherCancelLeaveManagement\TeacherCancelLeaveManagementBLL.cs" />
+    <Compile Include="PersonnelManagement\TeacherCancelLeaveManagement\TeacherCancelLeaveManagementEntity.cs" />
+    <Compile Include="PersonnelManagement\TeacherCancelLeaveManagement\TeacherCancelLeaveManagementIBLL.cs" />
+    <Compile Include="PersonnelManagement\TeacherCancelLeaveManagement\TeacherCancelLeaveManagementService.cs" />
     <Compile Include="PersonnelManagement\TeacherLeaveManagement\TeacherLeaveManagementBLL.cs" />
     <Compile Include="PersonnelManagement\TeacherLeaveManagement\TeacherLeaveManagementEntity.cs" />
     <Compile Include="PersonnelManagement\TeacherLeaveManagement\TeacherLeaveManagementIBLL.cs" />
     <Compile Include="PersonnelManagement\TeacherLeaveManagement\TeacherLeaveManagementService.cs" />
+    <Compile Include="PersonnelManagement\TeacherOvertimeManagement\TeacherOvertimeManagementBLL.cs" />
+    <Compile Include="PersonnelManagement\TeacherOvertimeManagement\TeacherOvertimeManagementEntity.cs" />
+    <Compile Include="PersonnelManagement\TeacherOvertimeManagement\TeacherOvertimeManagementIBLL.cs" />
+    <Compile Include="PersonnelManagement\TeacherOvertimeManagement\TeacherOvertimeManagementService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StudentWork\SW_Ask_Main\SW_Ask_MainBLL.cs" />
     <Compile Include="StudentWork\SW_Ask_Main\SW_Ask_MainEntity.cs" />
@@ -1687,6 +1727,10 @@
     <Compile Include="LogisticsManagement\Acc_DormitoryRule\Acc_DormitoryRuleService.cs" />
     <Compile Include="LogisticsManagement\Acc_DormitoryRule\Acc_DormitoryRuleBLL.cs" />
     <Compile Include="LogisticsManagement\Acc_DormitoryRule\Acc_DormitoryRuleIBLL.cs" />
+    <Compile Include="SystemDemo\Demoleave\DemoleaveBLL.cs" />
+    <Compile Include="SystemDemo\Demoleave\DemoleaveEntity.cs" />
+    <Compile Include="SystemDemo\Demoleave\DemoleaveIBLL.cs" />
+    <Compile Include="SystemDemo\Demoleave\DemoleaveService.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs

@@ -85,7 +85,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         {
             try
             {
-                return accommodationService.GetClassifyList(paginationobj,queryJson);
+                return accommodationService.GetClassifyList(paginationobj, queryJson);
             }
             catch (Exception ex)
             {
@@ -239,6 +239,27 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
 
         }
 
+        public void DeleteBed(string keyValue, string ParentID)
+        {
+            try
+            {
+                accommodationService.DeleteBed(keyValue, ParentID);
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+
+        }
+
         /// <summary>
         /// 获取Acc_DormitoryBuild表实体数据
         /// <param name="keyValue">主键</param>
@@ -401,7 +422,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
-        
+
         public List<TreeModel> GetClassifyTree()
         {
             try
@@ -419,7 +440,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                         checkstate = 0,
                         isexpand = false,
                         parentId = item.ParentID == null ? "" : item.ParentID,
-                        title =string.IsNullOrEmpty(item.BuildType)?"":(Convert.ToInt32(item.BuildType)+1).ToString() ,
+                        title = string.IsNullOrEmpty(item.BuildType) ? "" : (Convert.ToInt32(item.BuildType) + 1).ToString(),
 
                     };
 
@@ -489,7 +510,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
- /// <summary>
+        /// <summary>
         /// 根据父id 获取树形数据
         /// </summary>
         /// <param name="parentID"></param>
@@ -534,11 +555,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
 
             }
         }
-        public bool MatchDormitoryInfo(string stuNo,string dormitory,string unit,string floor,string room,string bed ,List<Acc_DormitoryBuildEntity> data)
+        public bool MatchDormitoryInfo(string stuNo, string dormitory, string unit, string floor, string room, string bed, List<Acc_DormitoryBuildEntity> data)
         {
             try
             {
-                return accommodationService.MatchDormitoryInfo(stuNo,dormitory,unit,floor,room,bed,data);
+                return accommodationService.MatchDormitoryInfo(stuNo, dormitory, unit, floor, room, bed, data);
 
             }
             catch (Exception ex)
@@ -613,7 +634,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue"></param>
         /// <param name="entity"></param>
-        public void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity,int type)
+        public void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity, int type)
         {
             try
             {
@@ -651,6 +672,25 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
+        public void SaveBedEntity(string keyValue, string ParentID, Acc_DormitoryBuildEntity entity)
+        {
+            try
+            {
+                accommodationService.SaveBedEntity(keyValue, ParentID, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 批量添加单元、楼层、宿舍、床位
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs

@@ -73,7 +73,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         void DeleteEntity(string keyValue);
         string GetBuildType(string parentID);
         string GetParentBuildType(string keyValue);
-
+        void DeleteBed(string keyValue, string ParentID);
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// <param name="keyValue">主键</param>
@@ -82,7 +82,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         void SaveEntity(string keyValue, Acc_DormitoryBuildEntity entity);
         void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity,int type);
         string SaveRoom(string RoomId, List<Acc_DormitoryBuildEntity> list);
-
+        void SaveBedEntity(string keyValue, string ParentID, Acc_DormitoryBuildEntity entity);
         /// <summary>
         /// 批量添加单元、楼层、房间、床位
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs

@@ -1082,6 +1082,90 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student
 
             }
         }
+        public void DeleteBed(string keyValue, string ParentID)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<Acc_DormitoryBuildEntity>(t => t.ID == keyValue);
+                UpdateCheckInNum(ParentID);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveBedEntity(string keyValue, string ParentID, Acc_DormitoryBuildEntity entity)
+        {
+            var db = this.BaseRepository("CollegeMIS");
+            try
+            {
+                db.BeginTrans();
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    db.Update(entity);
+                }
+                else
+                {
+                    var parentEntity = db.FindEntity<Acc_DormitoryBuildEntity>(ParentID);
+                    entity.Create();
+                    entity.ApartmentId = parentEntity.ApartmentId;
+                    entity.UnitId = parentEntity.UnitId;
+                    entity.FloorId = parentEntity.FloorId;
+                    entity.ParentID = ParentID;
+                    entity.BuildType = "5";
+                    db.Insert(entity);
+                }
+                db.Commit();
+                UpdateCheckInNum(ParentID);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        private void UpdateCheckInNum(string ParentID)
+        {
+            try
+            {
+                string sql = $@"update [dbo].[Acc_DormitoryBuild] set RoomType=(
+select count(1) from [dbo].[Acc_DormitoryBuild] where ParentId='{ParentID}' and  BuildType='5'
+)
+where ID='{ParentID}'
+";
+                this.BaseRepository("CollegeMIS").ExecuteBySql(sql);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
 
 
         /// <summary>