提交
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.js
index 0f1465aa7..fd784a167 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.js
@@ -25,6 +25,8 @@ var bootstrap = function ($, learun) {
value: 'value',
text: 'text'
});
+ $('#LV').lrDataItemSelect({ code: 'LV' });
+ $('#ActivityItem').lrDataItemSelect({ code: 'ActivityItem' });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
@@ -186,8 +188,31 @@ var bootstrap = function ($, learun) {
},
{ label: "刊物名称", name: "PublicationName", width: 100, align: "left" },
{ label: "刊号", name: "ISSN", width: 100, align: "left" },
- { label: "排位", name: "Ranked", width: 100, align: "left" },
- { label: "活动项目", name: "ActivityItem", width: 100, align: "left" },
+ {
+ label: "排位", name: "Ranked", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'Ranked',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+
+ {
+ label: "活动项目", name: "ActivityItem", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'ActivityItem',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
{ label: "成果名称", name: "OutcomeName", width: 100, align: "left" },
{
label: "级别", name: "Rank", width: 100, align: "left",
@@ -201,7 +226,18 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "等级", name: "LV", width: 100, align: "left" },
+ {
+ label: "等级", name: "LV", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'LV',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
{ label: "领证单位(主管单位)", name: "CompetentUnit", width: 100, align: "left" },
{
label: "年度", name: "Year", width: 50, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchResult/ResearchResultService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchResult/ResearchResultService.cs
index 4745b4d5f..b2354ec24 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchResult/ResearchResultService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchResult/ResearchResultService.cs
@@ -49,8 +49,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
}
if (!queryParam["ActivityItem"].IsEmpty())
{
- dp.Add("ActivityItem", "%" + queryParam["ActivityItem"].ToString() + "%", DbType.String);
- strSql.Append(" AND t.ActivityItem Like @ActivityItem ");
+ dp.Add("ActivityItem", queryParam["ActivityItem"].ToString(), DbType.String);
+ strSql.Append(" AND t.ActivityItem = @ActivityItem ");
}
if (!queryParam["Rank"].IsEmpty())
{
@@ -59,8 +59,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
}
if (!queryParam["LV"].IsEmpty())
{
- dp.Add("LV", "%" + queryParam["LV"].ToString() + "%", DbType.String);
- strSql.Append(" AND t.LV Like @LV ");
+ dp.Add("LV", queryParam["LV"].ToString(), DbType.String);
+ strSql.Append(" AND t.LV = @LV ");
}
if (!queryParam["Year"].IsEmpty())
{