diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookPutIn/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookPutIn/Index.js index cf2434bc0..02b9e18b6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookPutIn/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookPutIn/Index.js @@ -104,6 +104,7 @@ var bootstrap = function ($, learun) { { label: "图书名称", name: "BookName", width: 100, align: "left" }, { label: "书籍出版号", name: "ISBN", width: 100, align: "left" }, { label: "书籍作者", name: "Author", width: 100, align: "left" }, + { label: "出版日期", name: "PublishTime", width: 100, align: "left" }, { label: "书籍出版社", name: "Publisher", width: 100, align: "left" }, { label: "数量", name: "Amount", width: 100, align: "left" }, { label: "入库时间", name: "PutInTime", width: 130, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/BookPutIn/BookPutInService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/BookPutIn/BookPutInService.cs index ac6858275..c04dede56 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/BookPutIn/BookPutInService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/BookPutIn/BookPutInService.cs @@ -29,7 +29,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("SELECT t.*,b.BookName,b.ISBN,b.Author,b.Publisher "); + strSql.Append("SELECT t.*,b.BookName,b.ISBN,b.Author,b.Publisher,b.PublishTime "); strSql.Append(" FROM Book_putininfo t "); strSql.Append(" left join Book_info b on t.BookID=b.ID "); strSql.Append(" WHERE 1=1 "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/BookPutIn/Book_putininfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/BookPutIn/Book_putininfoEntity.cs index 892642f08..cd880d7ef 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/BookPutIn/Book_putininfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/BookPutIn/Book_putininfoEntity.cs @@ -85,6 +85,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [NotMapped] public string Publisher { get; set; } + /// + /// 出版日期 + /// + [NotMapped] + public DateTime? PublishTime { get; set; } #endregion } }