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

Merge branch 'sprint/175_zhengrunyu_45150' into 'master'

Browse Source 
*Finish task #45150.

See merge request easycorp/zentaopms!698
This commit is contained in:
孙广明
2021-12-01 05:16:22 +00:00
parent 171796e08f ae3c0eb522
commit 3803a94c4c
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+7 -1
View File
@@ -724,6 +724,9 @@ class executionModel extends model
->checkIF($execution->realBegan != '', 'realBegan', 'le', helper::today())
->where('id')->eq((int)$executionID)
->exec();
/* When it has multiple errors, only the first one is prompted */
if(dao::isError() and count(dao::$errors['realBegan']) > 1) dao::$errors['realBegan'] = dao::$errors['realBegan'][0];
if(!dao::isError()) return common::createChanges($oldExecution, $execution);
}
@@ -880,7 +883,10 @@ class executionModel extends model
->checkIF($execution->realEnd != '', 'realEnd', 'ge', $oldExecution->realBegan)
->where('id')->eq((int)$executionID)
->exec();
/* When it has multiple errors, only the first one is prompted */
if(dao::isError() and count(dao::$errors['realEnd']) > 1) dao::$errors['realEnd'] = dao::$errors['realEnd'][0];
if(!dao::isError())
{
$this->loadModel('score')->create('execution', 'close', $oldExecution);
module/project/model.php
+6
View File
@@ -1186,6 +1186,9 @@ class projectModel extends model
->where('id')->eq((int)$projectID)
->exec();
/* When it has multiple errors, only the first one is prompted */
if(dao::isError() and count(dao::$errors['realBegan']) > 1) dao::$errors['realBegan'] = dao::$errors['realBegan'][0];
if(!dao::isError()) return common::createChanges($oldProject, $project);
}
@@ -1338,6 +1341,9 @@ class projectModel extends model
->where('id')->eq((int)$projectID)
->exec();
/* When it has multiple errors, only the first one is prompted */
if(dao::isError() and count(dao::$errors['realEnd']) > 1) dao::$errors['realEnd'] = dao::$errors['realEnd'][0];
if(!dao::isError())
{
$this->loadModel('score')->create('project', 'close', $oldProject);