diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js
index e2cedfba8..f7e832958 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js
@@ -22,6 +22,13 @@ var bootstrap = function ($, learun) {
$("#F_NewsContent").html($('
').html(item.f_content).text());
} else {
$.lrSetForm(top.$.rootUrl + '/LR_OAModule/Notice/GetEntity?keyValue=' + id, function (data) {
+ if (data.F_Category == "失物招领") {
+ data.F_NewsContent = decodeURI(data.F_NewsContent);
+ $('.inSec1T').attr("hidden","hidden");
+ $('#readlist').attr("hidden","hidden");
+ $('#msgSource').attr("hidden","hidden");
+ $('#newType').attr("hidden","hidden");
+ }
$("#F_FullHead").text(data.F_FullHead);
$("#F_CreateDate").text(data.F_CreateDate);
$("#F_CreateUserName").text(data.F_SourceName == null ? "" : data.F_SourceName);
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs
index 76fb60589..ce821e2fa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs
@@ -21,7 +21,7 @@ namespace Learun.Application.OA
[Column("F_NEWSID")]
public string F_NewsId { get; set; }
///
- /// 类型（1-新闻2-公告）
+ /// 类型（1-新闻2-公告3-失物招领）
///
///
[Column("F_TYPEID")]
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeBLL.cs
index 64777dae7..9fa00e02c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeBLL.cs
@@ -59,6 +59,25 @@ namespace Learun.Application.OA
}
}
}
+
+ public IEnumerable
GetPageListForLostArticle(Pagination pagination, string keyword)
+ {
+ try
+ {
+ return noticeService.GetPageListForLostArticle(pagination, keyword);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
///
/// 公告实体
///
@@ -151,6 +170,33 @@ namespace Learun.Application.OA
}
}
+
+ ///
+ /// 保存（新增、修改）失物招领
+ ///
+ /// 主键值
+ /// 公告实体
+ ///
+ public void SaveFormForLostArticle(string keyValue, NewsEntity newsEntity)
+ {
+ try
+ {
+ noticeService.SaveFormForLostArticle(keyValue, newsEntity);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+
+ }
+
#endregion
#region 扩展数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeIBLL.cs
index 01c6de29f..6de95c443 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeIBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeIBLL.cs
@@ -22,6 +22,13 @@ namespace Learun.Application.OA
IEnumerable GetPageList(Pagination pagination, string keyword);
IEnumerable GetPageListRevert(Pagination pagination, string keyword);
///
+ /// 获取失物招领分页数据
+ ///
+ ///
+ ///
+ ///
+ IEnumerable GetPageListForLostArticle(Pagination pagination, string keyword);
+ ///
/// 公告实体
///
/// 主键值
@@ -42,6 +49,13 @@ namespace Learun.Application.OA
/// 公告实体
///
void SaveEntity(string keyValue, NewsEntity newsEntity);
+
+ ///
+ /// 保存失物招领信息
+ ///
+ ///
+ ///
+ void SaveFormForLostArticle(string keyValue, NewsEntity newsEntity);
#endregion
#region 扩展数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs
index 1099c51ae..c135fbc1e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs
@@ -70,6 +70,38 @@ namespace Learun.Application.OA
}
}
}
+
+ ///
+ /// 失物招领分页列表
+ ///
+ /// 分页参数
+ /// 关键词
+ ///
+ public IEnumerable GetPageListForLostArticle(Pagination pagination, string keyword)
+ {
+ try
+ {
+ var strSql = new StringBuilder();
+ strSql.Append("SELECT * FROM LR_OA_News t WHERE t.F_TypeId = 3 and F_CategoryId=99 ");
+ if (!string.IsNullOrEmpty(keyword))
+ {
+ strSql.Append(" AND F_FullHead like @keyword");
+ }
+ return this.BaseRepository().FindList(strSql.ToString(), new { keyword = "%" + keyword + "%" }, pagination);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
///
/// 新闻公告实体
///
@@ -131,7 +163,7 @@ namespace Learun.Application.OA
}
}
- public void RecycleForm(string keyValue,string status)
+ public void RecycleForm(string keyValue, string status)
{
var db = this.BaseRepository().BeginTrans();
try
@@ -195,6 +227,44 @@ namespace Learun.Application.OA
}
}
+ }
+
+ ///
+ /// 保存（新增、修改）失物招领
+ ///
+ /// 主键值
+ /// 新闻公告实体
+ ///
+ public void SaveFormForLostArticle(string keyValue, NewsEntity newsEntity)
+ {
+ try
+ {
+ newsEntity.F_TypeId = 3;
+ newsEntity.F_CategoryId = "99";
+ newsEntity.F_Category = "失物招领";
+ if (!string.IsNullOrEmpty(keyValue))
+ {
+ newsEntity.Modify(keyValue);
+ this.BaseRepository().Update(newsEntity);
+ }
+ else
+ {
+ newsEntity.Create();
+ this.BaseRepository().Insert(newsEntity);
+ }
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+
}
#endregion
#region 扩展数据