From 7c964b4796165ff5ea01ef7e168b5c1bb48e086b Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Thu, 20 Oct 2022 09:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86=E7=BB=9F=E8=AE=A1=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Views/LoginStatistics/Index.cshtml | 6 +--
.../LR_Desktop/Views/LoginStatistics/Index.js | 54 +++++++++++--------
.../Views/Notice/IndexStatistics.js | 6 ++-
.../Learun.Application.OA/News/NewsEntity.cs | 2 +
4 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.cshtml
index a8e1d7c37..8dcb141ed 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.cshtml
@@ -22,7 +22,7 @@
- *@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.js
index 291fd2bda..3e1e87e42 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.js
@@ -72,31 +72,39 @@ var bootstrap = function ($, learun) {
];
headData = [
- { label: "职工编号/学号", name: "account", width: 120, align: "left" },
+ { label: "职工编号", name: "account", width: 120, align: "left" },
{ label: "姓名", name: "name", width: 120, align: "left" },
{
- label: "部门/班级", name: "departmentid", width: 100, align: "left",
+ label: "部门", name: "departmentid", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
- if (!!row.classno) {
- learun.clientdata.getAsync('custmerData',
- {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
- key: row.classno,
- keyId: 'classno',
- callback: function (_data) {
- callback(_data['classname']);
- }
- });
- } else {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
- key: value,
- keyId: 'id',
- callback: function (_data) {
- callback(_data['name']);
- }
- });
- }
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+ key: value,
+ keyId: 'id',
+ callback: function (_data) {
+ callback(_data['name']);
+ }
+ });
+ //if (!!row.classno) {
+ // learun.clientdata.getAsync('custmerData',
+ // {
+ // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+ // key: row.classno,
+ // keyId: 'classno',
+ // callback: function (_data) {
+ // callback(_data['classname']);
+ // }
+ // });
+ //} else {
+ // learun.clientdata.getAsync('custmerData', {
+ // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+ // key: value,
+ // keyId: 'id',
+ // callback: function (_data) {
+ // callback(_data['name']);
+ // }
+ // });
+ //}
}
},
{ label: StrYearMonth, name: "sumnum", width: 100, align: "left" },
@@ -160,7 +168,7 @@ var bootstrap = function ($, learun) {
} else {
param.Month = date.getMonth() + 1;
}
- //param.SqlParameter = " and ((classno is null or len(classno)=0) and (departmentid is not null or len(departmentid)>0)) ";
+ param.SqlParameter = " and F_Description='教师' ";
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexStatistics.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexStatistics.js
index f4e23a11c..d62e61b2e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexStatistics.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexStatistics.js
@@ -15,6 +15,10 @@ var bootstrap = function ($, learun) {
},
bind: function () {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+ if (!!queryJson.Year && !!queryJson.Month) {
+ queryJson.Year = queryJson.Year;
+ queryJson.Month = Number(queryJson.Month) + 1;
+ }
page.search(queryJson);
}, 200, 400);
// 刷新
@@ -60,7 +64,7 @@ var bootstrap = function ($, learun) {
{ label: '应阅读总次数', name: 'srnum', width: 100, align: 'left' },
{ label: '完成阅读次数(发起通知7天内)', name: 'rnum', width: 180, align: 'left' },
{
- label: '完成阅读百分比', name: '', width: 100, align: 'left',
+ label: '完成阅读百分比', name: 'ruserid', width: 100, align: 'left',
formatter: function (value, row) {
if (!!row.rnum && !!row.srnum) {
return GetPercent(row.rnum, row.srnum);
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs
index 108981f1a..bf6aa1937 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs
@@ -258,6 +258,8 @@ namespace Learun.Application.OA
public string F_Departmentid { get; set; }
[NotMapped]
public string F_Account { get; set; }
+ [NotMapped]
+ public string ruserid { get; set; }
}