|
@@ -420,6 +420,40 @@ class ItemService extends Service
|
|
|
->toArray();
|
|
->toArray();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ private function checkDelete($data, $type = 1){
|
|
|
|
|
+ $id = $data['id'];
|
|
|
|
|
+ if($type == 1){
|
|
|
|
|
+ $item = Item::where('del_time',0)
|
|
|
|
|
+ ->where('id', $id)
|
|
|
|
|
+ ->first();
|
|
|
|
|
+ if($item->state == Item::TYPE_THREE) return [false, '项目已完成'];
|
|
|
|
|
+ $bool = ItemNode::where('del_time',0)
|
|
|
|
|
+ ->where('item_id', $id)
|
|
|
|
|
+ ->exists();
|
|
|
|
|
+ if($bool) return [false, '项目下已存在节点'];
|
|
|
|
|
+ $bool = ItemNodeMission::where('del_time',0)
|
|
|
|
|
+ ->where('item_id', $id)
|
|
|
|
|
+ ->exists();
|
|
|
|
|
+ if($bool) return [false, '项目下已存在任务'];
|
|
|
|
|
+ }elseif ($type == 2){
|
|
|
|
|
+ $item = ItemNode::where('del_time',0)
|
|
|
|
|
+ ->where('id', $id)
|
|
|
|
|
+ ->first();
|
|
|
|
|
+ if($item->state == ItemNode::TYPE_THREE) return [false, '节点已完成'];
|
|
|
|
|
+ $bool = ItemNodeMission::where('del_time',0)
|
|
|
|
|
+ ->where('item_node_id', $id)
|
|
|
|
|
+ ->exists();
|
|
|
|
|
+ if($bool) return [false, '节点下已存在任务'];
|
|
|
|
|
+ }else{
|
|
|
|
|
+ $item_node_mission = ItemNodeMission::where('del_time',0)
|
|
|
|
|
+ ->where('id', $id)
|
|
|
|
|
+ ->first();
|
|
|
|
|
+ if($item_node_mission->state == ItemNodeMission::TYPE_THREE) return [false, '任务已完成'];
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return [true, ''];
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
public function itemDel($data){
|
|
public function itemDel($data){
|
|
|
if($this->isEmpty($data,'id')) return [false,'请选择数据!'];
|
|
if($this->isEmpty($data,'id')) return [false,'请选择数据!'];
|
|
|
|
|
|
|
@@ -1572,6 +1606,7 @@ class ItemService extends Service
|
|
|
$node_tmp = $tag[$customer['mission_id']] ?? [];
|
|
$node_tmp = $tag[$customer['mission_id']] ?? [];
|
|
|
$customer['mission_title'] = $node_tmp['title'] ?? '';
|
|
$customer['mission_title'] = $node_tmp['title'] ?? '';
|
|
|
$customer['mission_code'] = $node_tmp['code'] ?? '';
|
|
$customer['mission_code'] = $node_tmp['code'] ?? '';
|
|
|
|
|
+ $customer['parent_item_node_mission_title'] = ItemNodeMission::where('id', $customer['parent_item_node_mission_id'])->value('title') ?? '';
|
|
|
|
|
|
|
|
$item_node_map = $this->getItemNodeMap($customer['id']);
|
|
$item_node_map = $this->getItemNodeMap($customer['id']);
|
|
|
$customer['item_node_title'] = $item_node_map[$customer['id']];
|
|
$customer['item_node_title'] = $item_node_map[$customer['id']];
|