Browse Source

批量创建任务字段调整

kely 11 months ago
parent
commit
cfaed80229

+ 7 - 1
app/Http/Controllers/API/TaskController.php

@@ -215,7 +215,6 @@ class TaskController extends Controller
     public function batchStore(BatchCreateRequest $request, CustomFieldRepository $customFieldRepo)
     {
         $project = Project::query()->allowed($request->project_id)->find($request->project_id);
-
         $parsedItems = [];
         $previousItem = [];
         foreach ($request->items as $index => $item) {
@@ -247,6 +246,11 @@ class TaskController extends Controller
         }
 
         foreach ($parsedItems as $item) {
+            $requirement=$item['requirement_id']>0 ? Requirement::query()->findOrFail($item['requirement_id']) : null;
+
+            $item["whitelist"]=$item['whitelist'] ? sprintf(",%s,", implode(',',$item['whitelist'])) : null;
+
+
             $namingRuleId = data_get($item, "naming_rule_id", 0);
             if ($namingRuleId > 0) {
                 $keys = $customFieldRepo->keysByGroup($namingRuleId);
@@ -259,6 +263,8 @@ class TaskController extends Controller
                 'parent_id' => 0,
                 'company_id' => Auth::user()->company_id,
                 'created_by' => Auth::id(),
+                'asset_id' => $requirement?->asset_id,
+                'requirement_group_id'=> $requirement?->requirement_group_id,
             ]);
 
             ActionRepository::createByTask($task, ObjectAction::CREATED);

+ 1 - 1
app/Http/Requests/API/Task/BatchCreateItemRules.php

@@ -18,7 +18,7 @@ class BatchCreateItemRules
     {
         $rules =  [
             'requirement_id' => [
-                'required',
+                'nullable',
                 Rule::exists('requirements', 'id')->where($this->userCompanyWhere()),
             ],
             'asset_group_id' => [