@@ -103,6 +103,7 @@ var bootstrap = function ($, learun) { | |||||
}); | }); | ||||
} | } | ||||
}, | }, | ||||
{ label: "资产名称", name: "aiassname", width: 100, align: "left"}, | |||||
{ | { | ||||
label: "使用者", name: "UserID", width: 100, align: "left", | label: "使用者", name: "UserID", width: 100, align: "left", | ||||
formatterAsync: function (callback, value, row, op, $cell) { | formatterAsync: function (callback, value, row, op, $cell) { | ||||
@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem | |||||
/// 日 期:2019-11-14 14:29 | /// 日 期:2019-11-14 14:29 | ||||
/// 描 述:使用人员变动记录 | /// 描 述:使用人员变动记录 | ||||
/// </summary> | /// </summary> | ||||
public class Ass_UserChangeInfoEntity | |||||
public class Ass_UserChangeInfoEntity | |||||
{ | { | ||||
#region 实体成员 | #region 实体成员 | ||||
/// <summary> | /// <summary> | ||||
@@ -59,6 +59,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem | |||||
} | } | ||||
#endregion | #endregion | ||||
#region 扩展字段 | #region 扩展字段 | ||||
[NotMapped] | |||||
public string aiassname { get; set; } | |||||
#endregion | #endregion | ||||
} | } | ||||
} | } | ||||
@@ -35,9 +35,10 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem | |||||
t.AIID, | t.AIID, | ||||
t.UserID, | t.UserID, | ||||
t.UCChangeTime, | t.UCChangeTime, | ||||
t.UCEditer | |||||
t.UCEditer, | |||||
aaii.aiassname | |||||
"); | "); | ||||
strSql.Append(" FROM Ass_UserChangeInfo t "); | |||||
strSql.Append(" FROM Ass_UserChangeInfo t left join Ass_AssetsInfoItem aaii on aaii.AIId=t.AIID"); | |||||
strSql.Append(" WHERE 1=1 "); | strSql.Append(" WHERE 1=1 "); | ||||
var queryParam = queryJson.ToJObject(); | var queryParam = queryJson.ToJObject(); | ||||
// 虚拟参数 | // 虚拟参数 | ||||