条件操作错删除不存在文件

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

@@ -63,18 +63,14 @@
   <ItemGroup>
     <Compile Include="Ask\Ask_MainOfTeacherMap.cs" />
     <Compile Include="Ask\Ask_TeacherMainMap.cs" />
-    <Compile Include="AssetManagementSystem\Ass_AcceptanceMainMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_InventoryItemApplyMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_PurchaseItemApplyMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_ScrapItemMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_ScrapMap.cs" />
     <Compile Include="EducationalAdministration\ArrangeExamTermItemNewMap.cs" />
-    <Compile Include="EducationalAdministration\ArgLessonTermUpdRecordMap.cs" />
     <Compile Include="EducationalAdministration\ArrangeExamTermNewMap.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonSyncMap.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonTermAttemperMap.cs" />
-    <Compile Include="EducationalAdministration\AwardAndPunishmentMap.cs" />
-    <Compile Include="EducationalAdministration\AwardPunishInfoMap.cs" />
     <Compile Include="EducationalAdministration\Book_borrowinfoMap.cs" />
     <Compile Include="EducationalAdministration\Book_cardMap.cs" />
     <Compile Include="EducationalAdministration\Book_classMap.cs" />
@@ -88,7 +84,6 @@
     <Compile Include="EducationalAdministration\PracticeBaseMap.cs" />
     <Compile Include="EducationalAdministration\R_EnterBuildingMap.cs" />
     <Compile Include="EducationalAdministration\R_EnterSchoolMap.cs" />
-    <Compile Include="EducationalAdministration\ScholarshipMap.cs" />
     <Compile Include="EducationalAdministration\ScoreStatisticsMap.cs" />
     <Compile Include="EducationalAdministration\StuCancelLeaveManagementMap.cs" />
     <Compile Include="EducationalAdministration\StuDisciplineManagementMap.cs" />
@@ -96,13 +91,10 @@
     <Compile Include="EducationalAdministration\StuInfoBasicChangeMap.cs" />
     <Compile Include="EducationalAdministration\StuInfoFreshMap.cs" />
     <Compile Include="EducationalAdministration\StuInfoFreshOnlineServiceMap.cs" />
-    <Compile Include="EducationalAdministration\StuInfoSemsterMap.cs" />
     <Compile Include="EducationalAdministration\StuScoreNotPassMap.cs" />
     <Compile Include="EducationalAdministration\StuSelectLessonListOfElectivePreMap.cs" />
     <Compile Include="EducationalAdministration\StuVolunteerMap.cs" />
     <Compile Include="EducationalAdministration\Sys_ReceiveFileMap.cs" />
-    <Compile Include="EducationalAdministration\TeachingPlanItemMap.cs" />
-    <Compile Include="EducationalAdministration\TeachingPlanMap.cs" />
     <Compile Include="EducationalAdministration\TeachPlanMap.cs" />
     <Compile Include="EducationalAdministration\TeachSwitchMap.cs" />
     <Compile Include="EducationalAdministration\Teach_attendanceMap.cs" />
@@ -111,8 +103,6 @@
     <Compile Include="EvaluationTeach\Eval_QuestionItemsMap.cs" />
     <Compile Include="EvaluationTeach\Eval_QuestionMap.cs" />
     <Compile Include="EvaluationTeach\Eval_QuestionResultMap.cs" />
-    <Compile Include="LogisticsManagement\ProjectDataManageMap.cs" />
-    <Compile Include="LogisticsManagement\ProjectPhaseManageMap.cs" />
     <Compile Include="LR_App\DTImgMap.cs" />
     <Compile Include="LR_App\FunctionMap.cs" />
     <Compile Include="LR_App\FunctionSchemeMap.cs" />
@@ -127,8 +117,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\QualityReportChildMap.cs" />
-    <Compile Include="LR_Desktop\QualityReportMainMap.cs" />
     <Compile Include="LR_Desktop\WeChatDevelopMap.cs" />
     <Compile Include="LR_Excel\ExcelExportMap.cs" />
     <Compile Include="LR_Excel\ExcelImportFieldMap.cs" />
@@ -155,8 +143,6 @@
     <Compile Include="LR_IM\IMSysUserMap.cs" />
     <Compile Include="LR_LGManager\CorporateMaterialApplyMap.cs" />
     <Compile Include="LR_LGManager\CorporateMaterialItemMap.cs" />
-    <Compile Include="LR_LGManager\StudentLeave_zcMap.cs" />
-    <Compile Include="LR_LGManager\StudentLeaveMap.cs" />
     <Compile Include="LR_LGManager\LC_hetongMap.cs" />
     <Compile Include="LR_LGManager\StampApplyMap.cs" />
     <Compile Include="LR_Message\LR_MS_StrategyInfoMap.cs" />
@@ -213,9 +199,7 @@
     <Compile Include="LR_WorkFlow\WfSchemeMap.cs" />
     <Compile Include="LR_WorkFlow\WfTaskHistoryMap.cs" />
     <Compile Include="LR_WorkFlow\WfTaskMap.cs" />
-    <Compile Include="PersonnelManagement\EMP_PayrollOnceMap.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" />
@@ -570,35 +554,9 @@
     <Compile Include="EducationalAdministration\EATalentTrainMap.cs" />
     <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\EMP_PayrollMap.cs" />
     <Compile Include="LR_Desktop\MessageRemindMap.cs" />
-    <Compile Include="AssetManagementSystem\Ass_Storage_RoomMap.cs" />
-    <Compile Include="PersonnelManagement\VisitorInfoMap.cs" />
-    <Compile Include="LR_Desktop\LostArticleInfoMap.cs" />
-    <Compile Include="EducationalAdministration\LR_OA_SchoolNewsMap.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_BudgetBasicsMap.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_IncomeManageMap.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_PayManageMap.cs" />
-    <Compile Include="LR_Desktop\CalculateProjectMap.cs" />
-    <Compile Include="LR_Desktop\FormulaMainMap.cs" />
-    <Compile Include="LR_Desktop\FormulaChildMap.cs" />
-    <Compile Include="LogisticsManagement\ProjectTypeManageMap.cs" />
-    <Compile Include="LogisticsManagement\ProjectManageMap.cs" />
-    <Compile Include="EducationalAdministration\FillinFromMap.cs" />
-    <Compile Include="LogisticsManagement\ProjectProcessManageMap.cs" />
-    <Compile Include="PersonnelManagement\FD_BudgetFileMap.cs" />
-    <Compile Include="EducationalAdministration\TextBookInfoMap.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndentMap.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndentDetailMap.cs" />
-    <Compile Include="EducationalAdministration\TextBookSolSubMap.cs" />
-    <Compile Include="EducationalAdministration\TextBookSolSubDetailMap.cs" />
-    <Compile Include="EducationalAdministration\TextbookInOutMap.cs" />
-    <Compile Include="EducationalAdministration\TextBookInMap.cs" />
-    <Compile Include="EducationalAdministration\TextBookOutMap.cs" />
-    <Compile Include="EducationalAdministration\StuCardInfoMap.cs" />
     <Compile Include="LogisticsManagement\Acc_DormitoryReturnMap.cs" />
     <Compile Include="LogisticsManagement\Acc_DormitoryRuleMap.cs" />
   </ItemGroup>

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

@@ -83,10 +83,6 @@
     <Compile Include="AssetManagementSystem\AssScrap\AssScrapIBLL.cs" />
     <Compile Include="AssetManagementSystem\AssScrap\AssScrapService.cs" />
     <Compile Include="AssetManagementSystem\AssScrap\Ass_ScrapEntity.cs" />
-    <Compile Include="AssetManagementSystem\Ass_AcceptanceMain\Ass_AcceptanceMainBLL.cs" />
-    <Compile Include="AssetManagementSystem\Ass_AcceptanceMain\Ass_AcceptanceMainEntity.cs" />
-    <Compile Include="AssetManagementSystem\Ass_AcceptanceMain\Ass_AcceptanceMainIBLL.cs" />
-    <Compile Include="AssetManagementSystem\Ass_AcceptanceMain\Ass_AcceptanceMainService.cs" />
     <Compile Include="AssetManagementSystem\Ass_InventoryItemApply\Ass_InventoryItemApplyBLL.cs" />
     <Compile Include="AssetManagementSystem\Ass_InventoryItemApply\Ass_InventoryItemApplyEntity.cs" />
     <Compile Include="AssetManagementSystem\Ass_InventoryItemApply\Ass_InventoryItemApplyIBLL.cs" />
@@ -107,23 +103,11 @@
     <Compile Include="EducationalAdministration\ArrangeLessonSync\ArrangeLessonSyncEntity.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonSync\ArrangeLessonSyncIBLL.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonSync\ArrangeLessonSyncService.cs" />
-    <Compile Include="EducationalAdministration\ArgLessonTermUpdRecord\ArgLessonTermUpdRecordBLL.cs" />
-    <Compile Include="EducationalAdministration\ArgLessonTermUpdRecord\ArgLessonTermUpdRecordEntity.cs" />
-    <Compile Include="EducationalAdministration\ArgLessonTermUpdRecord\ArgLessonTermUpdRecordIBLL.cs" />
-    <Compile Include="EducationalAdministration\ArgLessonTermUpdRecord\ArgLessonTermUpdRecordService.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonTermAttemper\ArrangeLessonTermAttemperBLL.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonTermAttemper\ArrangeLessonTermAttemperEntity.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonTermAttemper\ArrangeLessonTermAttemperIBLL.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonTermAttemper\ArrangeLessonTermAttemperService.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonTerm\ArrangeLessonTermEntity.cs" />
-    <Compile Include="EducationalAdministration\AwardAndPunishment\AwardAndPunishmentBLL.cs" />
-    <Compile Include="EducationalAdministration\AwardAndPunishment\AwardAndPunishmentEntity.cs" />
-    <Compile Include="EducationalAdministration\AwardAndPunishment\AwardAndPunishmentIBLL.cs" />
-    <Compile Include="EducationalAdministration\AwardAndPunishment\AwardAndPunishmentService.cs" />
-    <Compile Include="EducationalAdministration\AwardPunishInfo\AwardPunishInfoBLL.cs" />
-    <Compile Include="EducationalAdministration\AwardPunishInfo\AwardPunishInfoEntity.cs" />
-    <Compile Include="EducationalAdministration\AwardPunishInfo\AwardPunishInfoIBLL.cs" />
-    <Compile Include="EducationalAdministration\AwardPunishInfo\AwardPunishInfoService.cs" />
     <Compile Include="EducationalAdministration\BCdCultureDegree\BCdCultureDegreeEntity.cs" />
     <Compile Include="EducationalAdministration\BookBorrow\BookBorrowBLL.cs" />
     <Compile Include="EducationalAdministration\BookBorrow\BookBorrowIBLL.cs" />
@@ -187,14 +171,6 @@
     <Compile Include="EducationalAdministration\R_EnterSchool\R_EnterSchoolEntity.cs" />
     <Compile Include="EducationalAdministration\R_EnterSchool\R_EnterSchoolIBLL.cs" />
     <Compile Include="EducationalAdministration\R_EnterSchool\R_EnterSchoolService.cs" />
-    <Compile Include="EducationalAdministration\Scholarshipzxj\ScholarshipxjBLL.cs" />
-    <Compile Include="EducationalAdministration\Scholarshipzxj\ScholarshipxjEntity.cs" />
-    <Compile Include="EducationalAdministration\Scholarshipzxj\ScholarshipxjIBLL.cs" />
-    <Compile Include="EducationalAdministration\Scholarshipzxj\ScholarshipxjService.cs" />
-    <Compile Include="EducationalAdministration\Scholarship\ScholarshipBLL.cs" />
-    <Compile Include="EducationalAdministration\Scholarship\ScholarshipEntity.cs" />
-    <Compile Include="EducationalAdministration\Scholarship\ScholarshipIBLL.cs" />
-    <Compile Include="EducationalAdministration\Scholarship\ScholarshipService.cs" />
     <Compile Include="EducationalAdministration\ScoreStatistics\ScoreStatisticsBLL.cs" />
     <Compile Include="EducationalAdministration\ScoreStatistics\ScoreStatisticsEntity.cs" />
     <Compile Include="EducationalAdministration\ScoreStatistics\ScoreStatisticsIBLL.cs" />
@@ -232,10 +208,6 @@
     <Compile Include="EducationalAdministration\StuInfoGraduate\StuInfoGraduateEntity.cs" />
     <Compile Include="EducationalAdministration\StuInfoGraduate\StuInfoGraduateIBLL.cs" />
     <Compile Include="EducationalAdministration\StuInfoGraduate\StuInfoGraduateService.cs" />
-    <Compile Include="EducationalAdministration\StuInfoSemster\StuInfoSemsterBLL.cs" />
-    <Compile Include="EducationalAdministration\StuInfoSemster\StuInfoSemsterEntity.cs" />
-    <Compile Include="EducationalAdministration\StuInfoSemster\StuInfoSemsterIBLL.cs" />
-    <Compile Include="EducationalAdministration\StuInfoSemster\StuInfoSemsterService.cs" />
     <Compile Include="EducationalAdministration\StuScoreNotPass\StuScoreNotPassBLL.cs" />
     <Compile Include="EducationalAdministration\StuScoreNotPass\StuScoreNotPassEntity.cs" />
     <Compile Include="EducationalAdministration\StuScoreNotPass\StuScoreNotPassIBLL.cs" />
@@ -271,14 +243,6 @@
     <Compile Include="EducationalAdministration\TeachingMaterial\TeachingMaterialEntity.cs" />
     <Compile Include="EducationalAdministration\TeachingMaterial\TeachingMaterialIBLL.cs" />
     <Compile Include="EducationalAdministration\TeachingMaterial\TeachingMaterialService.cs" />
-    <Compile Include="EducationalAdministration\TeachingPlanItem\TeachingPlanItemBLL.cs" />
-    <Compile Include="EducationalAdministration\TeachingPlanItem\TeachingPlanItemEntity.cs" />
-    <Compile Include="EducationalAdministration\TeachingPlanItem\TeachingPlanItemIBLL.cs" />
-    <Compile Include="EducationalAdministration\TeachingPlanItem\TeachingPlanItemService.cs" />
-    <Compile Include="EducationalAdministration\TeachingPlan\TeachingPlanBLL.cs" />
-    <Compile Include="EducationalAdministration\TeachingPlan\TeachingPlanEntity.cs" />
-    <Compile Include="EducationalAdministration\TeachingPlan\TeachingPlanIBLL.cs" />
-    <Compile Include="EducationalAdministration\TeachingPlan\TeachingPlanService.cs" />
     <Compile Include="EducationalAdministration\TeachPlan\TeachPlanBLL.cs" />
     <Compile Include="EducationalAdministration\TeachPlan\TeachPlanEntity.cs" />
     <Compile Include="EducationalAdministration\TeachPlan\TeachPlanIBLL.cs" />
@@ -287,10 +251,6 @@
     <Compile Include="EducationalAdministration\TeachSwitch\TeachSwitchEntity.cs" />
     <Compile Include="EducationalAdministration\TeachSwitch\TeachSwitchIBLL.cs" />
     <Compile Include="EducationalAdministration\TeachSwitch\TeachSwitchService.cs" />
-    <Compile Include="EducationalAdministration\TextbookInOut\TextBookInOutBLL.cs" />
-    <Compile Include="EducationalAdministration\TextbookInOut\TextBookInOutEntity.cs" />
-    <Compile Include="EducationalAdministration\TextbookInOut\TextBookInOutIBLL.cs" />
-    <Compile Include="EducationalAdministration\TextbookInOut\TextBookInOutService.cs" />
     <Compile Include="EducationalAdministration\Thermography\ThermographyEntity.cs" />
     <Compile Include="EvaluationTeach\Eval_Main\Eval_MainBLL.cs" />
     <Compile Include="EvaluationTeach\Eval_Main\Eval_MainEntity.cs" />
@@ -318,14 +278,6 @@
     <Compile Include="Feixing\UserModel.cs" />
     <Compile Include="LogisticsManagement\APAppointmentPsychologist\APAppointmentPsychologistEntity.cs" />
     <Compile Include="LogisticsManagement\CompanyNews\CompanyNewsEntity.cs" />
-    <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageBLL.cs" />
-    <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageEntity.cs" />
-    <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageIBLL.cs" />
-    <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageService.cs" />
-    <Compile Include="LogisticsManagement\ProjectPhaseManage\ProjectPhaseManageBLL.cs" />
-    <Compile Include="LogisticsManagement\ProjectPhaseManage\ProjectPhaseManageEntity.cs" />
-    <Compile Include="LogisticsManagement\ProjectPhaseManage\ProjectPhaseManageIBLL.cs" />
-    <Compile Include="LogisticsManagement\ProjectPhaseManage\ProjectPhaseManageService.cs" />
     <Compile Include="LR_CodeDemo\GantProject\GantProjectBLL.cs" />
     <Compile Include="LR_CodeDemo\GantProject\GantProjectIBLL.cs" />
     <Compile Include="LR_CodeDemo\GantProject\GantProjectService.cs" />
@@ -359,18 +311,7 @@
     <Compile Include="LR_LGManager\CorporateMaterialItem\CorporateMaterialItemEntity.cs" />
     <Compile Include="LR_LGManager\CorporateMaterialItem\CorporateMaterialItemIBLL.cs" />
     <Compile Include="LR_LGManager\CorporateMaterialItem\CorporateMaterialItemService.cs" />
-    <Compile Include="LR_LGManager\StudentLeave_zc\StudentLeave_zcBLL.cs" />
-    <Compile Include="LR_LGManager\StudentLeave_zc\StudentLeave_zcEntity.cs" />
-    <Compile Include="LR_LGManager\StudentLeave_zc\StudentLeave_zcIBLL.cs" />
-    <Compile Include="LR_LGManager\StudentLeave_zc\StudentLeave_zcService.cs" />
-    <Compile Include="LR_LGManager\StudentLeave\StudentLeaveBLL.cs" />
-    <Compile Include="LR_LGManager\StudentLeave\StudentLeaveEntity.cs" />
-    <Compile Include="LR_LGManager\StudentLeave\StudentLeaveIBLL.cs" />
-    <Compile Include="LR_LGManager\StudentLeave\StudentLeaveService.cs" />
-    <Compile Include="LR_LGManager\LC_hetong\LC_hetongBLL.cs" />
     <Compile Include="LR_LGManager\LC_hetong\LC_hetongEntity.cs" />
-    <Compile Include="LR_LGManager\LC_hetong\LC_hetongIBLL.cs" />
-    <Compile Include="LR_LGManager\LC_hetong\LC_hetongService.cs" />
     <Compile Include="LR_LGManager\StampApply\StampApplyBLL.cs" />
     <Compile Include="LR_LGManager\StampApply\StampApplyEntity.cs" />
     <Compile Include="LR_LGManager\StampApply\StampApplyIBLL.cs" />
@@ -387,14 +328,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\Emp_PayrollOnce\Emp_PayrollOnceBLL.cs" />
-    <Compile Include="PersonnelManagement\Emp_PayrollOnce\EMP_PayrollOnceEntity.cs" />
-    <Compile Include="PersonnelManagement\Emp_PayrollOnce\Emp_PayrollOnceIBLL.cs" />
-    <Compile Include="PersonnelManagement\Emp_PayrollOnce\Emp_PayrollOnceService.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" />
@@ -1718,10 +1651,6 @@
     <Compile Include="PersonnelManagement\MeetingSignInRecord\MeetingSignInRecordService.cs" />
     <Compile Include="PersonnelManagement\MeetingSignInRecord\MeetingSignInRecordBLL.cs" />
     <Compile Include="PersonnelManagement\MeetingSignInRecord\MeetingSignInRecordIBLL.cs" />
-    <Compile Include="PersonnelManagement\MeetingMinutes\MeetingMinutesEntity.cs" />
-    <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" />
@@ -1730,46 +1659,10 @@
     <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\Emp_Payroll\EMP_PayrollEntity.cs" />
-    <Compile Include="PersonnelManagement\Emp_Payroll\Emp_PayrollService.cs" />
-    <Compile Include="PersonnelManagement\Emp_Payroll\Emp_PayrollBLL.cs" />
-    <Compile Include="PersonnelManagement\Emp_Payroll\Emp_PayrollIBLL.cs" />
     <Compile Include="LR_Desktop\MessageRind\MessageRemindEntity.cs" />
     <Compile Include="LR_Desktop\MessageRind\MessageRindService.cs" />
     <Compile Include="LR_Desktop\MessageRind\MessageRindBLL.cs" />
     <Compile Include="LR_Desktop\MessageRind\MessageRindIBLL.cs" />
-    <Compile Include="AssetManagementSystem\Ass_Storage_Room\Ass_Storage_RoomEntity.cs" />
-    <Compile Include="AssetManagementSystem\Ass_Storage_Room\AssStorageRoomService.cs" />
-    <Compile Include="AssetManagementSystem\Ass_Storage_Room\AssStorageRoomBLL.cs" />
-    <Compile Include="AssetManagementSystem\Ass_Storage_Room\AssStorageRoomIBLL.cs" />
-    <Compile Include="PersonnelManagement\VisitorInfo\VisitorInfoEntity.cs" />
-    <Compile Include="PersonnelManagement\VisitorInfo\VisitorInfoService.cs" />
-    <Compile Include="PersonnelManagement\VisitorInfo\VisitorInfoBLL.cs" />
-    <Compile Include="PersonnelManagement\VisitorInfo\VisitorInfoIBLL.cs" />
-    <Compile Include="EducationalAdministration\SchoolNews\LR_OA_SchoolNewsEntity.cs" />
-    <Compile Include="EducationalAdministration\SchoolNews\SchoolNewsService.cs" />
-    <Compile Include="EducationalAdministration\SchoolNews\SchoolNewsBLL.cs" />
-    <Compile Include="EducationalAdministration\SchoolNews\SchoolNewsIBLL.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_BudgetBasics\FD_BudgetBasicsEntity.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_BudgetBasics\FD_BudgetBasicsService.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_BudgetBasics\FD_BudgetBasicsBLL.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_BudgetBasics\FD_BudgetBasicsIBLL.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_IncomeManage\FD_IncomeManageEntity.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_IncomeManage\FD_IncomeManageService.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_IncomeManage\FD_IncomeManageBLL.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_IncomeManage\FD_IncomeManageIBLL.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_PayManage\FD_PayManageEntity.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_PayManage\FD_PayManageService.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_PayManage\FD_PayManageBLL.cs" />
-    <Compile Include="ReceiveSendFeeManagement\FD_PayManage\FD_PayManageIBLL.cs" />
-    <Compile Include="LogisticsManagement\ProjectTypeManage\ProjectTypeManageEntity.cs" />
-    <Compile Include="LogisticsManagement\ProjectTypeManage\ProjectTypeManageService.cs" />
-    <Compile Include="LogisticsManagement\ProjectTypeManage\ProjectTypeManageBLL.cs" />
-    <Compile Include="LogisticsManagement\ProjectTypeManage\ProjectTypeManageIBLL.cs" />
-    <Compile Include="LogisticsManagement\ProjectManage\ProjectManageEntity.cs" />
-    <Compile Include="LogisticsManagement\ProjectManage\ProjectManageService.cs" />
-    <Compile Include="LogisticsManagement\ProjectManage\ProjectManageBLL.cs" />
-    <Compile Include="LogisticsManagement\ProjectManage\ProjectManageIBLL.cs" />
     <Compile Include="EducationalAdministration\FillinFrom\FillinFromEntity.cs" />
     <Compile Include="EducationalAdministration\FillinFrom\FillinFromService.cs" />
     <Compile Include="EducationalAdministration\FillinFrom\FillinFromBLL.cs" />
@@ -1786,46 +1679,6 @@
     <Compile Include="LR_Desktop\FormulaChild\FormulaChildService.cs" />
     <Compile Include="LR_Desktop\FormulaChild\FormulaChildBLL.cs" />
     <Compile Include="LR_Desktop\FormulaChild\FormulaChildIBLL.cs" />
-    <Compile Include="LogisticsManagement\ProjectProcessManage\ProjectProcessManageEntity.cs" />
-    <Compile Include="LogisticsManagement\ProjectProcessManage\ProjectProcessManageService.cs" />
-    <Compile Include="LogisticsManagement\ProjectProcessManage\ProjectProcessManageBLL.cs" />
-    <Compile Include="LogisticsManagement\ProjectProcessManage\ProjectProcessManageIBLL.cs" />
-    <Compile Include="PersonnelManagement\FD_BudgetFile\FD_BudgetFileEntity.cs" />
-    <Compile Include="PersonnelManagement\FD_BudgetFile\FD_BudgetFileService.cs" />
-    <Compile Include="PersonnelManagement\FD_BudgetFile\FD_BudgetFileBLL.cs" />
-    <Compile Include="PersonnelManagement\FD_BudgetFile\FD_BudgetFileIBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookInfo\TextBookInfoEntity.cs" />
-    <Compile Include="EducationalAdministration\TextBookInfo\TextBookInfoService.cs" />
-    <Compile Include="EducationalAdministration\TextBookInfo\TextBookInfoBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookInfo\TextBookInfoIBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndent\TextBookIndentEntity.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndent\TextBookIndentService.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndent\TextBookIndentBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndent\TextBookIndentIBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndentDetail\TextBookIndentDetailEntity.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndentDetail\TextBookIndentDetailService.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndentDetail\TextBookIndentDetailIBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndentDetail\TextBookIndentDetailBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookSolSub\TextBookSolSubEntity.cs" />
-    <Compile Include="EducationalAdministration\TextBookSolSub\TextBookSolSubService.cs" />
-    <Compile Include="EducationalAdministration\TextBookSolSub\TextBookSolSubBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookSolSub\TextBookSolSubIBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookSolSubDetail\TextBookSolSubDetailEntity.cs" />
-    <Compile Include="EducationalAdministration\TextBookSolSubDetail\TextBookSolSubDetailService.cs" />
-    <Compile Include="EducationalAdministration\TextBookSolSubDetail\TextBookSolSubDetailBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookSolSubDetail\TextBookSolSubDetailIBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookIn\TextBookInEntity.cs" />
-    <Compile Include="EducationalAdministration\TextBookIn\TextBookInService.cs" />
-    <Compile Include="EducationalAdministration\TextBookIn\TextBookInBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookIn\TextBookInIBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookOut\TextBookOutEntity.cs" />
-    <Compile Include="EducationalAdministration\TextBookOut\TextBookOutService.cs" />
-    <Compile Include="EducationalAdministration\TextBookOut\TextBookOutBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookOut\TextBookOutIBLL.cs" />
-    <Compile Include="EducationalAdministration\StuCardInfo\StuCardInfoEntity.cs" />
-    <Compile Include="EducationalAdministration\StuCardInfo\StuCardInfoService.cs" />
-    <Compile Include="EducationalAdministration\StuCardInfo\StuCardInfoBLL.cs" />
-    <Compile Include="EducationalAdministration\StuCardInfo\StuCardInfoIBLL.cs" />
     <Compile Include="LogisticsManagement\DormitoryReturn\Acc_DormitoryReturnEntity.cs" />
     <Compile Include="LogisticsManagement\DormitoryReturn\DormitoryReturnService.cs" />
     <Compile Include="LogisticsManagement\DormitoryReturn\DormitoryReturnBLL.cs" />

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

@@ -823,6 +823,43 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
             }
         }
 
+
+        /// <summary>
+        /// 获取树形数据(学生归宿)
+        /// </summary>
+        /// <returns></returns>
+        public List<Acc_DormitoryBuildEntity> GetSqlTreeForReturn()
+        {
+            try
+            {
+                List<Acc_DormitoryBuildEntity> list = new List<Acc_DormitoryBuildEntity>();
+                var roomSql = @"select * from [dbo].[Acc_DormitoryBuild] where ID in (
+select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0)
+)";
+                List<Acc_DormitoryBuildEntity> roomList = this.BaseRepository("CollegeMIS")
+                    .FindList<Acc_DormitoryBuildEntity>(roomSql).ToList();
+                list = roomList.Union(list).ToList();
+                var apartIds = roomList.Select(x => x.ApartmentId).Distinct().ToList();
+                var unitIds = roomList.Select(x => x.UnitId).Distinct().ToList();
+                var floorIds = roomList.Select(x => x.FloorId).Distinct().ToList();
+                var otherList = this.BaseRepository("CollegeMIS").FindList<Acc_DormitoryBuildEntity>(x =>
+                    apartIds.Contains(x.ID) || unitIds.Contains(x.ID) || floorIds.Contains(x.ID)).ToList();
+                list = list.Union(otherList).ToList();
+                return list.OrderBy(x => x.DNo).OrderBy(x => x.Name).ToList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 根据父id获取数据
         /// </summary>