gx

@@ -40,7 +40,7 @@ class Count extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
-        $list = DB::table('gl_project')->where('gl_project.extend_type','!=',5)
+        $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->select($this->selectParam())->get();
             ->select($this->selectParam())->get();

@@ -36,7 +36,7 @@ class InquiryMonthlyCount extends Command
      * @time   :2023/6/30 9:32
      * @time   :2023/6/30 9:32
      */
      */
     public function handle(){
     public function handle(){
-        $list = DB::table('gl_project')->where('gl_project.extend_type','!=',5)
+        $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->select($this->selectParam())->get()->toArray();
             ->select($this->selectParam())->get()->toArray();

@@ -70,6 +70,9 @@ class RemainDay extends Command
                 }
                 }
             }
             }
             $item->remain_day = $remain_day > 0 ? $remain_day : 0;
             $item->remain_day = $remain_day > 0 ? $remain_day : 0;
+            if($item->remain_day == 0){
+                $item->extend_type = Project::TYPE_FIVE;
+            }
             $item->save();
             $item->save();
         }
         }
     }
     }

@@ -22,6 +22,7 @@ use App\Models\Manage\Manage;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use App\Models\Project\ProjectRenew;
 use App\Models\Task\Task;
 use App\Models\Task\Task;
 use Carbon\Carbon;
 use Carbon\Carbon;
 
 
@@ -171,4 +172,24 @@ class RenewProjectController extends BaseController
         ];
         ];
         return $item;
         return $item;
     }
     }
+
+    /**
+     * @remark :关联续费单
+     * @name   :editRenew
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/19 9:59
+     */
+    public function editRenew(RenewLogic $logic){
+        $this->request->validate([
+            'id'=>'required',
+            'renew_id'=>'required',
+        ],[
+            'id.required' => 'id不能为空',
+            'renew_id'=>'续费单id不能为空',
+        ]);
+        $logic->editProjectRenew();
+        $this->response('同步成功');
+
+    }
 }
 }

@@ -10,6 +10,7 @@
 namespace App\Http\Logic\Aside\Project;
 namespace App\Http\Logic\Aside\Project;
 
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Project\DeployBuild;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Project\ProjectRenew;
 use App\Models\Project\ProjectRenew;
 
 
@@ -32,8 +33,10 @@ class RenewLogic extends BaseLogic
     public function renewListsLog($map,$page,$row,$order,$field = ['*']){
     public function renewListsLog($map,$page,$row,$order,$field = ['*']){
         $lists = $this->model->lists($map,$page,$row,$order,$field);
         $lists = $this->model->lists($map,$page,$row,$order,$field);
         if(!empty($lists['list'])){
         if(!empty($lists['list'])){
+            $projectModel = new Project();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['plan'] = Project::planMap()[$v['plan']];
                 $v['plan'] = Project::planMap()[$v['plan']];
+                $v['project_name'] = $projectModel->getProjectName($v['project_id']);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
@@ -54,4 +57,45 @@ class RenewLogic extends BaseLogic
         }
         }
         return $this->success($info);
         return $this->success($info);
     }
     }
+
+    /**
+     * @remark :关联续费单
+     * @name   :editProjectRenew
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/19 10:21
+     */
+    public function editProjectRenew(){
+        //获取续费单详情
+        $info = $this->model->read(['id'=>$this->param['renew_id']]);
+        if($info === false){
+            $this->fail('当前续费单不存在');
+        }
+        if($info['project_id'] != 0){
+            $this->fail('当前续费单已关联项目，请重新选择');
+        }
+        try {
+            $this->model->edit(['project_id'=>$this->param['id'],'operator_id'=>$this->manager['id']],['id'=>$this->param['renew_id']]);
+            $project = new Project();
+            $project->edit(['extend_type'=>0],['id'=>$this->param['id']]);
+            $deployBuild = new DeployBuild();
+            $deployBuild->edit(
+                ['service_duration'=>DB::raw('service_duration + ' . $info['service_duration']),
+                    'plan'=>$info['plan']], ['project_id'=>$this->param['id']]);
+        }catch (\Exception $e){
+            $this->fail('系统错误，请联系管理员');
+        }
+        return $this->success();
+    }
+
+    /**
+     * @remark :续费单还原
+     * @name   :reductionRenew
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/19 10:39
+     */
+    public function reductionRenew(){
+
+    }
 }
 }

@@ -285,4 +285,21 @@ class Project extends Base
         return $data;
         return $data;
     }
     }
 
 
+    /**
+     * @remark :获取项目名称
+     * @name   :getProjectName
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/19 10:35
+     */
+    public function getProjectName($id){
+        $title = '';
+        if(!empty($id)){
+            $info = $this->read(['id'=>$id]);
+            if($info !== false){
+                $title = $info['title'];
+            }
+        }
+        return $title;
+    }
 }
 }

@@ -181,7 +181,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/log', [Aside\Project\RenewProjectController::class, 'renewLists'])->name('admin.renew_renewLists');
         Route::any('/log', [Aside\Project\RenewProjectController::class, 'renewLists'])->name('admin.renew_renewLists');
         Route::any('/info', [Aside\Project\RenewProjectController::class, 'info'])->name('admin.renew_info');
         Route::any('/info', [Aside\Project\RenewProjectController::class, 'info'])->name('admin.renew_info');
         Route::any('/notHaveRenewItems', [Aside\Project\RenewProjectController::class, 'notHaveRenewItems'])->name('admin.renew_notHaveRenewItems');
         Route::any('/notHaveRenewItems', [Aside\Project\RenewProjectController::class, 'notHaveRenewItems'])->name('admin.renew_notHaveRenewItems');
-
+        Route::any('/editRenew', [Aside\Project\RenewProjectController::class, 'editRenew'])->name('admin.renew_editRenew');
     });
     });
     //工单管理
     //工单管理
     Route::prefix('task')->group(function () {
     Route::prefix('task')->group(function () {