From 5088cf1b7bc55b356ac445c5fde43020ea9d2cf4 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Wed, 16 Mar 2022 18:08:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=93=8D=E4=BD=9C=E9=94=99?=
=?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Learun.Application.Web.csproj | 1325 ++++++++---------
.../Learun.Application.Mapping.csproj | 42 -
.../Learun.Application.TwoDevelopment.csproj | 147 --
.../Accommodation/AccommodationService.cs | 37 +
4 files changed, 633 insertions(+), 918 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 2cd5285fa..06b26bd37 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
@@ -226,7 +226,7 @@
-
+
..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll
@@ -315,39 +315,30 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
-
-
@@ -372,8 +363,6 @@
-
-
@@ -403,11 +392,17 @@
+
+
+
+
+
+
@@ -432,9 +427,9 @@
+
-
@@ -487,19 +482,26 @@
+
+
-
-
+
+
+
+
+
+
+
-
+
@@ -710,7 +712,6 @@
-
@@ -748,7 +749,6 @@
-
@@ -813,40 +813,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -880,9 +855,6 @@
-
-
-
@@ -896,18 +868,13 @@
-
-
-
-
-
@@ -921,10 +888,7 @@
-
-
-
@@ -967,21 +931,11 @@
-
-
-
-
-
-
-
+
-
-
-
+
-
-
-
+
@@ -992,26 +946,24 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -1023,13 +975,14 @@
-
-
+
+
+
@@ -1038,10 +991,6 @@
-
-
-
-
@@ -1054,46 +1003,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
@@ -1110,8 +1037,6 @@
-
-
@@ -1129,29 +1054,20 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
@@ -1167,32 +1083,14 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1322,17 +1220,15 @@
-
-
-
+
+
-
-
-
-
+
+
+
@@ -1341,19 +1237,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1431,16 +1314,27 @@
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
@@ -1468,15 +1362,8 @@
-
-
-
-
-
-
-
@@ -1484,22 +1371,19 @@
-
-
+
-
-
@@ -1534,7 +1418,6 @@
-
@@ -1546,6 +1429,8 @@
+
+
@@ -1562,32 +1447,44 @@
-
+
+
-
-
-
-
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
@@ -1613,14 +1510,6 @@
-
-
-
-
-
-
-
-
@@ -1943,154 +1832,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2201,6 +1942,8 @@
+
+
@@ -2382,7 +2125,6 @@
-
@@ -3286,12 +3028,10 @@
-
-
@@ -3426,54 +3166,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -4186,16 +3884,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -5374,7 +5062,6 @@
-
@@ -5603,6 +5290,10 @@
+
+
+
+
@@ -6171,10 +5862,6 @@
-
-
-
-
@@ -6323,10 +6010,6 @@
-
-
-
-
@@ -6565,8 +6248,8 @@
-
-
+
+
@@ -6578,137 +6261,45 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -6723,10 +6314,348 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Designer
-
+
+ Designer
+
Designer
@@ -6858,18 +6787,10 @@
{1d192591-b85a-41db-ae3a-4bf9765786c1}
Learun.Workflow.Engine
-
- {65cc5cdc-9638-4dd0-b2d6-3182cc16d2da}
- Quanjiang.DigitalScholl.SendSms
-
{4D841EAD-3FD8-4FAC-BC67-C4CE6C0D1181}
Quanjiang.DigitalScholl.WebLicense
-
- {767d20c4-b983-4940-bf97-74d5479ca558}
- Quanjiang.DigitalSchool.Aspose
-
@@ -6904,9 +6825,16 @@
+
+
+
+
+
+
+
@@ -7120,7 +7048,7 @@
-
+
@@ -7470,19 +7398,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
@@ -7491,172 +7464,58 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -7728,21 +7587,29 @@
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
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 d3acfa803..5db3e3248 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
@@ -63,18 +63,14 @@
-
-
-
-
@@ -88,7 +84,6 @@
-
@@ -96,13 +91,10 @@
-
-
-
@@ -111,8 +103,6 @@
-
-
@@ -127,8 +117,6 @@
-
-
@@ -155,8 +143,6 @@
-
-
@@ -213,9 +199,7 @@
-
-
@@ -570,35 +554,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 4a459f288..ccfe45928 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
@@ -83,10 +83,6 @@
-
-
-
-
@@ -107,23 +103,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -187,14 +171,6 @@
-
-
-
-
-
-
-
-
@@ -232,10 +208,6 @@
-
-
-
-
@@ -271,14 +243,6 @@
-
-
-
-
-
-
-
-
@@ -287,10 +251,6 @@
-
-
-
-
@@ -318,14 +278,6 @@
-
-
-
-
-
-
-
-
@@ -359,18 +311,7 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -387,14 +328,6 @@
-
-
-
-
-
-
-
-
@@ -1718,10 +1651,6 @@
-
-
-
-
@@ -1730,46 +1659,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1786,46 +1679,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 800360996..acb177053 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
@@ -823,6 +823,43 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
}
}
+
+ ///
+ /// 获取树形数据(学生归宿)
+ ///
+ ///
+ public List GetSqlTreeForReturn()
+ {
+ try
+ {
+ List list = new List();
+ 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 roomList = this.BaseRepository("CollegeMIS")
+ .FindList(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(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);
+ }
+ }
+ }
+
///
/// 根据父id获取数据
///