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

* [task#119253,done,1h,0] Compatible with duckdb of chart 1080.

Browse Source
This commit is contained in:
zhouxin
2024-06-06 14:11:50 +08:00
parent 23b5a1ac77
commit 27c32c7f9c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bi/config/charts.php
+8 -8
View File
@@ -3037,11 +3037,11 @@ $config->bi->builtin->charts[] = array
'type' => 'line',
'group' => '38',
'sql' => <<<EOT
SELECT YEARMONTH, t1.year, CONCAT(t1.month, "月") AS `month`, IFNULL(t2.project, 0) AS newProject, IFNULL(t3.project, 0) AS closedProject
FROM (SELECT DISTINCT DATE_FORMAT(date, '%Y-%m') YEARMONTH, Year(date) AS `year`, MONTH(date) AS `month` FROM zt_action) AS t1
LEFT JOIN (SELECT YEAR(openedDate) AS `year`, MONTH(openedDate) AS `month`, COUNT(1) AS project FROM zt_project WHERE deleted = '0' AND type = 'project' GROUP BY `year`, `month`) AS t2 ON t1.year = t2.year AND t1.month = t2.month
LEFT JOIN (SELECT YEAR(closedDate) AS `year`, MONTH(closedDate) AS `month`, COUNT(1) AS project FROM zt_project WHERE deleted = '0' AND type = 'project' AND status = 'closed' GROUP BY `year`, `month`) AS t3 ON t1.year = t3.year AND t1.month = t3.month
ORDER BY `year`, t1.month
select yearmonth, t1.year, t1.month || '月' as "month", ifnull(t2.project, 0) as newProject, ifnull(t3.project, 0) as closedProject
from (select distinct printf('%04d-%02d', year(date), month(date)) yearmonth, year(date) as "year", month(date) as "month" from zt_action) as t1
left join (select year(openedDate) as "year", month(openedDate) as "month", count(1) as project from zt_project where deleted = '0' and type = 'project' group by "year", "month") as t2 on t1.year = t2.year and t1.month = t2.month
left join (select year(closedDate) as "year", month(closedDate) as "month", count(1) as project from zt_project where deleted = '0' and type = 'project' and status = 'closed' group by "year", "month") as t3 on t1.year = t3.year and t1.month = t3.month
order by t1."year", t1."month"
EOT,
'settings' => array
(
@@ -3050,7 +3050,7 @@ EOT,
'type' => 'line',
'xaxis' => array
(
array('field' => 'YEARMONTH', 'name' => 'YEARMONTH', 'group' => '')
array('field' => 'yearmonth', 'name' => 'yearmonth', 'group' => '')
),
'yaxis' => array
(
@@ -3065,7 +3065,7 @@ EOT,
),
'fields' => array
(
'YEARMONTH' => array('name' => 'YEARMONTH', 'object' => 'project', 'field' => 'YEARMONTH', 'type' => 'string'),
'yearmonth' => array('name' => 'yearmonth', 'object' => 'project', 'field' => 'yearmonth', 'type' => 'string'),
'year' => array('name' => 'year', 'object' => 'project', 'field' => 'year', 'type' => 'number'),
'month' => array('name' => 'month', 'object' => 'project', 'field' => 'month', 'type' => 'string'),
'newProject' => array('name' => 'newProject', 'object' => 'project', 'field' => 'newProject', 'type' => 'string'),
@@ -3073,7 +3073,7 @@ EOT,
),
'langs' => array
(
'YEARMONTH' => array('zh-cn' => 'YEARMONTH', 'zh-tw' => '', 'en' => '', 'de' => '', 'fr' => ''),
'yearmonth' => array('zh-cn' => 'yearmonth', 'zh-tw' => '', 'en' => '', 'de' => '', 'fr' => ''),
'year' => array('zh-cn' => '年度', 'zh-tw' => '', 'en' => '', 'de' => '', 'fr' => ''),
'month' => array('zh-cn' => '月份', 'zh-tw' => '', 'en' => '', 'de' => '', 'fr' => ''),
'newProject' => array('zh-cn' => '新增项目数', 'zh-tw' => '', 'en' => '', 'de' => '', 'fr' => ''),