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

* Fix doc-index dashborad sql.

Browse Source
This commit is contained in:
sunguangming
2023-08-08 13:43:21 +08:00
parent b3c31fb831
commit d08fb1c23f
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update18.6.sql
+1
View File
@@ -0,0 +1 @@
ALTER TABLE `zt_doc` ADD `editedList` text NULL AFTER `editingDate`;
db/zentao.sql
+1
View File
@@ -715,6 +715,7 @@ CREATE TABLE IF NOT EXISTS `zt_doc` (
`editedBy` varchar(30) NOT NULL DEFAULT '',
`editedDate` datetime NULL,
`editingDate` text NULL,
`editedList` text NULL,
`mailto` text NULL,
`acl` varchar(10) NOT NULL DEFAULT 'open',
`groups` varchar(255) NOT NULL DEFAULT '',
module/doc/model.php
+6 -9
View File
@@ -959,6 +959,7 @@ class docModel extends model
->setDefault('mailto', '')
->add('editedBy', $account)
->add('editedDate', $now)
->setIF(strpos(",$oldDoc->editedList,", ",$account,") === false, 'editedList', $oldDoc->editedList . ",$account")
->cleanInt('project,product,execution,lib,module')
->join('groups', ',')
->join('users', ',')
@@ -2198,15 +2199,11 @@ class docModel extends model
->andWhere('t2.deleted')->eq(0)
->andWhere('t2.type')->in('text,word,ppt,excel,url,article')
->fetch('count');
$statistic->myEditedDocs = $this->dao->select('count(DISTINCT t1.objectID) as count')->from(TABLE_ACTION)->alias('t1')
->leftJoin(TABLE_DOC)->alias('t2')->on("t1.objectID=t2.id and t1.objectType='doc'")
->where('t1.objectType')->eq('doc')
->andWhere('t1.action')->eq('edited')
->andWhere('t1.actor')->eq($this->app->user->account)
->andWhere('t1.vision')->eq($this->config->vision)
->andWhere('t2.lib')->ne('')
->andWhere('t2.deleted')->eq(0)
->andWhere('t2.type')->in('text,word,ppt,excel,url,article')
$statistic->myEditedDocs = $this->dao->select('count(*) as count')->from(TABLE_DOC)
->where("CONCAT(',', editedList, ',')")->like("%,{$this->app->user->account},%")
->andWhere('lib')->ne('')
->andWhere('deleted')->eq(0)
->andWhere('type')->in('text,word,ppt,excel,url,article')
->fetch('count');
$my = $this->dao->select("count(*) as myDocs, SUM(views) as docViews, SUM(collects) as docCollects")->from(TABLE_DOC)