Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix metric and sql.

Browse Source
This commit is contained in:
qixinzhi
2023-09-22 06:13:40 +00:00
parent a3a6971bed
commit edbd7d710a
4 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update18.7.sql
+6
View File
@@ -560,3 +560,9 @@ INSERT INTO `zt_metric`(`purpose`, `scope`, `object`, `stage`, `name`, `code`, `
INSERT INTO `zt_metric`(`purpose`, `scope`, `object`, `stage`, `name`, `code`, `unit`, `desc`, `definition`, `when`, `event`, `cronCFG`, `time`, `createdBy`, `createdDate`, `editedBy`, `editedDate`, `order`, `deleted`) VALUES ('scale', 'user', 'feedback', 'released', '按人员统计的每日评审反馈数', 'count_of_daily_review_feedback_in_user', 'count', '按人员统计的日评审反馈数表示每个人每日评审的反馈数量之和。反映了每个人每日评审的反馈的规模。该数值越大，说明工作量越大。', '所有反馈个数求和\n由谁评审为某人\n评审时间为某日\n过滤已删除的反馈\n过滤已删除产品的反馈', 'realtime', '', '', '', 'system', '2023-08-22 08:00:00', '', NULL, 0, '0');
ALTER TABLE `zt_repo` ADD `lastCommit` DATETIME NULL DEFAULT NULL AFTER `lastSync`;
ALTER TABLE `zt_story` ADD `releasedDate` datetime DEFAULT NULL AFTER `reviewedDate`;
ALTER TABLE `zt_project` ADD `firstEnd` date DEFAULT NULL AFTER `end`;
ALTER TABLE `zt_product` ADD `closedDate` date DEFAULT NULL AFTER `createdVersion`;
ALTER TABLE `zt_productplan` ADD `finishedDate` datetime DEFAULT NULL AFTER `end`;
ALTER TABLE `zt_productplan` ADD `closedDate` datetime DEFAULT NULL AFTER `finishedDate`;
module/metric/calc/project/hour/day_of_invested_in_project.php
+1 -1
View File
@@ -31,7 +31,7 @@ class day_of_invested_in_project extends baseCalc
->where('module')->eq('execution')
->andWhere('key')->eq('defaultWorkhours')
->fetch('value');
if(empty($defaultHours)) $defaultHours = 0;
if(empty($defaultHours)) $defaultHours = 7;
return $this->dao->select("t3.id as project, SUM(t1.consumed) as consumed, $defaultHours as defaultHours")
->from(TABLE_EFFORT)->alias('t1')
module/metric/calc/system/hour/day_of_annual_effort.php
+2
View File
@@ -32,6 +32,8 @@ class day_of_annual_effort extends baseCalc
->andWhere('key')->eq('defaultWorkhours')
->fetch('value');
if(empty($defaultHours)) $defaultHours = 7;
return $this->dao->select("year(date) as year,sum(consumed) as consumed, $defaultHours as defaultHours")
->from(TABLE_EFFORT)
->where('deleted')->eq('0')
module/metric/calc/system/hour/day_of_daily_effort.php
+2
View File
@@ -32,6 +32,8 @@ class day_of_daily_effort extends baseCalc
->andWhere('key')->eq('defaultWorkhours')
->fetch('value');
if(empty($defaultHours)) $defaultHours = 7;
return $this->dao->select("year(date) as year, month(date) as month, day(date) as day, date, sum(consumed) as consumed, $defaultHours as defaultHours")
->from(TABLE_EFFORT)
->where('deleted')->eq('0')