Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js

@@ -6,16 +6,22 @@
  */
 var acceptClick;
 var keyValue = request('keyValue');
+var isView = request('isView');
 if (!!keyValue) {
     NewEmpId = keyValue;
 }
- var isTeacher = request('isTeacher');
+var isTeacher = request('isTeacher');
 var bootstrap = function ($, learun) {
     "use strict";
     var ue;
     var page = {
         init: function () {
             $('.lr-form-wrap').lrscroll();
+            if (isView) {
+                $.each($("[data-table=EmpInfo]"), function (i, item) {
+                    $(item).children('div,input').attr('readonly', 'readonly');
+                });
+            }
             page.bind();
             page.initData();
             page.hide();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js

@@ -120,7 +120,7 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'formView',
                         title: '查看',
-                        url: top.$.rootUrl + '/EducationalAdministration/EmpInfo/FormView?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/EducationalAdministration/EmpInfo/Form?keyValue=' + keyValue+'&isView='+true,
                         width: 1162,
                         height: 600,
                         btn: null

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs

@@ -149,7 +149,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult Qqualified(string keyValue, bool status)
         {
             var entity = mP_ManagementPlanIBLL.GetMP_ManageMentPlanEntity(keyValue);
-            entity.MPConclusion = status;
+            entity.MPConclusion = status?1:0;
             mP_ManagementPlanIBLL.SaveEntity(keyValue, entity);
             return Success("修改成功！");
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_PerformanceTrackingController.cs

@@ -134,7 +134,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult Qqualified(string keyValue,bool status)
         {
             var entity = mP_PerformanceTrackingIBLL.GetMP_ManageMentPlanEntity(keyValue);
-            entity.MPConclusion = status;
+            entity.MPConclusion = status?1:0;
             mP_PerformanceTrackingIBLL.SaveEntity(keyValue,entity);
             return Success("操作成功！");
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_QualityObjectivesController.cs

@@ -137,7 +137,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult Qqualified(string keyValue, bool status)
         {
             var entity = mP_QualityObjectivesIBLL.GetMP_ManageMentPlanEntity(keyValue);
-            entity.MPConclusion = status;
+            entity.MPConclusion = status?1:0;
             mP_QualityObjectivesIBLL.SaveEntity(keyValue, entity);
             return Success("删除成功！");
         }

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

@@ -33,7 +33,7 @@ var bootstrap = function ($, learun) {
             });
 
             $('#MPDepartment').lrselect({
-                type: 'treemultiple',
+                type: 'tree',
                 // 展开最大高度
                 maxHeight: 200,
                 // 是否允许搜索
@@ -41,14 +41,14 @@ var bootstrap = function ($, learun) {
                 // 访问数据接口地址
                 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                 select: function (val) {
-                    var departmentIds = val.map(t => t.id).toString();
+                    var departmentIds = val.id;
                     $('#MPReceiveUser').lrselectRefresh({
                         url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds
                     })
                 }
             });
 
-            $('#MPReceiveUser').lrselect({ type: 'multiple', allowSearch: true, value: 'F_UserId', text:'F_RealName' })
+            $('#MPReceiveUser').lrselect({ type: 'default', 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/Index.cshtml

@@ -31,8 +31,10 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_down" class="btn btn-default"><i class="fa fa-cloud-download"></i>&nbsp;下载模板</a>
-                        <a id="lr_uploadView" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;查看提交材料</a>
+                        @*<a id="lr_down" class="btn btn-default"><i class="fa fa-cloud-download"></i>&nbsp;下载模板</a>
+                        <a id="lr_uploadView" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;查看提交材料</a>*@
+                        <a id="lr_upload" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;提交材料</a>
+
                         
                     </div>
                 </div>

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

@@ -59,23 +59,42 @@ var bootstrap = function ($, learun) {
                 }
             });
 
-            $('#lr_down').on('click', function () {
+            $('#lr_down').on('click',
+                function () {
 
-                var FileId = $('#gridtable').jfGridValue('MPFile');
-                if (!!FileId) {
+                    var FileId = $('#gridtable').jfGridValue('MPFile');
+                    if (!!FileId) {
 
-                    var url = top.$.rootUrl + '/LR_SystemModule/Annexes/DownForm?keyVaule=' + FileId;
+                        var url = top.$.rootUrl + '/LR_SystemModule/Annexes/DownForm?keyVaule=' + FileId;
+                        learun.layerForm({
+                            id: 'downform',
+                            title: '文件下载',
+                            url: url,
+                            width: 600,
+                            height: 400,
+                            maxmin: true,
+                            btn: null
+                        });
+                    }
+                });
+
+
+            // 上传
+            $('#lr_upload').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('MPId');
+                if (learun.checkrow(keyValue)) {
                     learun.layerForm({
-                        id: 'downform',
-                        title: '文件下载',
-                        url: url,
+                        id: 'formupload',
+                        title: '上传',
+                        url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/UploadForm?keyValue=' + keyValue,
                         width: 600,
                         height: 400,
-                        maxmin: true,
-                        btn: null
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
                     });
                 }
-            })
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -110,8 +129,8 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "材料名称", name: "MPProjectName", width: 150, align: "left" },
                     {
-                        label: "模板材料",
-                        name: "MPFile",
+                        label: "上传文件",
+                        name: "MPFileTwo",
                         width: 200,
                         align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -128,7 +147,7 @@ var bootstrap = function ($, learun) {
 
                                         bb += '<span onclick="downLoad(\'' +
                                             item.F_Id +
-                                            '\',\'' + item.F_FolderId + '\')" style="color:blue">' +
+                                            '\',)" style="color:blue">' +
                                             item.F_FileName +
                                             '</span>,&nbsp;&nbsp;&nbsp;';
                                     })
@@ -137,7 +156,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "说明", name: "MPRemark", width: 200, align: "left" },
+                    //{ label: "说明", name: "MPRemark", width: 200, align: "left" },
                 ],
                 mainId: 'MPId',
                 isPage: true
@@ -149,8 +168,6 @@ var bootstrap = function ($, learun) {
             if (isUser) {
                 param.isUser = 'true';
             }
-            var loginInfo = top.learun.clientdata.get(['userinfo']);
-            param.MPDepartment = loginInfo.departmentId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         downLoad: function (fileId) {

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

@@ -19,8 +19,12 @@
                                     <div id="MPSemester"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">上传者</div>
-                                    <input id="MPUploader" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">部门</div>
+                                    <div id="MPDepartment"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">接收人</div>
+                                    <div id="MPReceiveUser"></div>
                                 </div>
                             </div>
                         </div>
@@ -37,7 +41,9 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
-                        <a id="lr_uploadView" class="btn btn-default"><i class="fa fa-credit-card"></i>&nbsp;查看提交材料</a>
+                        @*<a id="lr_uploadView" class="btn btn-default"><i class="fa fa-credit-card"></i>&nbsp;查看提交材料</a>*@
+                        <a id="lr_qualified" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;合格</a>
+                        <a id="lr_noqualified" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;不合格</a>
                         <a id="lr_statistics" class="btn btn-default"><i class="fa fa-calendar-minus-o"></i>&nbsp;访问情况统计</a>
                     </div>
                 </div>

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

@@ -37,6 +37,25 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+
+            $('#MPDepartment').lrselect({
+                type: 'tree',
+                // 展开最大高度
+                maxHeight: 200,
+                // 是否允许搜索
+                allowSearch: true,
+                // 访问数据接口地址
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+                select: function (val) {
+                    console.log(val);
+                    var departmentIds = val.id;
+                    $('#MPReceiveUser').lrselectRefresh({
+                        url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds
+                    })
+                }
+            });
+
+            $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' })
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -117,6 +136,32 @@ var bootstrap = function ($, learun) {
                 }
             });
 
+            // 合格
+            $('#lr_qualified').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('MPId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认合格！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: true }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 不合格
+            $('#lr_noqualified').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('MPId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认不合格！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: false }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
 
             // 打印
             $('#lr_print').on('click', function () {
@@ -165,8 +210,8 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "材料名称", name: "MPProjectName", width: 150, align: "left" },
                     {
-                        label: "模板材料",
-                        name: "MPFile",
+                        label: "上传文件",
+                        name: "MPFileTwo",
                         width: 200,
                         align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -192,7 +237,18 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "说明", name: "MPRemark", width: 200, align: "left" },
+                    {
+                        label: "是否合格", name: "MPConclusion", width: 100, align: "left", formatter: function (val) {
+
+                            if (val===1) {
+                                return "合格";
+                            } else if (val===0) {
+                                return "不合格";
+                            } else {
+                                return "";
+                            }
+                        }
+                    },
                 ],
                 mainId: 'MPId',
                 isPage: true

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

@@ -27,10 +27,10 @@
             <div class="lr-form-item-title">材料名称</div>
             <input id="MPProjectName" type="text" class="form-control" />
         </div>
-        <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
+        @*<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'); } })" />
-        </div>
+        </div>*@
         <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
             <div class="lr-form-item-title">模板上传</div>
             <div id="MPFile"></div>

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

@@ -31,8 +31,9 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+
             $('#MPDepartment').lrselect({
-                type: 'treemultiple',
+                type: 'tree',
                 // 展开最大高度
                 maxHeight: 200,
                 // 是否允许搜索
@@ -40,15 +41,14 @@ var bootstrap = function ($, learun) {
                 // 访问数据接口地址
                 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                 select: function (val) {
-                    var departmentIds = val.map(t => t.id).toString();
+                    var departmentIds = val.id;
                     $('#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();
+            $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' })            $('#MPFile').lrUploader();
             $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
         },
         initData: function () {

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

@@ -31,8 +31,9 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_down" class="btn btn-default"><i class="fa fa-cloud-download"></i>&nbsp;下载模板</a>
-                        <a id="lr_uploadView" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;查看提交材料</a>
+                        @*<a id="lr_down" class="btn btn-default"><i class="fa fa-cloud-download"></i>&nbsp;下载模板</a>
+        <a id="lr_uploadView" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;查看提交材料</a>*@
+                        <a id="lr_upload" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;提交材料</a>
                     </div>
                 </div>
             </div>

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

@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) {
                     learun.layerFormForPercent({
                         id: 'form',
                         title: '提交材料',
-                        url: top.$.rootUrl + '/PersonnelManagement/MP_PerformanceTracking/IndexChildren?ParentId=' + ParentId+'&&MPUploaderTwo='+loginInfo.userId,
+                        url: top.$.rootUrl + '/PersonnelManagement/MP_PerformanceTracking/IndexChildren?ParentId=' + ParentId + '&&MPUploaderTwo=' + loginInfo.userId,
                         width: '80%',
                         height: '80%',
                         callBack: function (id) {
@@ -55,23 +55,42 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            $('#lr_down').on('click', function () {
+            $('#lr_down').on('click',
+                function () {
 
-                var FileId = $('#gridtable').jfGridValue('MPFile');
-                if (!!FileId) {
+                    var FileId = $('#gridtable').jfGridValue('MPFile');
+                    if (!!FileId) {
 
-                    var url = top.$.rootUrl + '/LR_SystemModule/Annexes/DownForm?keyVaule=' + FileId;
+                        var url = top.$.rootUrl + '/LR_SystemModule/Annexes/DownForm?keyVaule=' + FileId;
+                        learun.layerForm({
+                            id: 'downform',
+                            title: '文件下载',
+                            url: url,
+                            width: 600,
+                            height: 400,
+                            maxmin: true,
+                            btn: null
+                        });
+                    }
+                });
+            // 上传
+            $('#lr_upload').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('MPId');
+                if (learun.checkrow(keyValue)) {
                     learun.layerForm({
-                        id: 'downform',
-                        title: '文件下载',
-                        url: url,
+                        id: 'formupload',
+                        title: '上传',
+                        url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/UploadForm?keyValue=' + keyValue,
                         width: 600,
                         height: 400,
-                        maxmin: true,
-                        btn: null
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
                     });
                 }
-            })
+            });
+
+
 
         },
         // 初始化列表
@@ -94,8 +113,13 @@ var bootstrap = function ($, learun) {
                                 });
                         }
                     },
+                    { label: "项目名称", name: "MPProjectName", width: 100, align: "left" },
                     {
-                        label: "模板材料", name: "MPFile", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                        label: "上传文件",
+                        name: "MPFileTwo",
+                        width: 200,
+                        align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
                             $.ajax({
                                 url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
                                 data: { folderId: value },
@@ -109,7 +133,7 @@ var bootstrap = function ($, learun) {
 
                                         bb += '<span onclick="downLoad(\'' +
                                             item.F_Id +
-                                            '\',\'' + item.F_FolderId + '\')" style="color:blue">' +
+                                            '\',)" style="color:blue">' +
                                             item.F_FileName +
                                             '</span>,&nbsp;&nbsp;&nbsp;';
                                     })
@@ -118,9 +142,8 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "项目名称", name: "MPProjectName", width: 100, align: "left" },
-                    { label: "截止时间", name: "MPOverTime", width: 100, align: "left" },
-                    { label: "说明", name: "MPRemark", width: 200, align: "left" },
+                    //{ label: "截止时间", name: "MPOverTime", width: 100, align: "left" },
+                    //{ label: "说明", name: "MPRemark", width: 200, align: "left" },
 
                 ],
                 mainId: 'MPId',
@@ -133,8 +156,6 @@ var bootstrap = function ($, learun) {
             if (isUser) {
                 param.isUser = 'true';
             }
-            var loginInfo = top.learun.clientdata.get(['userinfo']);
-            param.MPDepartment = loginInfo.departmentId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -19,8 +19,12 @@
                                     <div id="MPSemester"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">上传者</div>
-                                    <input id="MPUploader" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">部门</div>
+                                    <div id="MPDepartment"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">接收人</div>
+                                    <div id="MPReceiveUser"></div>
                                 </div>
                             </div>
                         </div>
@@ -37,7 +41,9 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
-                        <a id="lr_uploadView" class="btn btn-default"><i class="fa fa-credit-card"></i>&nbsp;查看提交材料</a>
+                        @*<a id="lr_uploadView" class="btn btn-default"><i class="fa fa-credit-card"></i>&nbsp;查看提交材料</a>*@
+                        <a id="lr_qualified" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;合格</a>
+                        <a id="lr_noqualified" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;不合格</a>
                         <a id="lr_statistics" class="btn btn-default"><i class="fa fa-calendar-minus-o"></i>&nbsp;访问情况统计</a>
                     </div>
 

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

@@ -33,6 +33,24 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+            $('#MPDepartment').lrselect({
+                type: 'tree',
+                // 展开最大高度
+                maxHeight: 200,
+                // 是否允许搜索
+                allowSearch: true,
+                // 访问数据接口地址
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+                select: function (val) {
+                    console.log(val);
+                    var departmentIds = val.id;
+                    $('#MPReceiveUser').lrselectRefresh({
+                        url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds
+                    })
+                }
+            });
+
+            $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' })
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -111,6 +129,32 @@ var bootstrap = function ($, learun) {
                 }
             });
 
+            // 合格
+            $('#lr_qualified').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('MPId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认合格！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: true }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 不合格
+            $('#lr_noqualified').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('MPId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认不合格！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: false }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
             // 打印
             $('#lr_print').on('click', function () {
                 $('#gridtable').jqprintTable();
@@ -157,8 +201,13 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "名称", name: "MPProjectName", width: 100, align: "left" },
                     {
-                        label: "模板材料", name: "MPFile", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                        label: "上传文件",
+                        name: "MPFileTwo",
+                        width: 200,
+                        align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
                             $.ajax({
                                 url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
                                 data: { folderId: value },
@@ -167,13 +216,12 @@ var bootstrap = function ($, learun) {
                                 async: false,
                                 cache: false,
                                 success: function (res) {
-                                    console.log(res);
                                     var bb = '';
                                     $.each(res.data, function (i, item) {
 
                                         bb += '<span onclick="downLoad(\'' +
                                             item.F_Id +
-                                            '\')" style="color:blue">' +
+                                            '\',)" style="color:blue">' +
                                             item.F_FileName +
                                             '</span>,&nbsp;&nbsp;&nbsp;';
                                     })
@@ -182,10 +230,18 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "名称", name: "MPProjectName", width: 100, align: "left" },
-                    { label: "截止时间", name: "MPOverTime", width: 100, align: "left" },
-                    { label: "说明", name: "MPRemark", width: 200, align: "left" },
+                    {
+                        label: "是否合格", name: "MPConclusion", width: 100, align: "left", formatter: function (val) {
 
+                            if (val === 1) {
+                                return "合格";
+                            } else if (val === 0) {
+                                return "不合格";
+                            } else {
+                                return "";
+                            }
+                        }
+                    },
                 ],
                 mainId: 'MPId',
                 isPage: true

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

@@ -28,10 +28,10 @@
         <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="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'); } })"   /> 
-        </div> 
+        </div>*@ 
         <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
             <div class="lr-form-item-title">附件上传</div>
             <div id="MPFile"></div>

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

@@ -31,8 +31,9 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+
             $('#MPDepartment').lrselect({
-                type: 'treemultiple',
+                type: 'tree',
                 // 展开最大高度
                 maxHeight: 200,
                 // 是否允许搜索
@@ -40,15 +41,14 @@ var bootstrap = function ($, learun) {
                 // 访问数据接口地址
                 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                 select: function (val) {
-                    var departmentIds = val.map(t => t.id).toString();
+                    var departmentIds = val.id;
                     $('#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' });
+            $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' })            $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             $('#MPFile').lrUploader();
         },
         initData: function () {

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

@@ -31,8 +31,9 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_down" class="btn btn-default"><i class="fa fa-cloud-download"></i>&nbsp;下载模板</a>
-                        <a id="lr_uploadView" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;查看提交材料</a>
+                        @*<a id="lr_down" class="btn btn-default"><i class="fa fa-cloud-download"></i>&nbsp;下载模板</a>
+                        <a id="lr_uploadView" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;查看提交材料</a>*@
+                        <a id="lr_upload" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;提交材料</a>
                     </div>
                 </div>
             </div>

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

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
                     learun.layerFormForPercent({
                         id: 'form',
                         title: '提交材料',
-                        url: top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/IndexChildren?ParentId=' + ParentId+'&&MPUploaderTwo='+loginInfo.userId,
+                        url: top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/IndexChildren?ParentId=' + ParentId + '&&MPUploaderTwo=' + loginInfo.userId,
                         width: '80%',
                         height: '80%',
                         callBack: function (id) {
@@ -72,7 +72,24 @@ var bootstrap = function ($, learun) {
                         btn: null
                     });
                 }
-            })
+            });
+            // 上传
+            $('#lr_upload').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('MPId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formupload',
+                        title: '上传',
+                        url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/UploadForm?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+
 
         },
         // 初始化列表
@@ -95,8 +112,37 @@ var bootstrap = function ($, learun) {
                                 });
                         }
                     },
+                    //{
+                    //    label: "模板材料", name: "MPFile", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                    //        $.ajax({
+                    //            url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
+                    //            data: { folderId: value },
+                    //            type: 'GET',
+                    //            dataType: "json",
+                    //            async: false,
+                    //            cache: false,
+                    //            success: function (res) {
+                    //                var bb = '';
+                    //                $.each(res.data, function (i, item) {
+
+                    //                    bb += '<span onclick="downLoad(\'' +
+                    //                        item.F_Id +
+                    //                        '\',\'' + item.F_FolderId + '\')" style="color:blue">' +
+                    //                        item.F_FileName +
+                    //                        '</span>,&nbsp;&nbsp;&nbsp;';
+                    //                })
+                    //                callback(bb);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    { label: "材料名称", name: "MPProjectName", width: 100, align: "left" },
                     {
-                        label: "模板材料", name: "MPFile", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                        label: "上传文件",
+                        name: "MPFileTwo",
+                        width: 200,
+                        align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
                             $.ajax({
                                 url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
                                 data: { folderId: value },
@@ -110,7 +156,7 @@ var bootstrap = function ($, learun) {
 
                                         bb += '<span onclick="downLoad(\'' +
                                             item.F_Id +
-                                            '\',\'' + item.F_FolderId + '\')" style="color:blue">' +
+                                            '\',)" style="color:blue">' +
                                             item.F_FileName +
                                             '</span>,&nbsp;&nbsp;&nbsp;';
                                     })
@@ -119,9 +165,9 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "材料名称", name: "MPProjectName", width: 100, align: "left" },
-                    { label: "截止时间", name: "MPOverTime", width: 100, align: "left" },
-                    { label: "说明", name: "MPRemark", width: 200, align: "left" },
+
+                    //{ label: "截止时间", name: "MPOverTime", width: 100, align: "left" },
+                    //{ label: "说明", name: "MPRemark", width: 200, align: "left" },
                 ],
                 mainId: 'ID',
                 isPage: true
@@ -133,8 +179,6 @@ var bootstrap = function ($, learun) {
             if (isUser) {
                 param.isUser = 'true';
             }
-            var loginInfo = top.learun.clientdata.get(['userinfo']);
-            param.MPDepartment = loginInfo.departmentId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -19,8 +19,12 @@
                                     <div id="MPSemester"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">上传者</div>
-                                    <input id="MPUploader" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">部门</div>
+                                    <div id="MPDepartment"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">接收人</div>
+                                    <div id="MPReceiveUser"></div>
                                 </div>
                             </div>
                         </div>
@@ -37,7 +41,9 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
-                        <a id="lr_uploadView" class="btn btn-default"><i class="fa fa-credit-card"></i>&nbsp;查看提交材料</a>
+                        @*<a id="lr_uploadView" class="btn btn-default"><i class="fa fa-credit-card"></i>&nbsp;查看提交材料</a>*@
+                        <a id="lr_qualified" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;合格</a>
+                        <a id="lr_noqualified" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;不合格</a>
                         <a id="lr_statistics" class="btn btn-default"><i class="fa fa-calendar-minus-o"></i>&nbsp;访问情况统计</a>
                     </div>
 

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

@@ -33,6 +33,24 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+            $('#MPDepartment').lrselect({
+                type: 'tree',
+                // 展开最大高度
+                maxHeight: 200,
+                // 是否允许搜索
+                allowSearch: true,
+                // 访问数据接口地址
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+                select: function (val) {
+                    console.log(val);
+                    var departmentIds = val.id;
+                    $('#MPReceiveUser').lrselectRefresh({
+                        url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds
+                    })
+                }
+            });
+
+            $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' })
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -111,6 +129,32 @@ var bootstrap = function ($, learun) {
                 }
             });
 
+            // 合格
+            $('#lr_qualified').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('MPId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认合格！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: true }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 不合格
+            $('#lr_noqualified').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('MPId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认不合格！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: false }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
             // 打印
             $('#lr_print').on('click', function () {
                 $('#gridtable').jqprintTable();
@@ -157,9 +201,13 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-
+                    { label: "材料名称", name: "MPProjectName", width: 100, align: "left" },
                     {
-                        label: "模板材料", name: "MPFile", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                        label: "上传文件",
+                        name: "MPFileTwo",
+                        width: 200,
+                        align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
                             $.ajax({
                                 url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
                                 data: { folderId: value },
@@ -168,13 +216,12 @@ var bootstrap = function ($, learun) {
                                 async: false,
                                 cache: false,
                                 success: function (res) {
-                                    console.log(res);
                                     var bb = '';
                                     $.each(res.data, function (i, item) {
 
                                         bb += '<span onclick="downLoad(\'' +
                                             item.F_Id +
-                                            '\')" style="color:blue">' +
+                                            '\',)" style="color:blue">' +
                                             item.F_FileName +
                                             '</span>,&nbsp;&nbsp;&nbsp;';
                                     })
@@ -183,9 +230,18 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "材料名称", name: "MPProjectName", width: 100, align: "left" },
-                    { label: "截止时间", name: "MPOverTime", width: 100, align: "left" },
-                    { label: "说明", name: "MPRemark", width: 200, align: "left" },
+                    {
+                        label: "是否合格", name: "MPConclusion", width: 100, align: "left", formatter: function (val) {
+
+                            if (val === 1) {
+                                return "合格";
+                            } else if (val === 0) {
+                                return "不合格";
+                            } else {
+                                return "";
+                            }
+                        }
+                    },
                 ],
                 mainId: 'ID',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js

@@ -1334,6 +1334,31 @@
                     $row.hide();
                 }
 
+                $row.append($compont);
+                return $compont;
+            },
+            renderQuery: function (compont, $row) {
+                var $compont = $('<div id="' + compont.id + '"></div>');
+                $row.append($compont);
+
+                switch (compont.dataType) {
+                case 'company':
+                    $compont.lrCompanySelect({ type: 'multiple' })
+                    break;
+                case 'department':
+                    $compont.lrDepartmentSelect();
+                    break;
+                case 'user':
+                    $compont.lrUserSelect({ type: '1' })
+                    break;
+                case 'role':
+                    $compont.lrPostSelect({ type: 'treemultiple' });
+                    break;
+                }
+                if (compont.isHide == '1') {
+                    $row.hide();
+                }
+
                 $row.append($compont);
                 return $compont;
             }

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

@@ -101,7 +101,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary> 
         /// <returns></returns> 
         [Column("MPCONCLUSION")]
-        public bool? MPConclusion { get; set; }
+        public int? MPConclusion { get; set; }
         /// <summary> 
         /// 修改次数 
         /// </summary> 

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

@@ -64,12 +64,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 //接收人的查看条件
                 if (!queryParam["isUser"].IsEmpty())
                 {
-                    var month = (int.Parse(DateTime.Now.ToString("MM")) - 1).ToString();
-                    var yearNo = Common.GetSemesterAndYear().AcademicYearShort;
+                    //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 + "' ");
+                    //strSql.Append(" AND t.MPMonth = '" + month + "' ");
+                    //strSql.Append(" AND t.MPAcademicYearNo = '" + yearNo + "' ");
                 }
                 if (!queryParam["ParentId"].IsEmpty())
                 {
@@ -95,6 +95,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     dp.Add("MPDepartment", "%" + queryParam["MPDepartment"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.MPDepartment like @MPDepartment ");
                 }
+                if (!queryParam["MPReceiveUser"].IsEmpty())
+                {
+                    dp.Add("MPReceiveUser", "%" + queryParam["MPReceiveUser"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.MPReceiveUser like @MPReceiveUser ");
+                }
                 if (!queryParam["MPSemester"].IsEmpty())
                 {
                     dp.Add("MPSemester", queryParam["MPSemester"].ToString(), DbType.String);

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

@@ -62,12 +62,12 @@ 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 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 + "' ");
+                    //strSql.Append(" AND t.MPMonth = '" + month + "' ");
+                    //strSql.Append(" AND t.MPAcademicYearNo = '" + yearNo + "' ");
                 }
                 if (!queryParam["ParentId"].IsEmpty())
                 {
@@ -98,6 +98,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     dp.Add("MPDepartment", "%" + queryParam["MPDepartment"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.MPDepartment like @MPDepartment ");
                 }
+                if (!queryParam["MPReceiveUser"].IsEmpty())
+                {
+                    dp.Add("MPReceiveUser", "%" + queryParam["MPReceiveUser"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.MPReceiveUser like @MPReceiveUser ");
+                }
                 if (!queryParam["MPUploader"].IsEmpty())
                 {
                     dp.Add("MPUploader", "%" + queryParam["MPUploader"].ToString() + "%", DbType.String);

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

@@ -62,12 +62,12 @@ 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 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 + "' ");
+                    //strSql.Append(" AND t.MPMonth = '" + month + "' ");
+                    //strSql.Append(" AND t.MPAcademicYearNo = '" + yearNo + "' ");
                 }
                 if (!queryParam["ParentId"].IsEmpty())
                 {
@@ -98,6 +98,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     dp.Add("MPDepartment", "%" + queryParam["MPDepartment"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.MPDepartment like @MPDepartment ");
                 }
+                if (!queryParam["MPReceiveUser"].IsEmpty())
+                {
+                    dp.Add("MPReceiveUser", "%" + queryParam["MPReceiveUser"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.MPReceiveUser like @MPReceiveUser ");
+                }
                 if (!queryParam["MPUploader"].IsEmpty())
                 {
                     dp.Add("MPUploader", "%" + queryParam["MPUploader"].ToString() + "%", DbType.String);