* Fix action ranking chart.
This commit is contained in:
qixinzhi
@@ -15,4 +15,4 @@ UPDATE `zt_metric` SET `definition` = '所有研发需求个数求和\r\n评审
|
||||
ALTER TABLE zt_metriclib MODIFY id bigint AUTO_INCREMENT;
|
||||
|
||||
UPDATE `zt_chart` SET `sql` = 'select tt.topProgram,tt.programID as id,tt.`year`,sum(tt.product) as product,sum(tt.plan) as plan,sum(tt.`release`) as `release`,sum(tt.story) as story,sum(tt.bug) as bug,sum(tt.doc) as doc\r\nfrom (\r\nselect t2.name as topProgram,t2.id as programID,t0.`year`,count(1) as product,0 as plan,0 as story,0 as bug,0 as `release`, 0 as doc\r\nfrom zt_product t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.createdDate) = t0.`year`\r\nleft join zt_project t2 on t1.program = t2.id\r\nwhere t1.deleted = \'0\' and t1.shadow = \'0\'\r\nand t2.type = \'program\' and t2.grade = 1 and t2.deleted = \'0\'\r\ngroup by t2.id, t0.`year`\r\nunion all\r\nselect t3.name as topProgram,t3.id as programID,t0.`year`,0 as product,count(1) as plan,0 as story,0 as bug,0 as `release`, 0 as doc\r\nfrom zt_productplan t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.createdDate) = t0.`year`\r\nleft join zt_product t2 on t2.id = t1.product\r\nleft join zt_project t3 on t2.program = t3.id\r\nwhere t1.deleted = \'0\'\r\nand t2.deleted = \'0\'\r\nand t3.type = \'program\' and t3.grade = 1 and t3.deleted = \'0\'\r\ngroup by t3.id, t0.`year`\r\nunion all\r\nselect t3.name as topProgram,t3.id as programID,t0.`year`,0 as product,0 as plan,0 as story,0 as bug,0 as `release`, count(1) as doc\r\nfrom zt_doc t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.addedDate) = t0.`year`\r\nleft join zt_product t2 on t2.id = t1.product\r\nleft join zt_project t3 on t2.program = t3.id\r\nwhere t1.deleted = \'0\'\r\nand t2.deleted = \'0\'\r\nand t3.type = \'program\' and t3.grade = 1 and t3.deleted = \'0\'\r\ngroup by t3.id, t0.`year`\r\nunion all\r\nselect t3.name as topProgram,t3.id as programID,t0.`year`,0 as product,0 as plan,0 as story,0 as bug,0 as `release`, count(distinct t1.id) as doc\r\nfrom zt_doc t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.addedDate) = t0.`year`\r\nleft join zt_projectproduct t4 on t1.project = t4.project\r\nleft join zt_product t2 on t2.id = t4.product\r\nleft join zt_project t3 on t2.program = t3.id\r\nwhere t1.deleted = \'0\'\r\nand t2.deleted = \'0\'\r\nand t3.type = \'program\' and t3.grade = 1 and t3.deleted = \'0\'\r\ngroup by t3.id, t0.`year`\r\nunion all\r\nselect t3.name as topProgram,t3.id as programID,t0.`year`,0 as product,0 as plan,0 as story,0 as bug,count(1) as `release`, 0 as doc\r\nfrom zt_release t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.date) = t0.`year`\r\nleft join zt_product t2 on t2.id = t1.product\r\nleft join zt_project t3 on t2.program = t3.id\r\nwhere t1.deleted = \'0\'\r\nand t2.deleted = \'0\'\r\nand t3.type = \'program\' and t3.grade = 1 and t3.deleted = \'0\'\r\ngroup by t3.id, t0.`year`\r\nunion all\r\nselect t3.name as topProgram,t3.id as programID,t0.`year`,0 as product,0 as plan,count(1) as story,0 as bug,0 as `release`, 0 as doc\r\nfrom zt_story t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.openedDate) = t0.`year`\r\nleft join zt_product t2 on t2.id = t1.product\r\nleft join zt_project t3 on t2.program = t3.id\r\nwhere t1.deleted = \'0\'\r\nand t2.deleted = \'0\'\r\nand t3.type = \'program\' and t3.grade = 1 and t3.deleted = \'0\'\r\ngroup by t3.id, t0.`year`\r\nunion all\r\nselect t3.name as topProgram,t3.id as programID,t0.`year`,0 as product,0 as plan,0 as story,count(1) as bug,0 as `release`, 0 as doc\r\nfrom zt_bug t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.openedDate) = t0.`year`\r\nleft join zt_product t2 on t2.id = t1.product\r\nleft join zt_project t3 on t2.program = t3.id\r\nwhere t1.deleted = \'0\'\r\nand t2.deleted = \'0\'\r\nand t3.type = \'program\' and t3.grade = 1 and t3.deleted = \'0\'\r\ngroup by t3.id, t0.`year`\r\n) tt\r\ngroup by tt.programID, tt.`year`' WHERE `name` = '年度新增-项目集年度新增数据汇总表';
|
||||
|
||||
UPDATE `zt_chart` SET `sql` = 'SELECT YEAR(t1.date) AS `year`,IFNULL(t2.realname,t1.actor) AS realname,count(1) AS count FROM zt_action t1 LEFT JOIN zt_user AS t2 ON t1.actor=t2.account where t1.actor is not null and t1.actor not in(\'\', \'system\') GROUP BY `year`,t1.actor ORDER BY `year`, `count` DESC' WHERE `name` = '年度排行-个人-禅道操作次数榜';
|
||||
|
||||
+1
-1
@@ -16587,7 +16587,7 @@ INSERT INTO `zt_chart`(`id`, `name`, `dimension`, `type`, `group`, `dataset`, `d
|
||||
(1107, '年度排行-个人-创建Bug条目榜', 1, 'cluBarY', '56', '', '', '[{\"type\":\"cluBarY\",\"xaxis\":[{\"field\":\"realname\",\"name\":\"realname\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"count\",\"name\":\"count\",\"valOrAgg\":\"sum\"}]}]', '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', 0, '{\"year\":{\"name\":\"year\",\"object\":\"bug\",\"field\":\"year\",\"type\":\"number\"},\"realname\":{\"name\":\"realname\",\"object\":\"zt_user\",\"field\":\"realname\",\"type\":\"string\"},\"count\":{\"name\":\"count\",\"object\":\"bug\",\"field\":\"count\",\"type\":\"string\"}}', '{\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"},\"realname\":{\"zh-cn\":\"\\u59d3\\u540d\",\"zh-tw\":\"\",\"en\":\"realname\",\"de\":\"\",\"fr\":\"\"},\"count\":{\"zh-cn\":\"\\u8ba1\\u6570\",\"zh-tw\":\"\",\"en\":\"count\",\"de\":\"\",\"fr\":\"\"}}', 'SELECT \nYEAR(t3.openedDate) AS `year`,t2.realname,count(1) AS count\nFROM zt_action AS t1 RIGHT JOIN zt_user AS t2 ON t1.actor=t2.account LEFT JOIN zt_bug AS t3 ON t1.objectID=t3.id\nWHERE t1.objectType=\'bug\' AND t1.action=\'opened\' AND t3.deleted=\'0\'\nGROUP BY `year`,t2.account ORDER BY `year`,count DESC', 'published', 0, '', 'system', NULL, '', NULL, 0),
|
||||
(1108, '年度排行-个人-修复Bug条目榜', 1, 'cluBarY', '56', '', '', '[{\"type\":\"cluBarY\",\"xaxis\":[{\"field\":\"realname\",\"name\":\"realname\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"count\",\"name\":\"count\",\"valOrAgg\":\"sum\"}]}]', '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', 0, '{\"year\":{\"name\":\"year\",\"object\":\"bug\",\"field\":\"year\",\"type\":\"number\"},\"realname\":{\"name\":\"realname\",\"object\":\"zt_user\",\"field\":\"realname\",\"type\":\"string\"},\"count\":{\"name\":\"count\",\"object\":\"bug\",\"field\":\"count\",\"type\":\"string\"}}', '{\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"},\"realname\":{\"zh-cn\":\"\\u59d3\\u540d\",\"zh-tw\":\"\",\"en\":\"realname\",\"de\":\"\",\"fr\":\"\"},\"count\":{\"zh-cn\":\"\\u8ba1\\u6570\",\"zh-tw\":\"\",\"en\":\"count\",\"de\":\"\",\"fr\":\"\"}}', 'SELECT \nYEAR(t3.openedDate) AS `year`,t2.realname,count(DISTINCT t3.id) AS count\nFROM zt_action AS t1 RIGHT JOIN zt_user AS t2 ON t1.actor=t2.account LEFT JOIN zt_bug AS t3 ON t1.objectID=t3.id\nWHERE t1.objectType=\'bug\' AND t1.action=\'resolved\' AND t3.deleted=\'0\'\nGROUP BY `year`,t2.account ORDER BY `year`,count DESC', 'published', 0, '', 'system', NULL, '', NULL, 0),
|
||||
(1109, '年度排行-个人-工时消耗榜', 1, 'cluBarY', '56', '', '', '[{\"type\":\"cluBarY\",\"xaxis\":[{\"field\":\"realname\",\"name\":\"realname\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"consumed\",\"name\":\"\\u8017\\u65f6\",\"valOrAgg\":\"sum\"}]}]', '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', 0, '{\"year\":{\"name\":\"year\",\"object\":\"user\",\"field\":\"year\",\"type\":\"number\"},\"realname\":{\"name\":\"realname\",\"object\":\"zt_user\",\"field\":\"realname\",\"type\":\"string\"},\"consumed\":{\"name\":\"\\u8017\\u65f6\",\"object\":\"effort\",\"field\":\"consumed\",\"type\":\"number\"}}', '{\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"},\"realname\":{\"zh-cn\":\"\\u59d3\\u540d\",\"zh-tw\":\"\",\"en\":\"realname\",\"de\":\"\",\"fr\":\"\"},\"consumed\":{\"zh-cn\":\"\\u8017\\u65f6\",\"zh-tw\":\"\",\"en\":\"consumed\",\"de\":\"\",\"fr\":\"\"}}', 'SELECT YEAR(t1.date) AS `year`, t2.realname, ROUND(SUM(t1.consumed),1) AS consumed\nFROM zt_effort AS t1 LEFT JOIN zt_user AS t2 ON t1.account = t2.account\nWHERE t1.deleted = \'0\' AND t2.deleted = \'0\'\nGROUP BY `year`, realname\nORDER BY `year`, consumed DESC', 'published', 0, '', 'system', NULL, '', NULL, 0),
|
||||
(1110, '年度排行-个人-禅道操作次数榜', 1, 'cluBarY', '56', '', '', '[{\"type\":\"cluBarY\",\"xaxis\":[{\"field\":\"realname\",\"name\":\"realname\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"count\",\"name\":\"count\",\"valOrAgg\":\"sum\"}]}]', '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', 0, '{\"year\":{\"name\":\"year\",\"object\":\"user\",\"field\":\"year\",\"type\":\"number\"},\"realname\":{\"name\":\"realname\",\"object\":\"zt_action\",\"field\":\"realname\",\"type\":\"string\"},\"count\":{\"name\":\"count\",\"object\":\"user\",\"field\":\"count\",\"type\":\"string\"}}', '{\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"},\"realname\":{\"zh-cn\":\"\\u59d3\\u540d\",\"zh-tw\":\"\",\"en\":\"realname\",\"de\":\"\",\"fr\":\"\"},\"count\":{\"zh-cn\":\"\\u8ba1\\u6570\",\"zh-tw\":\"\",\"en\":\"count\",\"de\":\"\",\"fr\":\"\"}}', 'SELECT YEAR(t1.date) AS `year`,IFNULL(t2.realname,t1.actor) AS realname,count(1) AS count\nFROM zt_action t1 LEFT JOIN zt_user AS t2 ON t1.actor=t2.account\nGROUP BY `year`,t1.actor\nORDER BY `year`, `count` DESC', 'published', 0, '', 'system', NULL, '', NULL, 0),
|
||||
(1110, '年度排行-个人-禅道操作次数榜', 1, 'cluBarY', '56', '', '', '[{\"type\":\"cluBarY\",\"xaxis\":[{\"field\":\"realname\",\"name\":\"realname\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"count\",\"name\":\"count\",\"valOrAgg\":\"sum\"}]}]', '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', 0, '{\"year\":{\"name\":\"year\",\"object\":\"user\",\"field\":\"year\",\"type\":\"number\"},\"realname\":{\"name\":\"realname\",\"object\":\"zt_action\",\"field\":\"realname\",\"type\":\"string\"},\"count\":{\"name\":\"count\",\"object\":\"user\",\"field\":\"count\",\"type\":\"string\"}}', '{\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"},\"realname\":{\"zh-cn\":\"\\u59d3\\u540d\",\"zh-tw\":\"\",\"en\":\"realname\",\"de\":\"\",\"fr\":\"\"},\"count\":{\"zh-cn\":\"\\u8ba1\\u6570\",\"zh-tw\":\"\",\"en\":\"count\",\"de\":\"\",\"fr\":\"\"}}', 'SELECT YEAR(t1.date) AS `year`,IFNULL(t2.realname,t1.actor) AS realname,count(1) AS count FROM zt_action t1 LEFT JOIN zt_user AS t2 ON t1.actor=t2.account where t1.actor is not null and t1.actor not in(\'\', \'system\') GROUP BY `year`,t1.actor ORDER BY `year`, `count` DESC', 'published', 0, '', 'system', NULL, '', NULL, 0),
|
||||
(10000, '年度完成项目-完成项目数', 2, 'card', '72', '0', '', '{\"value\": {\"type\": \"agg\", \"field\": \"number\", \"agg\": \"sum\"}, \"title\": {\"type\": \"text\", \"name\": \"\"},\r\n\"type\": \"value\"\r\n}', '[]', 0, '', '', 'SELECT COUNT(1) AS number,YEAR(`closedDate`) AS \'year\' FROM zt_project WHERE type=\'project\' AND status=\'closed\' AND deleted=\'0\' GROUP BY `year`', 'published', 1, '', 'system', '2022-12-07 14:59:41', '', '2022-12-07 14:59:41', 0),
|
||||
(10001, '年度完成项目-按时完成项目数', 2, 'card', '72', '0', '', '{\"value\": {\"type\": \"agg\", \"field\": \"number\", \"agg\": \"sum\"}, \"title\": {\"type\": \"text\", \"name\": \"\"},\r\n\"type\": \"value\"\r\n}', '[]', 0, '', '', 'SELECT COUNT(1) AS number,YEAR(`closedDate`) as \'year\' FROM (SELECT id, begin, end, IF(left(realEnd, 4) = \'0000\', LEFT(closedDate,10), realEnd) AS realEnd,closedDate FROM zt_project WHERE deleted=\'0\' AND type=\'project\' AND status=\'closed\') t1 WHERE t1.realEnd<=end GROUP BY `year`', 'published', 1, '', 'system', '2022-12-07 14:59:41', '', '2022-12-07 14:59:41', 0),
|
||||
(10002, '年度完成项目-延期完成项目数', 2, 'card', '72', '0', '', '{\"value\": {\"type\": \"agg\", \"field\": \"number\", \"agg\": \"sum\"}, \"title\": {\"type\": \"text\", \"name\": \"\"},\r\n\"type\": \"value\"\r\n}', '[]', 0, '', '', 'SELECT COUNT(1) AS number,YEAR(`closedDate`) AS \'year\' FROM (SELECT id, begin, end, IF(left(realEnd, 4) = \'0000\', LEFT(closedDate,10), realEnd) AS realEnd,closedDate FROM zt_project WHERE deleted=\'0\' AND type=\'project\' AND status=\'closed\') t1 WHERE t1.realEnd>end GROUP BY `year`', 'published', 1, '', 'system', '2022-12-07 14:59:41', '', '2022-12-07 14:59:41', 0),
|
||||
|
||||
Reference in New Issue
Block a user