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

Merge branch 'master' into 'sprint/wangyuting_workflow'

Browse Source 
# Conflicts:
#   framework/control.class.php
This commit is contained in:
王怡栋
2022-05-10 08:46:32 +00:00
parent bcf64c0c54 69d9ffe9ae
commit d9d331c38e
46 changed files with 996 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+6
View File
@@ -44,6 +44,7 @@ class testtaskModel extends model
->checkIF($task->begin != '', 'begin', 'date')
->checkIF($task->end != '', 'end', 'date')
->checkIF($task->end != '', 'end', 'ge', $task->begin)
->checkFlow()
->exec();
if(!dao::isError())
@@ -746,6 +747,7 @@ class testtaskModel extends model
->autoCheck()
->batchcheck($this->config->testtask->edit->requiredFields, 'notempty')
->checkIF($task->end != '', 'end', 'ge', $task->begin)
->checkFlow()
->where('id')->eq($taskID)
->exec();
@@ -774,6 +776,7 @@ class testtaskModel extends model
$this->dao->update(TABLE_TESTTASK)->data($testtask)
->autoCheck()
->checkFlow()
->where('id')->eq((int)$taskID)
->exec();
@@ -811,6 +814,7 @@ class testtaskModel extends model
$testtask = $this->loadModel('file')->processImgURL($testtask, $this->config->testtask->editor->close['id'], $this->post->uid);
$this->dao->update(TABLE_TESTTASK)->data($testtask)
->autoCheck()
->checkFlow()
->where('id')->eq((int)$taskID)
->exec();
@@ -838,6 +842,7 @@ class testtaskModel extends model
$this->dao->update(TABLE_TESTTASK)->data($testtask)
->autoCheck()
->checkFlow()
->where('id')->eq((int)$taskID)
->exec();
@@ -860,6 +865,7 @@ class testtaskModel extends model
$this->dao->update(TABLE_TESTTASK)->data($testtask)
->autoCheck()
->checkFlow()
->where('id')->eq((int)$taskID)
->exec();