学生
@@ -14,7 +18,7 @@
@if (ViewBag.BuildType == "4")
{
@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; }
///
+ /// 编号
+ ///
+ [Column("DNo")]
+ public string DNo { get; set; }
+ ///
/// 名称
///
[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);