小组评分查询

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

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -46,7 +46,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             return View();
         }
-        
+
         #endregion
 
         #region 获取数据
@@ -72,6 +72,19 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = dT_EvaluationDataIBLL.GetList(queryJson);
+            return Success(data);
+        }
         /// <summary>
         /// 获取表单数据
         /// </summary>
@@ -81,8 +94,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var DT_EvaluationDataData = dT_EvaluationDataIBLL.GetDT_EvaluationDataEntity( keyValue );
-            var jsonData = new {
+            var DT_EvaluationDataData = dT_EvaluationDataIBLL.GetDT_EvaluationDataEntity(keyValue);
+            var jsonData = new
+            {
                 DT_EvaluationData = DT_EvaluationDataData,
             };
             return Success(jsonData);
@@ -115,7 +129,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             DT_EvaluationDataEntity entity = strEntity.ToObject<DT_EvaluationDataEntity>();
-            dT_EvaluationDataIBLL.SaveEntity(keyValue,entity);
+            dT_EvaluationDataIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {
             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.cshtml

@@ -51,4 +51,4 @@
         </div>
     </div>
 </div>
-@Html.AppendJsFile("/Areas/PersonnelManagement/Views/DT_EvaluationData/Index.js")
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.js

@@ -26,48 +26,6 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            // 新增
-            $('#lr_add').on('click', function () {
-                learun.layerForm({
-                    id: 'form',
-                    title: '新增',
-                    url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/Form',
-                    width: 600,
-                    height: 400,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
-                    }
-                });
-            });
-            // 编辑
-            $('#lr_edit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerForm({
-                        id: 'form',
-                        title: '编辑',
-                        url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        }
-                    });
-                }
-            });
-            // 删除
-            $('#lr_delete').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerConfirm('是否确认删除该项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/DeleteForm', { keyValue: keyValue}, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
             // 打印
             $('#lr_print').on('click', function () {
                 $('#gridtable').jqprintTable();
@@ -78,60 +36,104 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/GetPageList',
                 headData: [
-                    //{ label: "年度", name: "ScoreYear", width: 100, align: "left" },
-                    //{ label: "季度", name: "ScoreQuarter", width: 100, align: "left" },
                     {
-                        label: "考核内容", name: "Assessment", width: 150, align: "left",
+                        label: "组长", name: "Assessed", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
                                 key: value,
-                                code: 'EvaluationAssessment',
+                                keyId: 'id',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    callback(_data['name']);
                                 }
                             });
                         }
-
                     },
-                    { label: "行为规范要求", name: "ConductRequirements", width: 200, align: "left" },
-                    //{ label: "被考核党员", name: "BeAssessed", width: 100, align: "left",
-                    //    formatterAsync: function (callback, value, row, op,$cell) {
-                    //         learun.clientdata.getAsync('custmerData', {
-                    //             url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
-                    //             key: value,
-                    //             keyId: 'id',
-                    //             callback: function (_data) {
-                    //                 callback(_data['name']);
-                    //             }
-                    //         });
-                    //    }},
-                    { label: "打分人", name: "Assessed", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('custmerData', {
-                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
-                                 key: value,
-                                 keyId: 'id',
-                                 callback: function (_data) {
-                                     callback(_data['name']);
-                                 }
-                             });
-                        }},
-                    { label: "分值", name: "Score", width: 100, align: "left"},
+                    { label: "分值", name: "Score", width: 100, align: "left" },
                     {
-                        label: "类型", name: "ScoreType", width: 100, align: "left",
-                        formatter: function(value, row) {
-                            if (value == '1') {
-                                return '党员自评';
+                        label: "状态", name: "Status", width: 100, align: "left",
+                        formatter: function (value, row) {
+                            //case t.Status when -1 then '未打分' when 0 then '草稿' when 1 then '待审核' when 2 then '审核通过' when 3 then '未通过' end
+                            if (value == '-1') {
+                                return '未打分';
+                            }
+                            else if (value == '0') {
+                                return '草稿';
+                            }
+                            else if (value == '1') {
+                                return '待审核';
                             }
                             else if (value == '2') {
-                                return '党小组长评';
+                                return '审核通过';
+                            }
+                            else if (value == '3') {
+                                return '审核未通过';
                             }
                         }
                     },
                 ],
-                mainId:'Id',
+                mainId: 'Id',
                 isPage: true,
                 sidx: 'ScoreType ASC,Assessed ASC,EOrder Asc',
+                isSubGrid: true,             // 是否有子表
+                subGridExpanded: function (subContentId, rowItem) {
+                    var Assessed = rowItem.Assessed;
+                    var MainId1 = rowItem.MainId;
+                    $('#' + subContentId).jfGrid({
+                        url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/GetList',
+                        headData: [
+                            {
+                                label: "考核内容", name: "Assessment", width: 150, align: "left",
+                                formatterAsync: function (callback, value, row, op, $cell) {
+                                    learun.clientdata.getAsync('dataItem', {
+                                        key: value,
+                                        code: 'EvaluationAssessment',
+                                        callback: function (_data) {
+                                            callback(_data.text);
+                                        }
+                                    });
+                                }
+
+                            },
+                            { label: "行为规范要求", name: "ConductRequirements", width: 200, align: "left" },
+                            //{ label: "被考核党员", name: "BeAssessed", width: 100, align: "left",
+                            //    formatterAsync: function (callback, value, row, op,$cell) {
+                            //         learun.clientdata.getAsync('custmerData', {
+                            //             url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
+                            //             key: value,
+                            //             keyId: 'id',
+                            //             callback: function (_data) {
+                            //                 callback(_data['name']);
+                            //             }
+                            //         });
+                            //    }},
+                            //{
+                            //    label: "打分人", name: "Assessed", width: 100, align: "left",
+                            //    formatterAsync: function (callback, value, row, op, $cell) {
+                            //        learun.clientdata.getAsync('custmerData', {
+                            //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
+                            //            key: value,
+                            //            keyId: 'id',
+                            //            callback: function (_data) {
+                            //                callback(_data['name']);
+                            //            }
+                            //        });
+                            //    }
+                            //},
+                            { label: "满分", name: "MaxScore", width: 100, align: "left" },
+                            { label: "得分", name: "Score", width: 100, align: "left" },
+
+                        ],
+                        mainId: 'Id',
+                        isPage: false,
+                        sidx: 'EOrder Asc',
+                    });
+                    var param;
+                    param = param || {};
+                    param.SqlParameter = " and ScoreType=2 and MainId='" + MainId1 + "' and Assessed='" + Assessed + "'";
+                    $('#' + subContentId).jfGridSet('reload', { queryJson: JSON.stringify(param) });
+                },
+                subGridHeight: 300,
             });
             page.search();
         },
@@ -139,7 +141,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.MainId = MainId;
             param.ScoreType = ScoreType;
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataBLL.cs

@@ -43,6 +43,26 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+
+        public IEnumerable<DT_EvaluationDataEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return dT_EvaluationDataService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取DT_EvaluationData表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataIBLL.cs

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<DT_EvaluationDataEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<DT_EvaluationDataEntity> GetList(string queryJson);
         /// <summary>
         /// 获取DT_EvaluationData表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataService.cs

@@ -37,7 +37,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
 e.Assessment as Assessment,e.ConductRequirements as ConductRequirements
                 ");
                 strSql.Append("  FROM DT_EvaluationData t ");
-                strSql.Append("  join DT_EvaluatingIndicator e on t.EvaluatingIndicatorId=e.Id ");
+                strSql.Append("  left join DT_EvaluatingIndicator e on t.EvaluatingIndicatorId=e.Id ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -77,6 +77,70 @@ e.Assessment as Assessment,e.ConductRequirements as ConductRequirements
             }
         }
 
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<DT_EvaluationDataEntity> GetList(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.*,
+e.Assessment as Assessment,e.ConductRequirements as ConductRequirements,e.MaxScore
+                ");
+                strSql.Append("  FROM DT_EvaluationData t ");
+                strSql.Append("  left join DT_EvaluatingIndicator e on t.EvaluatingIndicatorId=e.Id ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["EvaluatingIndicatorId"].IsEmpty())
+                {
+                    dp.Add("EvaluatingIndicatorId", queryParam["EvaluatingIndicatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EvaluatingIndicatorId = @EvaluatingIndicatorId ");
+                }
+                if (!queryParam["BeAssessed"].IsEmpty())
+                {
+                    dp.Add("BeAssessed", queryParam["BeAssessed"].ToString(), DbType.String);
+                    strSql.Append(" AND t.BeAssessed = @BeAssessed ");
+                }
+                if (!queryParam["MainId"].IsEmpty())
+                {
+                    dp.Add("MainId", queryParam["MainId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MainId = @MainId ");
+                }
+                if (!queryParam["ScoreType"].IsEmpty())
+                {
+                    dp.Add("ScoreType", queryParam["ScoreType"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ScoreType=@ScoreType ");
+                }
+
+                if (!queryParam["SqlParameter"].IsEmpty())
+                {
+                    strSql.Append(queryParam["SqlParameter"].ToString());
+                }
+
+                return this.BaseRepository("CollegeMIS").FindList<DT_EvaluationDataEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取列表
         /// </summary>