党政办统计功能

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

@@ -200,6 +200,18 @@ var bootstrap = function ($, learun) {
                                 });
                         }
                     },
+                    { label: "创建时间", name: "Createtime", width: 200, align: "left" },
+                    {
+                        label: "创建人", name: "Creator", width: 200, align: "left"
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                        learun.clientdata.getAsync('user', {
+                            key: value,
+                            callback: function (_data) {
+                                callback(_data.name);
+                            }
+                        });
+                    }
+                    },
                 ],
                 mainId: 'ID',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyManage/StatsIndex.js

@@ -92,17 +92,19 @@ var bootstrap = function ($, learun) {
                     {
                         label: "申报部门", name: "Department", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('department', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
                                 key: value,
+                                keyId: 'id',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['name']);
                                 }
                             });
                         }
                     },
                     { label: "总人数", name: "Num", width: 200, align: "left", statistics: true },
                     { label: "上传人数", name: "Number", width: 200, align: "left", statistics: true },
-                    { label: '未上传人数', name: 'Unit', width: 150, align: 'left', statistics: true },
+                    { label: '未上传人数', name: 'cha', width: 150, align: 'left', statistics: true },
                 ],
                 mainId: 'Department',
                 isPage: true,

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/PartyManage/PartyManageService.cs

@@ -86,9 +86,9 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 var baseDataName1 = this.BaseRepository("CollegeMIS").getDbConnection().Database;
 
                 var strSql = new StringBuilder();
-                strSql.Append($" select zb.F_DepartmentId as Department, COALESCE (aa.num, 0) num ,COALESCE (bb.number, 0) number from (select*  from {baseDataName}.dbo.LR_Base_Department where f_companyid ='06890807-2106-4e6d-9f99-484527503be9') zb ");
-                strSql.Append($" left join(select F_DepartmentId,count(*) as num from  {baseDataName}.dbo.LR_Base_User group by F_DepartmentId ) aa on aa.F_DepartmentId =zb.F_DepartmentId");
-                strSql.Append($" left join (select Department,count(*) as number from {baseDataName1}.dbo.PartyManage where 1=1 ");
+                strSql.Append($" select zb.F_DepartmentId as Department, COALESCE (aa.num, 0) num ,COALESCE (bb.number, 0) number from (select*  from {baseDataName}.dbo.LR_Base_Department where f_companyid ='06890807-2106-4e6d-9f99-484527503be9' and F_DepartmentId != '9d0f0866-10ac-4ef6-9f97-3261b3731a93') zb ");
+                strSql.Append($" left join(select F_DepartmentId,count(*) as num from  {baseDataName}.dbo.LR_Base_User where F_Description= '教师' and f_deleteMark=0 group by F_DepartmentId ) aa on aa.F_DepartmentId =zb.F_DepartmentId");
+                strSql.Append($" left join (select distinct Department,count(*) as number from {baseDataName1}.dbo.PartyManage where 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["CateId"].IsEmpty())