diff --git a/module/program/model.php b/module/program/model.php index 8712eeaa0d..ace6d35169 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1339,6 +1339,7 @@ class programModel extends model $projects = $this->dao->select('distinct t1.project,t2.model,t2.deleted')->from(TABLE_ACTION)->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') ->where('t1.`date`')->ge($updateTime) + ->andWhere('t1.project')->ne(0) ->fetchAll('project'); if(empty($projects)) return; } @@ -1347,7 +1348,7 @@ class programModel extends model $this->programTao->updateStats(array_keys($projects)); /* 2. Update programStatsTime. */ - $this->programTao->updateProcess(); + $this->programTao->updateProgress(); /* 3. Update projectStatsTime in config. */ $this->loadModel('setting')->setItem('system.common.global.projectStatsTime', $now); diff --git a/module/program/tao.php b/module/program/tao.php index a5f618874a..c5a3f77419 100644 --- a/module/program/tao.php +++ b/module/program/tao.php @@ -366,7 +366,7 @@ class programTao extends programModel * @access protected * @return bool */ - protected function updateProcess(): bool + protected function updateProgress(): bool { $projectList = $this->dao->select('id,progress,path,consumed,`left`')->from(TABLE_PROJECT) ->where('type')->eq('project') diff --git a/module/program/test/program.class.php b/module/program/test/program.class.php index 1f5e6d6bdf..91bcda4db8 100644 --- a/module/program/test/program.class.php +++ b/module/program/test/program.class.php @@ -547,9 +547,9 @@ class programTest * @access public * @return array */ - public function updateProcessTest(): array + public function updateProgressTest(): array { - $this->program->updateProcess(); + $this->program->updateProgress(); if(dao::isError()) return dao::getError(); return $this->program->dao->select('*')->from(TABLE_PROJECT)->where('type')->eq('program')->fetchAll('id'); diff --git a/module/program/test/tao/updateprocess.php b/module/program/test/tao/updateprogress.php similarity index 63% rename from module/program/test/tao/updateprocess.php rename to module/program/test/tao/updateprogress.php index d6d9b8fc9d..3955363f27 100644 --- a/module/program/test/tao/updateprocess.php +++ b/module/program/test/tao/updateprogress.php @@ -2,7 +2,7 @@ gen(5); su('admin'); $programTester = new programTest(); -r($programTester->updateProcessTest()) && p('1:progress') && e('0.00'); // 获取系统中所有项目集的进度 +r($programTester->updateProgressTest()) && p('1:progress') && e('0.00'); // 获取系统中所有项目集的进度