|
...
|
...
|
@@ -50,7 +50,7 @@ class RemainDay extends Command |
|
|
|
{
|
|
|
|
$list = Project::whereIn('type', [Project::TYPE_TWO,Project::TYPE_THREE,Project::TYPE_FOUR])->get();
|
|
|
|
foreach ($list as $item){
|
|
|
|
if(in_array($item->id,$this->projectId)){
|
|
|
|
if(in_array($item->id,$this->projectId)){//已开始优化的时间结算
|
|
|
|
$optimizeModel = new DeployOptimize();
|
|
|
|
$opInfo = $optimizeModel->read(['project_id'=>$item->id],['start_date']);
|
|
|
|
if($opInfo === false){
|
|
...
|
...
|
@@ -66,6 +66,7 @@ class RemainDay extends Command |
|
|
|
}else{
|
|
|
|
if($item->uptime){
|
|
|
|
$diff = time() - strtotime($item->uptime);
|
|
|
|
$item->finish_remain_day = floor($diff / (60 * 60 * 24));
|
|
|
|
$remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
|
|
|
|
}else{
|
|
|
|
$remain_day = $item['deploy_build']['service_duration'];
|
...
|
...
|
|