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

Merge branch dev/task-147448 of zentao/zentaopms (#11125)

Browse Source
This commit is contained in:
刘刚
2025-08-25 17:09:26 +08:00
committed by Gitfox
parent 5cda9372d6 75170ad734
commit b77a3c650a
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+7 -2
View File
@@ -885,6 +885,7 @@ class taskModel extends model
$currentTask = !empty($task) ? clone $task : new stdclass();
if(!isset($currentTask->status)) $currentTask->status = $oldTask->status;
$oldTask->team = $team;
if(isset($task->mode)) $oldTask->mode = $task->mode;
/* If the assignedTo is not empty, the current task assignedTo is assignedTo. */
if(!empty($_POST['assignedTo']) && is_string($_POST['assignedTo']))
@@ -896,10 +897,14 @@ class taskModel extends model
else
{
$currentTask->assignedTo = $this->getAssignedTo4Multi($members, $oldTask);
if($oldTask->assignedTo != $currentTask->assignedTo) $currentTask->assignedDate = helper::now();
$oldTask->team = $oldTeam;
}
if(isset($task->mode) && $task->mode == 'multi' && strpos(',wait,doing,pause,', ",{$task->status},") !== false) $currentTask->assignedTo = '';
if($oldTask->assignedTo != $currentTask->assignedTo) $currentTask->assignedDate = helper::now();
$oldTask->team = $oldTeam;
/* Compute estimate and left. */
$currentTask->estimate = 0;
$currentTask->left = 0;
module/task/test/model/computemultiplehours.php
+7 -5
View File
@@ -25,6 +25,8 @@ $taskTeam->consumed->range('0{11},1{4},0{2},1{3}');
$taskTeam->status->range('wait{11},doing,done,done,done,wait,wait,doing,done,done');
$taskTeam->gen(20);
zenData('story')->gen(5);
global $tester;
$tester->loadModel('task');
@@ -111,7 +113,7 @@ cid=1
- 属性left @0
- taskID 1 有传入task 传入members计算多人工时
- 属性id @1
- 属性assignedTo @admin
- 属性assignedTo @~~
- 属性status @doing
- 属性estimate @3
- 属性left @3
@@ -123,7 +125,7 @@ cid=1
- 属性left @3
- taskID 1 有传入task 传入members 不自动更新状态计算多人工时
- 属性id @1
- 属性assignedTo @admin
- 属性assignedTo @~~
- 属性status @doing
- 属性estimate @3
- 属性left @3
@@ -144,7 +146,7 @@ r($task->computeMultipleHoursTest($oldTasks[3]))
r($task->computeMultipleHoursTest($oldTasks[4])) && p('id,assignedTo,status,estimate,left') && e('5,admin,cancel,0,0'); // taskID 5 只有老task计算多人工时
r($task->computeMultipleHoursTest($oldTasks[0], $tasks[0])) && p('id,assignedTo,status,estimate,left') && e('1,admin,doing,5,4'); // taskID 1 有传入task计算多人工时
r($task->computeMultipleHoursTest($oldTasks[1], $tasks[1])) && p('id,assignedTo,status,estimate,left') && e('2,user1,done,13,0'); // taskID 2 有传入task计算多人工时
r($task->computeMultipleHoursTest($oldTasks[0], $tasks[0], $members[0])) && p('id,assignedTo,status,estimate,left') && e('1,admin,doing,3,3'); // taskID 1 有传入task 传入members计算多人工时
r($task->computeMultipleHoursTest($oldTasks[0], $tasks[0], $members[0])) && p('id,assignedTo,status,estimate,left') && e('1,~~,doing,3,3'); // taskID 1 有传入task 传入members计算多人工时
r($task->computeMultipleHoursTest($oldTasks[1], $tasks[1], $members[1])) && p('id,assignedTo,status,estimate,left') && e('2,user1,done,3,3'); // taskID 2 有传入task 传入members计算多人工时
r($task->computeMultipleHoursTest($oldTasks[0], $tasks[0], $members[0], false)) && p('id,assignedTo,status,estimate,left') && e('1,admin,doing,3,3'); // taskID 1 有传入task 传入members 不自动更新状态计算多人工时
r($task->computeMultipleHoursTest($oldTasks[1], $tasks[1], $members[1], false)) && p('id,assignedTo,status,estimate,left') && e('2,user1,done,3,3'); // taskID 2 有传入task 传入members 不自动更新状态计算多人工时
r($task->computeMultipleHoursTest($oldTasks[0], $tasks[0], $members[0], false)) && p('id,assignedTo,status,estimate,left') && e('1,~~,doing,3,3'); // taskID 1 有传入task 传入members 不自动更新状态计算多人工时
r($task->computeMultipleHoursTest($oldTasks[1], $tasks[1], $members[1], false)) && p('id,assignedTo,status,estimate,left') && e('2,user1,done,3,3'); // taskID 2 有传入task 传入members 不自动更新状态计算多人工时