Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.js

@@ -103,6 +103,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "资产名称", name: "aiassname", width: 100, align: "left"},
                     {
                         label: "使用者", name: "UserID", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs

@@ -131,7 +131,8 @@ namespace Learun.Application.Base.SystemModule
         /// <param name="keyValue">主键</param>
         /// <param name="itemCode">编码</param>
         /// <returns></returns>
-        public bool ExistItemCode(string keyValue, string itemCode) {
+        public bool ExistItemCode(string keyValue, string itemCode)
+        {
             try
             {
                 bool res = false;
@@ -199,7 +200,8 @@ namespace Learun.Application.Base.SystemModule
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveClassifyEntity(string keyValue, DataItemEntity entity) {
+        public void SaveClassifyEntity(string keyValue, DataItemEntity entity)
+        {
             try
             {
                 dataItemService.SaveClassifyEntity(keyValue, entity);
@@ -279,7 +281,7 @@ namespace Learun.Application.Base.SystemModule
             try
             {
                 List<DataItemDetailEntity> list = cache.Read<List<DataItemDetailEntity>>(cacheKeyDetail + itemCode, CacheId.dataItem);
-                if (list?.Count==0 || list==null)
+                if (list?.Count == 0 || list == null)
                 {
                     list = (List<DataItemDetailEntity>)dataItemService.GetDetailList(itemCode);
                     cache.Write<List<DataItemDetailEntity>>(cacheKeyDetail + itemCode, list, CacheId.dataItem);
@@ -303,26 +305,34 @@ namespace Learun.Application.Base.SystemModule
         /// 获取数据字典详细映射数据
         /// </summary>
         /// <returns></returns>
-        public Dictionary<string, Dictionary<string,DataItemModel>> GetModelMap()
+        public Dictionary<string, Dictionary<string, DataItemModel>> GetModelMap()
         {
             try
             {
-                Dictionary<string, Dictionary<string,DataItemModel>> dic = cache.Read<Dictionary<string, Dictionary<string,DataItemModel>>>(cacheKeyDetail + "dic", CacheId.dataItem);
-                if (dic == null) {
-                    dic = new Dictionary<string, Dictionary<string,DataItemModel>>();
+                Dictionary<string, Dictionary<string, DataItemModel>> dic = cache.Read<Dictionary<string, Dictionary<string, DataItemModel>>>(cacheKeyDetail + "dic", CacheId.dataItem);
+                if (dic == null)
+                {
+                    dic = new Dictionary<string, Dictionary<string, DataItemModel>>();
                     var list = GetClassifyList();
-                    foreach (var item in list) {
+                    foreach (var item in list)
+                    {
                         var detailList = GetDetailList(item.F_ItemCode);
-                        if (!dic.ContainsKey(item.F_ItemCode)) {
-                            dic.Add(item.F_ItemCode,new Dictionary<string,DataItemModel>());
+                        if (!dic.ContainsKey(item.F_ItemCode))
+                        {
+                            dic.Add(item.F_ItemCode, new Dictionary<string, DataItemModel>());
                         }
-                        foreach (var detailItem in detailList) {
-                            dic[item.F_ItemCode].Add(detailItem.F_ItemDetailId, new DataItemModel()
+                        foreach (var detailItem in detailList)
+                        {
+                            if (!dic[item.F_ItemCode].ContainsKey(detailItem.F_ItemDetailId))
                             {
-                                parentId = detailItem.F_ParentId,
-                                text = detailItem.F_ItemName,
-                                value = detailItem.F_ItemValue
-                            });
+                                dic[item.F_ItemCode].Add(detailItem.F_ItemDetailId, new DataItemModel()
+                                {
+                                    parentId = detailItem.F_ParentId,
+                                    text = detailItem.F_ItemName,
+                                    value = detailItem.F_ItemValue
+                                });
+                            }
+
                         }
                     }
                     cache.Write(cacheKeyDetail + "dic", dic, CacheId.dataItem);
@@ -354,7 +364,8 @@ namespace Learun.Application.Base.SystemModule
             try
             {
                 List<DataItemDetailEntity> list = GetDetailList(itemCode);
-                if (!string.IsNullOrEmpty(keyword)) {
+                if (!string.IsNullOrEmpty(keyword))
+                {
                     list = list.FindAll(t => t.F_ItemName.Contains(keyword) || t.F_ItemValue.Contains(keyword));
                 }
                 return list;
@@ -416,7 +427,8 @@ namespace Learun.Application.Base.SystemModule
             {
                 List<DataItemDetailEntity> list = GetDetailList(itemCode);
                 List<TreeModel> treeList = new List<TreeModel>();
-                foreach (var item in list) {
+                foreach (var item in list)
+                {
                     TreeModel node = new TreeModel();
                     node.id = item.F_ItemDetailId;
                     node.text = item.F_ItemName;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_UserChangeInfo/Ass_UserChangeInfoEntity.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
     /// 日 期：2019-11-14 14:29
     /// 描 述：使用人员变动记录
     /// </summary>
-    public class Ass_UserChangeInfoEntity 
+    public class Ass_UserChangeInfoEntity
     {
         #region  实体成员
         /// <summary>
@@ -59,6 +59,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         }
         #endregion
         #region  扩展字段
+        [NotMapped]
+        public string aiassname { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_UserChangeInfo/Ass_UserChangeInfoService.cs

@@ -35,9 +35,10 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 t.AIID,
                 t.UserID,
                 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 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数