diff --git a/app/adminapi/logic/task/TaskAllocationLogic.php b/app/adminapi/logic/task/TaskAllocationLogic.php index a8c0d49bf..1f9b21a9d 100644 --- a/app/adminapi/logic/task/TaskAllocationLogic.php +++ b/app/adminapi/logic/task/TaskAllocationLogic.php @@ -58,7 +58,7 @@ class TaskAllocationLogic extends BaseLogic 'task_type_id' => $taskType['id'], // 任务类别id 'cost_project_id' => $taskType['cost_project_id'], // 项目id 'apptime' => $params['apptime'], - 'annex' => json_encode($params['annex']), + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, ]); // 任务明细 $taskDetail = $params['task_detail']; @@ -99,7 +99,7 @@ class TaskAllocationLogic extends BaseLogic 'task_type_id' => $taskType['id'], // 任务类别id 'cost_project_id' => $taskType['cost_project_id'], // 项目id 'apptime' => $params['apptime'], - 'annex' => json_encode($params['annex']), + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, ]); Db::commit(); return true; @@ -134,7 +134,6 @@ class TaskAllocationLogic extends BaseLogic public static function detail($params): array { $data = TaskAllocation::with(['taskTypeInfo', 'projectInfo'])->findOrEmpty($params['id'])->toArray(); - $data['annex'] = json_decode($data['annex'], true); $data['task_detail'] = TaskDetail::where('task_allocation_id', $data['id'])->select()->each(function ($item){ $taskTypeInfo = TaskType::findOrEmpty($item['task_type_id'])->toArray(); $item['task_name'] = $taskTypeInfo['name']; diff --git a/app/adminapi/validate/task/TaskAllocationValidate.php b/app/adminapi/validate/task/TaskAllocationValidate.php index 936b2506e..6ff684f66 100644 --- a/app/adminapi/validate/task/TaskAllocationValidate.php +++ b/app/adminapi/validate/task/TaskAllocationValidate.php @@ -1,94 +1,96 @@ - 'require', - ]; - - - /** - * 参数描述 - * @var string[] - */ - protected $field = [ - 'id' => 'id', - ]; - - - /** - * @notes 添加场景 - * @return TaskAllocationValidate - * @author likeadmin - * @date 2024/02/22 10:47 - */ - public function sceneAdd() - { - return $this->remove('id', true); - } - - - /** - * @notes 编辑场景 - * @return TaskAllocationValidate - * @author likeadmin - * @date 2024/02/22 10:47 - */ - public function sceneEdit() - { - return $this->only(['id']); - } - - - /** - * @notes 删除场景 - * @return TaskAllocationValidate - * @author likeadmin - * @date 2024/02/22 10:47 - */ - public function sceneDelete() - { - return $this->only(['id']); - } - - - /** - * @notes 详情场景 - * @return TaskAllocationValidate - * @author likeadmin - * @date 2024/02/22 10:47 - */ - public function sceneDetail() - { - return $this->only(['id']); - } - + 'require', + 'annex' => 'checkAnnex' + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + + ]; + + + /** + * @notes 添加场景 + * @return TaskAllocationValidate + * @author likeadmin + * @date 2024/02/22 10:47 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return TaskAllocationValidate + * @author likeadmin + * @date 2024/02/22 10:47 + */ + public function sceneEdit() + { + return $this->only(['id','annex']); + } + + + /** + * @notes 删除场景 + * @return TaskAllocationValidate + * @author likeadmin + * @date 2024/02/22 10:47 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return TaskAllocationValidate + * @author likeadmin + * @date 2024/02/22 10:47 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + } \ No newline at end of file