From 093eeb281f8e7c3847fac95fac53b6cbabd30eba Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Fri, 5 Nov 2021 15:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=BF=E8=88=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Accommodation/Form.cshtml           | 24 +++++++++++--------
 .../Views/Accommodation/Index.js              |  2 ++
 .../Accommodation/Acc_DormitoryBuildEntity.cs |  5 ++++
 .../Accommodation/AccommodationService.cs     |  6 +++++
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml
index c96287895..e2b246b99 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml	
@@ -3,9 +3,13 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
+        <div class="lr-form-item-title">编号</div>
+        <input id="DNo" type="text" class="form-control" />
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">名称</div>
-        <input id="Name" type="text" class="form-control" />
+        <input id="Name" type="text" class="form-control"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">学生</div>
@@ -14,7 +18,7 @@
 
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">位置</div>
-        <input id="Address" type="text" class="form-control" />
+        <input id="Address" type="text" class="form-control"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">类别<font face="宋体">*</font></div>
@@ -24,7 +28,7 @@
     {
         <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
             <div class="lr-form-item-title">父单位</div>
-            <input id="ParentID" type="hidden" value="@ViewBag.ParentID" />
+            <input id="ParentID" type="hidden" value="@ViewBag.ParentID"/>
             <label class="form-control">@ViewBag.ParentName</label>
         </div>
 
@@ -52,30 +56,30 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">负责人</div>
-        <input id="Functionary" type="text" class="form-control" />
+        <input id="Functionary" type="text" class="form-control"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">负责人电话</div>
-        <input id="Phone" type="text" class="form-control" />
+        <input id="Phone" type="text" class="form-control"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">价格</div>
-        <input id="Price" type="text" class="form-control" />
+        <input id="Price" type="text" class="form-control"/>
     </div>
 
     @if (ViewBag.BuildType == "4")
     {
         <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
             <div class="lr-form-item-title">舍长</div>
-            <input id="Leader" type="text" class="form-control" />
+            <input id="Leader" type="text" class="form-control"/>
         </div>
         <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
             <div class="lr-form-item-title">学生名字</div>
-            <input id="StudentID" type="text" class="form-control" />
+            <input id="StudentID" type="text" class="form-control"/>
         </div>
         <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
             <div class="lr-form-item-title">星级</div>
-            <input id="Starred" type="text" class="form-control" />
+            <input id="Starred" type="text" class="form-control"/>
         </div>
         <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
             <div class="lr-form-item-title">是否独卫</div>
@@ -85,7 +89,7 @@
 
     <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+        <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/Accommodation/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js
index c2917124b..3f0bd4f34 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js	
@@ -165,6 +165,7 @@ var bootstrap = function ($, learun) {
                 $('#gridtable').lrAuthorizeJfGridLei({
                     url: top.$.rootUrl + '/LogisticsManagement/Accommodation/GetPageList',
                     headData: [
+                        { label: "编号", name: "DNo", width: 100, align: "left" },
                         { label: "名称", name: "Name", width: 100, align: "left" },
                         { label: "学生名字", name: "StuName", width: 100, align: "left" },
 
@@ -208,6 +209,7 @@ var bootstrap = function ($, learun) {
                 $('#gridtable').lrAuthorizeJfGridLei({
                     url: top.$.rootUrl + '/LogisticsManagement/Accommodation/GetPageList',
                     headData: [
+                        { label: "编号", name: "DNo", width: 100, align: "left" },
                         { label: "名称", name: "Name", width: 100, align: "left" },
                         { label: "学生", name: "StudentID", width: 100, align: "left",
                             formatterAsync: function (callback, value, row, op, $cell) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs
index 8dfc1bb3a..4c0a5434b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs	
@@ -20,6 +20,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         [Column("ID")]
         public string ID { get; set; }
         /// <summary>
+        /// 编号
+        /// </summary>
+        [Column("DNo")]
+        public string DNo { get; set; }
+        /// <summary>
         /// 名称
         /// </summary>
         [Column("NAME")]
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 72d6b7479..a50da8fc5 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	
@@ -34,6 +34,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 strSql.Append("SELECT ");
                 strSql.Append(@"
                 t.ID,
+                t.DNo,
                 t.Name,
                 t.Address,
                 t.Campus,
@@ -64,6 +65,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("ParentID", queryParam["ParentID"].ToString(), DbType.String);
                     strSql.Append(" AND t.ParentID =@ParentID ");
                 }
+                if (!queryParam["DNo"].IsEmpty())
+                {
+                    dp.Add("DNo", queryParam["DNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DNo =@DNo ");
+                }
                 if (!queryParam["Name"].IsEmpty())
                 {
                     dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String);