金隅通知公告

资产入库 类别同步

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs

@@ -32,8 +32,8 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
         private WeChatTempletIBLL weChatTempletIbll = new WeChatTempletBLL();
         private UserIBLL userIbll = new UserBLL();
         private UserRelationIBLL userRelationIBLL = new UserRelationBLL();
-        private DataItemIBLL dataItemIbll=new DataItemBLL();
-        private DepartmentIBLL departmentIbll=new DepartmentBLL();
+        private DataItemIBLL dataItemIbll = new DataItemBLL();
+        private DepartmentIBLL departmentIbll = new DepartmentBLL();
         #region  视图功能
         /// <summary>
         /// 管理页面
@@ -178,6 +178,64 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
             return JsonResult(newsListOfSelf);
         }
         /// <summary>
+        /// 查看通知公告
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="keyword">关键词</param>
+        /// <returns></returns>
+        public ActionResult GetListOfSelfJY(string keyword, string categoryId = null)
+        {
+            var userinfo = LoginUserInfo.Get();
+            Pagination paginationobj = new Pagination();
+            var newsList = noticeIBLL.GetList(keyword, userinfo.userId, categoryId).
+            Select(a => a.F_Status == "2");
+            var newsListOfSelf = new List<NewsEntity>();
+
+            foreach (var newsitemEntity in newsList)
+            {
+                if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
+                {
+                    if (!string.IsNullOrEmpty(userinfo.postIds))
+                    {
+                        if (userinfo.postIds.Contains(","))
+                        {
+                            foreach (var postid in userinfo.postIds.Split(','))
+                            {
+                                if (newsitemEntity.F_SendPostId.Contains(postid))
+                                {
+                                    newsListOfSelf.Add(newsitemEntity);
+                                    break;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
+                            {
+                                newsListOfSelf.Add(newsitemEntity);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
+                    {
+                        if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
+                        {
+                            newsListOfSelf.Add(newsitemEntity);
+                        }
+                    }
+                    else
+                    {
+                        newsListOfSelf.Add(newsitemEntity);
+                    }
+                }
+            }
+
+            return JsonResult(newsListOfSelf);
+        }
+        /// <summary>
         /// 获取实体数据
         /// </summary>
         /// <param name="keyValue">主键</param>
@@ -194,7 +252,7 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
 
             var typeList = dataItemIbll.GetDetailList("NoticeCategory");
             var departmentEntity = departmentIbll.GetEntity(departmentId);
-            List<object> list=new List<object>();
+            List<object> list = new List<object>();
             if (departmentEntity != null)
             {
                 var typetext = departmentEntity.NoticeCategory?.Split(',');
@@ -204,7 +262,7 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
                     var entity = typeList.FirstOrDefault(a => a.F_ItemValue.Equals(item));
                     if (entity != null)
                     {
-                        list.Add(new {text=entity.F_ItemName,value=entity.F_ItemValue});
+                        list.Add(new { text = entity.F_ItemName, value = entity.F_ItemValue });
                     }
                 }
 
@@ -241,7 +299,7 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
                                }
                            });
             }
-            
+
             return Success("保存成功！");
         }
 
@@ -382,7 +440,7 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
                                 "}" +
                             "}";
                                 string pushresult = Util.HttpMethods.HttpPost("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + access_token, jsondata);
-                                
+
                                 operateLogModel.title = title;
                                 operateLogModel.type = OperationType.Other;
                                 operateLogModel.url = "NoticeController";

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js

@@ -88,10 +88,7 @@ var bootstrap = function ($, learun) {
         if (!!processId) {
             formData.RProcessId = processId;
         }
-        var postData = {
-            strEntity: JSON.stringify(formData)
-        };
-        $.lrSaveForm(top.$.rootUrl + '/LR_OAModule/Notice/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        $.lrSaveForm(top.$.rootUrl + '/LR_OAModule/Notice/SaveForm?keyValue=' + keyValue, formData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
                 callBack(res, formData, i);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs

@@ -321,6 +321,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                                     insertassinfoitem.AIIsInStorage = true;
                                     insertassinfoitem.AISpecification = assitemapp.AAISpecification;
                                     insertassinfoitem.AIAssType = assinfoapp.AAAssType;
+                                    insertassinfoitem.AIASSClass = assinfoitem.ATId;
                                     insertassinfoitem.AIUse = assitemapp.AAIUse;
                                     db.Insert(insertassinfoitem);
                                     //出入库明细表
@@ -421,6 +422,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                                     insertassinfoitem.AIIStoragePosition = assitemapp.AAIStoragePosition;
                                     insertassinfoitem.AIIsInStorage = true;
                                     insertassinfoitem.AISpecification = assitemapp.AAISpecification;
+                                    insertassinfoitem.AIASSClass = insertAss_AssetsInfo.ATId;
                                     insertassinfoitem.AIUse = assitemapp.AAIUse;
                                     db.Insert(insertassinfoitem);
                                     //出入库明细表
@@ -477,6 +479,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                                 insertassinfoitem.AIAssType = assinfoapp.AAAssType;
                                 insertassinfoitem.AIIStoragePosition = assitemapp.AAIStoragePosition;
                                 insertassinfoitem.AIIsInStorage = true;
+                                insertassinfoitem.AIASSClass = insertAss_AssetsInfo.ATId;
                                 insertassinfoitem.AISpecification = assitemapp.AAISpecification;
                                 insertassinfoitem.AIUse = assitemapp.AAIUse;
                                 db.Insert(insertassinfoitem);