From 8d59d07845ffd4d3f6dd9b38725ba0ad123628af Mon Sep 17 00:00:00 2001 From: liugang Date: Fri, 5 Dec 2025 09:24:33 +0800 Subject: [PATCH] * [refac] Optimize the fields data type from date to datetime. --- db/zentao.sql | 100 ++++++++++++++--------------- module/branch/config/form.php | 2 +- module/branch/model.php | 6 +- module/kanban/model.php | 2 +- module/product/config/formdata.php | 2 +- module/project/zen.php | 2 +- module/stakeholder/control.php | 2 +- module/stakeholder/model.php | 6 +- module/tutorial/model.php | 6 +- 9 files changed, 64 insertions(+), 64 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 6cd7701339..854f6088c0 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -315,8 +315,8 @@ CREATE TABLE IF NOT EXISTS `zt_branch` ( `default` tinyint unsigned NOT NULL DEFAULT 0, `status` varchar(10) NOT NULL DEFAULT 'active', `desc` varchar(255) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, - `closedDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, + `closedDate` datetime DEFAULT NULL, `order` int unsigned NOT NULL DEFAULT 0, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) @@ -470,7 +470,7 @@ CREATE TABLE IF NOT EXISTS `zt_case` ( `howRun` varchar(30) NOT NULL DEFAULT '', `script` longtext DEFAULT NULL, `scriptedBy` varchar(30) NOT NULL DEFAULT '', - `scriptedDate` date DEFAULT NULL, + `scriptedDate` datetime DEFAULT NULL, `scriptStatus` varchar(30) NOT NULL DEFAULT '', `scriptLocation` varchar(255) NOT NULL DEFAULT '', `status` varchar(30) NOT NULL DEFAULT '', @@ -603,9 +603,9 @@ CREATE TABLE IF NOT EXISTS `zt_deliverable` ( `desc` text DEFAULT NULL, `files` varchar(255) NOT NULL DEFAULT '', `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `lastEditedBy` varchar(30) NOT NULL DEFAULT '', - `lastEditedDate` date DEFAULT NULL, + `lastEditedDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -825,7 +825,7 @@ CREATE TABLE IF NOT EXISTS `zt_doc` ( `addedDate` datetime DEFAULT NULL, `assignedTo` varchar(30) NOT NULL DEFAULT '', `assignedDate` datetime DEFAULT NULL, - `approvedDate` date DEFAULT NULL, + `approvedDate` datetime DEFAULT NULL, `editedBy` varchar(30) NOT NULL DEFAULT '', `editedDate` datetime DEFAULT NULL, `editingDate` text DEFAULT NULL, @@ -972,7 +972,7 @@ CREATE TABLE IF NOT EXISTS `zt_expect` ( `expect` text DEFAULT NULL, `progress` text DEFAULT NULL, `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -1483,7 +1483,7 @@ CREATE TABLE IF NOT EXISTS `zt_product` ( `createdBy` varchar(30) NOT NULL DEFAULT '', `createdDate` datetime DEFAULT NULL, `createdVersion` varchar(20) NOT NULL DEFAULT '', - `closedDate` date DEFAULT NULL, + `closedDate` datetime DEFAULT NULL, `order` int unsigned NOT NULL DEFAULT 0, `vision` varchar(10) NOT NULL DEFAULT 'rnd', `deleted` tinyint unsigned NOT NULL DEFAULT 0, @@ -1570,7 +1570,7 @@ CREATE TABLE IF NOT EXISTS `zt_project` ( `closedReason` varchar(20) NOT NULL DEFAULT '', `canceledBy` varchar(30) NOT NULL DEFAULT '', `canceledDate` datetime DEFAULT NULL, - `suspendedDate` date DEFAULT NULL, + `suspendedDate` datetime DEFAULT NULL, `PO` varchar(30) NOT NULL DEFAULT '', `PM` varchar(30) NOT NULL DEFAULT '', `QD` varchar(30) NOT NULL DEFAULT '', @@ -1891,9 +1891,9 @@ CREATE TABLE IF NOT EXISTS `zt_stakeholder` ( `key` tinyint unsigned NOT NULL DEFAULT 0, `from` varchar(30) NOT NULL DEFAULT '', `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `editedBy` varchar(30) NOT NULL DEFAULT '', - `editedDate` date DEFAULT NULL, + `editedDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -1935,7 +1935,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` ( `openedDate` datetime DEFAULT NULL, `assignedTo` varchar(30) NOT NULL DEFAULT '', `assignedDate` datetime DEFAULT NULL, - `approvedDate` date DEFAULT NULL, + `approvedDate` datetime DEFAULT NULL, `lastEditedBy` varchar(30) NOT NULL DEFAULT '', `lastEditedDate` datetime DEFAULT NULL, `changedBy` varchar(30) NOT NULL DEFAULT '', @@ -3128,9 +3128,9 @@ CREATE TABLE IF NOT EXISTS `zt_traincourse` ( `importedStatus` varchar(10) NOT NULL DEFAULT '', `lastUpdatedTime` int unsigned NOT NULL DEFAULT 0, `createdBy` varchar(255) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `editedBy` varchar(255) NOT NULL DEFAULT '', - `editedDate` date DEFAULT NULL, + `editedDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -13855,7 +13855,7 @@ CREATE TABLE IF NOT EXISTS `zt_intervention` ( `realBegin` date DEFAULT NULL, `situation` varchar(255) NOT NULL DEFAULT '', `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -13969,11 +13969,11 @@ CREATE TABLE IF NOT EXISTS `zt_nc` ( `resolution` varchar(30) NOT NULL DEFAULT '', `resolvedDate` date DEFAULT NULL, `closedBy` varchar(30) NOT NULL DEFAULT '', - `closedDate` date DEFAULT NULL, + `closedDate` datetime DEFAULT NULL, `parent` int unsigned NOT NULL DEFAULT 0, `assignedTo` varchar(30) NOT NULL DEFAULT '', - `assignedDate` date DEFAULT NULL, - `activateDate` date DEFAULT NULL, + `assignedDate` datetime DEFAULT NULL, + `activateDate` datetime DEFAULT NULL, `createdBy` varchar(30) NOT NULL DEFAULT '', `createdDate` datetime DEFAULT NULL, `editedBy` varchar(30) NOT NULL DEFAULT '', @@ -14034,7 +14034,7 @@ CREATE TABLE IF NOT EXISTS `zt_programactivity` ( `result` varchar(30) NOT NULL DEFAULT '', `linkedBy` varchar(30) NOT NULL DEFAULT '', `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -14053,7 +14053,7 @@ CREATE TABLE IF NOT EXISTS `zt_programoutput` ( `result` varchar(30) NOT NULL DEFAULT '', `linkedBy` varchar(30) NOT NULL DEFAULT '', `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -14070,7 +14070,7 @@ CREATE TABLE IF NOT EXISTS `zt_programprocess` ( `reason` varchar(255) NOT NULL DEFAULT '', `linkedBy` varchar(30) NOT NULL DEFAULT '', `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -14112,9 +14112,9 @@ CREATE TABLE IF NOT EXISTS `zt_budget` ( `name` varchar(255) NOT NULL DEFAULT '', `desc` mediumtext DEFAULT NULL, `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `lastEditedBy` varchar(30) NOT NULL DEFAULT '', - `lastEditedDate` date DEFAULT NULL, + `lastEditedDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -14230,7 +14230,7 @@ CREATE TABLE IF NOT EXISTS `zt_meastemplate` ( `name` varchar(255) NOT NULL DEFAULT '', `content` mediumtext DEFAULT NULL, `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -14244,7 +14244,7 @@ CREATE TABLE IF NOT EXISTS `zt_programreport` ( `params` text DEFAULT NULL, `content` text DEFAULT NULL, `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -14292,7 +14292,7 @@ CREATE TABLE IF NOT EXISTS `zt_object` ( `designEst` varchar(30) NOT NULL DEFAULT '', `end` date DEFAULT NULL, `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -14310,17 +14310,17 @@ CREATE TABLE IF NOT EXISTS `zt_review` ( `reviewedBy` varchar(255) NOT NULL DEFAULT '', `auditedBy` varchar(255) NOT NULL DEFAULT '', `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `begin` date DEFAULT NULL, `deadline` date DEFAULT NULL, `lastReviewedBy` varchar(255) NOT NULL DEFAULT '', - `lastReviewedDate` date DEFAULT NULL, + `lastReviewedDate` datetime DEFAULT NULL, `lastAuditedBy` varchar(255) NOT NULL DEFAULT '', - `lastAuditedDate` date DEFAULT NULL, + `lastAuditedDate` datetime DEFAULT NULL, `toAuditBy` varchar(30) NOT NULL DEFAULT '', `toAuditDate` datetime DEFAULT NULL, `lastEditedBy` varchar(255) NOT NULL DEFAULT '', - `lastEditedDate` date DEFAULT NULL, + `lastEditedDate` datetime DEFAULT NULL, `result` varchar(30) NOT NULL DEFAULT '', `auditResult` varchar(30) NOT NULL DEFAULT '', `deleted` tinyint unsigned NOT NULL DEFAULT 0, @@ -14356,7 +14356,7 @@ CREATE TABLE IF NOT EXISTS `zt_reviewresult` ( `opinion` text DEFAULT NULL, `reviewer` varchar(30) NOT NULL DEFAULT '', `remainIssue` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `consumed` decimal(10,2) unsigned NOT NULL DEFAULT 0.00, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -14378,9 +14378,9 @@ CREATE TABLE IF NOT EXISTS `zt_reviewissue` ( `status` varchar(30) NOT NULL DEFAULT '', `resolution` varchar(30) NOT NULL DEFAULT '', `resolutionBy` varchar(30) NOT NULL DEFAULT '', - `resolutionDate` date DEFAULT NULL, + `resolutionDate` datetime DEFAULT NULL, `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -14431,9 +14431,9 @@ CREATE TABLE IF NOT EXISTS `zt_solutions` ( `measures` text DEFAULT NULL, `type` varchar(30) NOT NULL DEFAULT '', `addedBy` varchar(30) NOT NULL DEFAULT '', - `addedDate` date DEFAULT NULL, + `addedDate` datetime DEFAULT NULL, `editedBy` varchar(30) NOT NULL DEFAULT '', - `editedDate` date DEFAULT NULL, + `editedDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -14489,7 +14489,7 @@ CREATE TABLE IF NOT EXISTS `zt_issue` ( `resolution` varchar(30) NOT NULL DEFAULT '', `resolutionComment` text DEFAULT NULL, `objectID` varchar(255) NOT NULL DEFAULT '', - `resolvedDate` date DEFAULT NULL, + `resolvedDate` datetime DEFAULT NULL, `status` varchar(30) NOT NULL DEFAULT '', `owner` varchar(255) NOT NULL DEFAULT '', `lib` int unsigned NOT NULL DEFAULT 0, @@ -14500,13 +14500,13 @@ CREATE TABLE IF NOT EXISTS `zt_issue` ( `editedBy` varchar(30) NOT NULL DEFAULT '', `editedDate` datetime DEFAULT NULL, `activateBy` varchar(30) NOT NULL DEFAULT '', - `activateDate` date DEFAULT NULL, + `activateDate` datetime DEFAULT NULL, `closedBy` varchar(30) NOT NULL DEFAULT '', - `closedDate` date DEFAULT NULL, + `closedDate` datetime DEFAULT NULL, `assignedTo` varchar(30) NOT NULL DEFAULT '', `assignedBy` varchar(30) NOT NULL DEFAULT '', `assignedDate` datetime DEFAULT NULL, - `approvedDate` date DEFAULT NULL, + `approvedDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -14540,19 +14540,19 @@ CREATE TABLE IF NOT EXISTS `zt_risk` ( `resolution` mediumtext DEFAULT NULL, `resolvedBy` varchar(30) NOT NULL DEFAULT '', `activateBy` varchar(30) NOT NULL DEFAULT '', - `activateDate` date DEFAULT NULL, + `activateDate` datetime DEFAULT NULL, `assignedTo` varchar(30) NOT NULL DEFAULT '', `closedBy` varchar(30) NOT NULL DEFAULT '', - `closedDate` date DEFAULT NULL, + `closedDate` datetime DEFAULT NULL, `cancelBy` varchar(30) NOT NULL DEFAULT '', - `cancelDate` date DEFAULT NULL, + `cancelDate` datetime DEFAULT NULL, `cancelReason` varchar(30) NOT NULL DEFAULT '', `hangupBy` varchar(30) NOT NULL DEFAULT '', - `hangupDate` date DEFAULT NULL, + `hangupDate` datetime DEFAULT NULL, `trackedBy` varchar(30) NOT NULL DEFAULT '', - `trackedDate` date DEFAULT NULL, - `assignedDate` date DEFAULT NULL, - `approvedDate` date DEFAULT NULL, + `trackedDate` datetime DEFAULT NULL, + `assignedDate` datetime DEFAULT NULL, + `approvedDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -14582,8 +14582,8 @@ CREATE TABLE IF NOT EXISTS `zt_opportunity` ( `pri` tinyint unsigned NOT NULL DEFAULT 3, `identifiedDate` date DEFAULT NULL, `assignedTo` varchar(30) NOT NULL DEFAULT '', - `assignedDate` date DEFAULT NULL, - `approvedDate` date DEFAULT NULL, + `assignedDate` datetime DEFAULT NULL, + `approvedDate` datetime DEFAULT NULL, `prevention` mediumtext DEFAULT NULL, `plannedClosedDate` date DEFAULT NULL, `actualClosedDate` date DEFAULT NULL, @@ -15813,7 +15813,7 @@ CREATE TABLE IF NOT EXISTS `zt_demandpool` ( `status` varchar(30) NOT NULL DEFAULT '', `products` varchar(255) NOT NULL DEFAULT '', `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `owner` text DEFAULT NULL, `reviewer` text DEFAULT NULL, `acl` varchar(10) NOT NULL DEFAULT 'open', @@ -15968,7 +15968,7 @@ CREATE TABLE IF NOT EXISTS `zt_roadmap` ( `end` date DEFAULT NULL, `desc` longtext DEFAULT NULL, `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` date DEFAULT NULL, + `createdDate` datetime DEFAULT NULL, `closedBy` varchar(30) NOT NULL DEFAULT '', `closedDate` datetime DEFAULT NULL, `closedReason` varchar(10) NOT NULL DEFAULT '', diff --git a/module/branch/config/form.php b/module/branch/config/form.php index 59ebe74392..c92aade0c2 100644 --- a/module/branch/config/form.php +++ b/module/branch/config/form.php @@ -11,7 +11,7 @@ $config->branch->form->batchedit['status'] = array('type' => 'string', 'requir $config->branch->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => ''); $config->branch->form->create['desc'] = array('type' => 'string', 'required' => false, 'default' => ''); $config->branch->form->create['status'] = array('type' => 'string', 'required' => false, 'default' => 'active'); -$config->branch->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::today()); +$config->branch->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now()); $config->branch->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => ''); $config->branch->form->edit['desc'] = array('type' => 'string', 'required' => false, 'default' => ''); diff --git a/module/branch/model.php b/module/branch/model.php index 0664db80a4..a0a0bbeb3e 100644 --- a/module/branch/model.php +++ b/module/branch/model.php @@ -263,7 +263,7 @@ class branchModel extends model $this->app->loadLang('product'); $this->lang->error->unique = str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->existName); - $branch->closedDate = $branch->status == 'closed' ? helper::today() : null; + $branch->closedDate = $branch->status == 'closed' ? helper::now() : null; $this->dao->update(TABLE_BRANCH)->data($branch) ->where('id')->eq($branchID) ->batchCheck($this->config->branch->edit->requiredFields, 'notempty') @@ -303,7 +303,7 @@ class branchModel extends model $newBranch->name = $branch->name; $newBranch->desc = $branch->desc; $newBranch->status = $branch->status; - $newBranch->closedDate = $branch->status == 'closed' ? helper::today() : null; + $newBranch->closedDate = $branch->status == 'closed' ? helper::now() : null; $this->dao->update(TABLE_BRANCH)->data($newBranch) ->batchCheck($this->config->branch->create->requiredFields, 'notempty') @@ -337,7 +337,7 @@ class branchModel extends model { $this->dao->update(TABLE_BRANCH) ->set('status')->eq('closed') - ->set('closedDate')->eq(helper::today()) + ->set('closedDate')->eq(helper::now()) ->set('`default`')->eq('0') ->where('id')->eq($branchID) ->exec(); diff --git a/module/kanban/model.php b/module/kanban/model.php index 95627e1002..5019559784 100755 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -2695,7 +2695,7 @@ class kanbanModel extends model $region->name = $this->lang->kanbanregion->default; $region->kanban = $execution->id; $region->createdBy = $this->app->user->account; - $region->createdDate = helper::today(); + $region->createdDate = helper::now(); $region->order = 1; $this->dao->insert(TABLE_KANBANREGION)->data($region) diff --git a/module/product/config/formdata.php b/module/product/config/formdata.php index 877c77dc99..3dfbcec766 100644 --- a/module/product/config/formdata.php +++ b/module/product/config/formdata.php @@ -51,7 +51,7 @@ $config->product->form->batchEdit['acl'] = array('type' => 'string', 'contro $config->product->form->close = array(); $config->product->form->close['status'] = array('type' => 'string', 'control' => 'hidden', 'required' => false, 'default' => 'close'); -$config->product->form->close['closedDate'] = array('type' => 'string', 'control' => 'hidden', 'required' => false, 'default' => date('Y-m-d')); +$config->product->form->close['closedDate'] = array('type' => 'string', 'control' => 'hidden', 'required' => false, 'default' => helper::now()); $config->product->form->activate = array(); $config->product->form->activate['status'] = array('type' => 'string', 'control' => 'hidden', 'required' => false, 'default' => 'normal'); diff --git a/module/project/zen.php b/module/project/zen.php index 286a6fee42..2e6832bc5e 100755 --- a/module/project/zen.php +++ b/module/project/zen.php @@ -564,7 +564,7 @@ class projectZen extends project ->setDefault('status', 'suspended') ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', helper::now()) - ->setDefault('suspendedDate', helper::today()) + ->setDefault('suspendedDate', helper::now()) ->stripTags($editorIdList, $this->config->allowedTags) ->get(); } diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php index b8d4f41682..b84a59b3b2 100644 --- a/module/stakeholder/control.php +++ b/module/stakeholder/control.php @@ -375,7 +375,7 @@ class stakeholder extends control $expectData = form::data() ->add('userID', $stakeholderID) ->add('createdBy', $this->app->user->account) - ->add('createdDate', date('Y-m-d')) + ->add('createdDate', helper::now()) ->add('project', $this->session->project) ->get(); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); diff --git a/module/stakeholder/model.php b/module/stakeholder/model.php index 58d835b8fc..2ed97b1f36 100644 --- a/module/stakeholder/model.php +++ b/module/stakeholder/model.php @@ -23,7 +23,7 @@ class stakeholderModel extends model $stakeholder->from = $data->from; $stakeholder->type = $data->from == 'outside' ? 'outside' : 'inside'; $stakeholder->createdBy = $this->app->user->account; - $stakeholder->createdDate = helper::today(); + $stakeholder->createdDate = helper::now(); $this->dao->insert(TABLE_STAKEHOLDER)->data($stakeholder)->check('user', 'unique', "objectID = {$stakeholder->objectID} AND deleted = '0'")->autoCheck()->exec(); $stakeholderID = $this->dao->lastInsertID(); @@ -149,7 +149,7 @@ class stakeholderModel extends model $stakeholder->type = in_array($account, array_keys($members)) ? 'inside' : 'outside'; $stakeholder->from = $stakeholder->type == 'inside' ? 'team' : 'company'; $stakeholder->createdBy = $this->app->user->account; - $stakeholder->createdDate = isset($oldJoin[$account]) ? $oldJoin[$account] : helper::today(); + $stakeholder->createdDate = isset($oldJoin[$account]) ? $oldJoin[$account] : helper::now(); $this->dao->insert(TABLE_STAKEHOLDER)->data($stakeholder)->exec(); $stakeholderID = $this->dao->lastInsertId(); @@ -220,7 +220,7 @@ class stakeholderModel extends model $stakeholder = new stdclass(); $stakeholder->key = $data->key; $stakeholder->editedBy = $this->app->user->account; - $stakeholder->editedDate = helper::today(); + $stakeholder->editedDate = helper::now(); $this->dao->update(TABLE_STAKEHOLDER)->data($stakeholder) ->autoCheck() diff --git a/module/tutorial/model.php b/module/tutorial/model.php index d06a449896..c54a9857c6 100644 --- a/module/tutorial/model.php +++ b/module/tutorial/model.php @@ -2065,7 +2065,7 @@ class tutorialModel extends model $main->default = 1; $main->status = 'active'; $main->desc = $this->lang->branch->defaultBranch; - $main->createdDate = helper::today(); + $main->createdDate = helper::now(); $main->closedDate = ''; $main->order = 0; $main->deleted = 0; @@ -2077,7 +2077,7 @@ class tutorialModel extends model $branch->default = 0; $branch->status = 'active'; $branch->desc = ''; - $branch->createdDate = helper::today(); + $branch->createdDate = helper::now(); $branch->closedDate = ''; $branch->order = 1; $branch->deleted = 0; @@ -2349,7 +2349,7 @@ class tutorialModel extends model $demandpool->status = 'normal'; $demandpool->products = '1'; $demandpool->createdBy = $this->app->user->account; - $demandpool->createdDate = helper::today(); + $demandpool->createdDate = helper::now(); $demandpool->owner = $this->app->user->account; $demandpool->reviewer = ",{$this->app->user->account},test"; $demandpool->acl = 'open';