金隅内控检查 添加指定接收人

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs

@@ -220,6 +220,29 @@ namespace Learun.Application.Organization
                 }
             }
         }
+        /// <summary>
+        /// 用户列表(根据部门主键)
+        /// </summary>
+        /// <param name="departmentId">部门主键</param>
+        /// <returns></returns>
+        public List<UserEntity> GetListByDepartmentIds(string departmentId)
+        {
+            try
+            {
+                return userService.GetListByDepartmentIds(departmentId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         public List<UserEntity> GetUserByDepartmentId(string departmentId)
         {
             try

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserIBLL.cs

@@ -30,6 +30,7 @@ namespace Learun.Application.Organization
         /// <returns></returns>
         List<UserEntity> GetList(string companyId, string departmentId, string keyword);
         List<UserEntity> GetListByDepartmentId(string departmentId);
+        List<UserEntity> GetListByDepartmentIds(string departmentId);
         List<UserEntity> GetUserByDepartmentId(string departmentId);
         bool GetAny();
 

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs

@@ -571,6 +571,25 @@ namespace Learun.Application.Organization
                 }
             }
         }
+        public List<UserEntity> GetListByDepartmentIds(string departmentId)
+        {
+            try
+            {
+                var ids = departmentId.Split(',');
+                return this.BaseRepository().FindList<UserEntity>(a=> ids.Contains(a.F_DepartmentId)).ToList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
        
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/UserController.cs

@@ -146,6 +146,18 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
             return JsonResult(data);
         }
         /// <summary>
+        /// 根据部门获取用户
+        /// </summary>
+        /// <param name="departmentId">部门主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetListByDepartmentIds(string departmentId)
+        {
+            var data = userIBLL.GetListByDepartmentIds(departmentId);
+            return JsonResult(data);
+        }
+        /// <summary>
         /// 获取本部门的人员
         /// </summary>
         /// <param name="companyId">公司主键</param>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.cshtml

@@ -23,6 +23,10 @@
         <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
         <div id="MPDepartment" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
+        <div class="lr-form-item-title">接收人员<font face="宋体">*</font></div>
+        <div id="MPReceiveUser" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
 
     <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
         <div class="lr-form-item-title">附件上传</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.js

@@ -39,8 +39,16 @@ var bootstrap = function ($, learun) {
                 // 是否允许搜索
                 allowSearch: true,
                 // 访问数据接口地址
-                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree'
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+                select: function (val) {
+                    var departmentIds = val.map(t => t.id).toString();
+                    $('#MPReceiveUser').lrselectRefresh({
+                        url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds
+                    })
+                }
             });
+
+            $('#MPReceiveUser').lrselect({ type: 'multiple', allowSearch: true, value: 'F_UserId', text:'F_RealName' })
             $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             $('#MPFile').lrUploader();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js

@@ -147,7 +147,16 @@ var bootstrap = function ($, learun) {
                         label: "部门", name: "MPDepartment", width: 250, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/Department/GetDepartmentList?listId=' + value, function (res) {
-                                console.log(res);
+                                if (res.code == learun.httpCode.success) {
+                                    callback(res.data);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "接收人", name: "MPReceiveUser", width: 250, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds?keyValue=' + value, function (res) {
                                 if (res.code == learun.httpCode.success) {
                                     callback(res.data);
                                 }
@@ -169,7 +178,6 @@ var bootstrap = function ($, learun) {
                                 async: false,
                                 cache: false,
                                 success: function (res) {
-                                    console.log(res);
                                     var bb = '';
                                     $.each(res.data, function (i, item) {
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.cshtml

@@ -19,6 +19,10 @@
             <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
             <div id="MPDepartment" isvalid="yes" checkexpession="NotNull"></div>
         </div>
+    <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
+        <div class="lr-form-item-title">接收人员<font face="宋体">*</font></div>
+        <div id="MPReceiveUser" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
         <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
             <div class="lr-form-item-title">材料名称</div>
             <input id="MPProjectName" type="text" class="form-control" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.js

@@ -38,8 +38,16 @@ var bootstrap = function ($, learun) {
                 // 是否允许搜索
                 allowSearch: true,
                 // 访问数据接口地址
-                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree'
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+                select: function (val) {
+                    var departmentIds = val.map(t => t.id).toString();
+                    $('#MPReceiveUser').lrselectRefresh({
+                        url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds
+                    })
+                }
             });
+
+            $('#MPReceiveUser').lrselect({ type: 'multiple', allowSearch: true, value: 'F_UserId', text:'F_RealName' })
             $('#MPFile').lrUploader();
             $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js

@@ -147,6 +147,16 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "接收人", name: "MPReceiveUser", width: 250, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds?keyValue=' + value, function (res) {
+                                if (res.code == learun.httpCode.success) {
+                                    callback(res.data);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "模板材料", name: "MPFile", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             $.ajax({

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.cshtml

@@ -24,6 +24,10 @@
             <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
             <div id="MPDepartment" isvalid="yes" checkexpession="NotNull"></div>
         </div>
+    <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
+        <div class="lr-form-item-title">接收人员<font face="宋体">*</font></div>
+        <div id="MPReceiveUser" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
         <div class="col-xs-12 lr-form-item"  data-table="MP_ManageMentPlan" > 
             <div class="lr-form-item-title">提交截止日期</div> 
             <input id="MPOverTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#MPOverTime').trigger('change'); } })"   /> 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.js

@@ -38,8 +38,16 @@ var bootstrap = function ($, learun) {
                 // 是否允许搜索
                 allowSearch: true,
                 // 访问数据接口地址
-                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree'
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+                select: function (val) {
+                    var departmentIds = val.map(t => t.id).toString();
+                    $('#MPReceiveUser').lrselectRefresh({
+                        url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds
+                    })
+                }
             });
+
+            $('#MPReceiveUser').lrselect({ type: 'multiple', allowSearch: true, value: 'F_UserId', text:'F_RealName' })
             $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             $('#MPFile').lrUploader();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js

@@ -147,6 +147,17 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "接收人", name: "MPReceiveUser", width: 250, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds?keyValue=' + value, function (res) {
+                                if (res.code == learun.httpCode.success) {
+                                    callback(res.data);
+                                }
+                            });
+                        }
+                    },
+
                     {
                         label: "模板材料", name: "MPFile", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             $.ajax({

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManageMentPlanEntity.cs

@@ -61,6 +61,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         [Column("MPDEPARTMENT")]
         public string MPDepartment { get; set; }
         /// <summary> 
+        /// 接收人 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("MPRECEIVEUSER")]
+        public string MPReceiveUser { get; set; }
+        /// <summary> 
         /// 项目名称 
         /// </summary> 
         /// <returns></returns> 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManagementPlanService.cs

@@ -51,6 +51,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 t.MPFileTwoRemark,
                 t.MPUploaderTwo,
                 t.MPMonth,
+                t.MPReceiveUser,
                 t.MPUploadTime
                 ");
                 strSql.Append("  FROM MP_ManageMentPlan t ");
@@ -60,10 +61,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
 
+                //接收人的查看条件
                 if (!queryParam["isUser"].IsEmpty())
                 {
                     var month = (int.Parse(DateTime.Now.ToString("MM")) - 1).ToString();
                     var yearNo = Common.GetSemesterAndYear().AcademicYearShort;
+                    var currentUserId = LoginUserInfo.Get().userId;
+                    strSql.Append(" AND t.MPReceiveUser like '%" + currentUserId + "%'");
                     strSql.Append(" AND t.MPMonth = '" + month + "' ");
                     strSql.Append(" AND t.MPAcademicYearNo = '" + yearNo + "' ");
                 }
@@ -231,7 +235,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var data = this.BaseRepository("CollegeMIS")
-                    .FindList<MP_ManageMentPlanEntity>(a => a.ParentId==ParentId);
+                    .FindList<MP_ManageMentPlanEntity>(a => a.ParentId == ParentId);
                 return data;
 
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_PerformanceTracking/MP_PerformanceTrackingService.cs

@@ -51,6 +51,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 t.MPFileTwoRemark,
                 t.MPUploaderTwo,
                 t.MPMonth,
+                t.MPReceiveUser,
                 t.MPUploadTime
                 ");
                 strSql.Append("  FROM MP_ManageMentPlan t ");
@@ -63,6 +64,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 {
                     var month = (int.Parse(DateTime.Now.ToString("MM")) - 1).ToString();
                     var yearNo = Common.GetSemesterAndYear().AcademicYearShort;
+                    var currentUserId = LoginUserInfo.Get().userId;
+                    strSql.Append(" AND t.MPReceiveUser like '%" + currentUserId + "%'");
                     strSql.Append(" AND t.MPMonth = '" + month + "' ");
                     strSql.Append(" AND t.MPAcademicYearNo = '" + yearNo + "' ");
                 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_QualityObjectives/MP_QualityObjectivesService.cs

@@ -51,6 +51,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 t.ParentId,
                 t.MPUploaderTwo,
                 t.MPMonth,
+                t.MPReceiveUser,
                 t.MPUploadTime
                 ");
                 strSql.Append("  FROM MP_ManageMentPlan t ");
@@ -63,6 +64,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 {
                     var month = (int.Parse(DateTime.Now.ToString("MM")) - 1).ToString();
                     var yearNo = Common.GetSemesterAndYear().AcademicYearShort;
+                    var currentUserId = LoginUserInfo.Get().userId;
+                    strSql.Append(" AND t.MPReceiveUser like '%" + currentUserId + "%'");
                     strSql.Append(" AND t.MPMonth = '" + month + "' ");
                     strSql.Append(" AND t.MPAcademicYearNo = '" + yearNo + "' ");
                 }