Merge branch 'dev' of https://gitea.lihaink.cn/mkm/engineering into dev

app/adminapi/controller/project/ProjectRoleSetController.php

@@ -20,6 +20,7 @@ use app\adminapi\controller\BaseAdminController;
 use app\adminapi\lists\project\ProjectRoleSetLists;
 use app\adminapi\logic\project\ProjectRoleSetLogic;
 use app\adminapi\validate\project\ProjectRoleSetValidate;
+use app\common\model\project\ProjectRoleSet;
 
 
 /**
@@ -103,6 +104,12 @@ class ProjectRoleSetController extends BaseAdminController
         $result = ProjectRoleSetLogic::detail($params);
         return $this->data($result);
     }
+	
+	public function getAllProjectRoles(): \think\response\Json
+	{
+		$data = ProjectRoleSet::field('id,name')->order('sort desc')->select()->toArray();
+		return $this->success('请求成功',$data);
+	}
 
 
 }

app/adminapi/controller/project/ProjectTypeSetController.php

@@ -20,6 +20,7 @@ use app\adminapi\controller\BaseAdminController;
 use app\adminapi\lists\project\ProjectTypeSetLists;
 use app\adminapi\logic\project\ProjectTypeSetLogic;
 use app\adminapi\validate\project\ProjectTypeSetValidate;
+use app\common\model\project\ProjectTypeSet;
 
 
 /**
@@ -103,6 +104,12 @@ class ProjectTypeSetController extends BaseAdminController
         $result = ProjectTypeSetLogic::detail($params);
         return $this->data($result);
     }
+	
+	public function getAllProjectTypes(): \think\response\Json
+	{
+		$data = ProjectTypeSet::field('id,name')->select()->toArray();
+		return $this->success('请求成功',$data);
+	}
 
 
 }

app/adminapi/controller/project/ProjectWbsSetController.php

@@ -0,0 +1,108 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+
+namespace app\adminapi\controller\project;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\project\ProjectWbsSetLists;
+use app\adminapi\logic\project\ProjectWbsSetLogic;
+use app\adminapi\validate\project\ProjectWbsSetValidate;
+
+
+/**
+ * 项目WBS设置控制器
+ * Class ProjectWbsSetController
+ * @package app\adminapi\controller\project
+ */
+class ProjectWbsSetController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取项目WBS设置列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public function lists()
+    {
+        return $this->dataLists(new ProjectWbsSetLists());
+    }
+
+
+    /**
+     * @notes 添加项目WBS设置
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public function add()
+    {
+        $params = (new ProjectWbsSetValidate())->post()->goCheck('add');
+        $result = ProjectWbsSetLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(ProjectWbsSetLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑项目WBS设置
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public function edit()
+    {
+        $params = (new ProjectWbsSetValidate())->post()->goCheck('edit');
+        $result = ProjectWbsSetLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(ProjectWbsSetLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除项目WBS设置
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public function delete()
+    {
+        $params = (new ProjectWbsSetValidate())->post()->goCheck('delete');
+        $result = ProjectWbsSetLogic::delete($params);
+        return $result ? $this->success('删除成功', [], 1, 1) : $this->fail(ProjectWbsSetLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取项目WBS设置详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public function detail()
+    {
+        $params = (new ProjectWbsSetValidate())->goCheck('detail');
+        $result = ProjectWbsSetLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/lists/project/ProjectLists.php

@@ -19,6 +19,7 @@ use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\custom\Custom;
 use app\common\model\project\Project;
 use app\common\lists\ListsSearchInterface;
+use app\common\model\project\ProjectTypeSet;
 
 
 /**
@@ -63,12 +64,14 @@ class ProjectLists extends BaseAdminDataLists implements ListsSearchInterface
 			$condition[] = ['custom_id','in',$customIds];
 		}
         return Project::where($this->searchWhere)->where($condition)
-            ->field(['id','custom_id','project_code','name','status','project_address','project_type','strategic_significance','industry','unit_nature','bidding_method','information_sources','person'])
+            ->field(['id','custom_id','project_code','name','status','contacts','telephone','project_address','project_type','strategic_significance','industry','unit_nature','bidding_method','information_sources','person'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($item){
+				$projectType = ProjectTypeSet::where('id',$item['project_type'])->findOrEmpty();
 				$custom = Custom::field('name')->where('id',$item['custom_id'])->findOrEmpty();
 		        $item['custom_name'] = $custom->isEmpty() ? '' : $custom['name'];
+				$item['project_type_name'] = $projectType->isEmpty() ? '' : $projectType['name'];
 				return $item;
 	        })
             ->toArray();

app/adminapi/lists/project/ProjectWbsSetLists.php

@@ -0,0 +1,84 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\lists\project;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\project\ProjectRoleSet;
+use app\common\model\project\ProjectWbsSet;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 项目WBS设置列表
+ * Class ProjectWbsSetLists
+ * @package app\adminapi\listsproject
+ */
+class ProjectWbsSetLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public function setSearch(): array
+    {
+        return [
+            '%like%' => ['name','wbs_code'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取项目WBS设置列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public function lists(): array
+    {
+        $data = ProjectWbsSet::where($this->searchWhere)
+            ->field(['id', 'pid', 'wbs_code', 'name', 'work_standards', 'project_role_id', 'output_data', 'sort', 'weight'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($item){
+		        $projectRole = ProjectRoleSet::field('id,name')->where('id',$item['project_role_id'])->findOrEmpty();
+		        $item['project_role_name'] = $projectRole->isEmpty() ? '' : $projectRole->name;
+				return $item;
+	        })
+            ->toArray();
+	    $tree = buildTree($data,'pid');
+		return $tree;
+    }
+
+
+    /**
+     * @notes 获取项目WBS设置数量
+     * @return int
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public function count(): int
+    {
+        return ProjectWbsSet::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/logic/project/ProjectLogic.php

@@ -18,6 +18,7 @@ namespace app\adminapi\logic\project;
 use app\common\model\custom\Custom;
 use app\common\model\project\Project;
 use app\common\logic\BaseLogic;
+use app\common\model\project\ProjectTypeSet;
 use think\facade\Db;
 
 
@@ -157,8 +158,10 @@ class ProjectLogic extends BaseLogic
     public static function detail($params): array
     {
 		$data = Project::findOrEmpty($params['id'])->toArray();
+	    $projectType = ProjectTypeSet::where('id',$data['project_type'])->findOrEmpty();
 	    $custom = Custom::field('name')->where('id',$data['custom_id'])->findOrEmpty();
 	    $data['custom_name'] = $custom->isEmpty() ? '' : $custom['name'];
+	    $data['project_type_name'] = $projectType->isEmpty() ? '' : $projectType['name'];
         return $data;
     }
 }

app/adminapi/logic/project/ProjectWbsSetLogic.php

@@ -0,0 +1,146 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\logic\project;
+
+
+use app\common\model\project\ProjectRoleSet;
+use app\common\model\project\ProjectTypeSet;
+use app\common\model\project\ProjectWbsSet;
+use app\common\logic\BaseLogic;
+use think\facade\Db;
+
+
+/**
+ * 项目WBS设置逻辑
+ * Class ProjectWbsSetLogic
+ * @package app\adminapi\logic\project
+ */
+class ProjectWbsSetLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加项目WBS设置
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public static function add(array $params): bool
+    {
+        Db::startTrans();
+        try {
+			$pid = 0;
+			if(isset($params['sup_wbs_code']) && $params['sup_wbs_code'] != ''){
+				$supData = ProjectWbsSet::where('wbs_code',$params['sup_wbs_code'])->findOrEmpty();
+				$pid = !$supData->isEmpty() ? $supData['id'] : 0;
+			}
+            ProjectWbsSet::create([
+                'project_type_id' => $params['project_type_id'],
+                'pid' => $pid,
+                'wbs_code' => $params['wbs_code'],
+                'name' => $params['name'],
+                'work_standards' => $params['work_standards'],
+                'project_role_id' => $params['project_role_id'],
+                'output_data' => $params['output_data'],
+                'sort' => $params['sort'],
+                'weight' => $params['weight']
+            ]);
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 编辑项目WBS设置
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public static function edit(array $params): bool
+    {
+        Db::startTrans();
+        try {
+	        $pid = 0;
+	        if(isset($params['sup_wbs_code']) && $params['sup_wbs_code'] != ''){
+		        $supData = ProjectWbsSet::where('wbs_code',$params['sup_wbs_code'])->findOrEmpty();
+		        $pid = !$supData->isEmpty() ? $supData['id'] : 0;
+	        }
+            ProjectWbsSet::where('id', $params['id'])->update([
+                'project_type_id' => $params['project_type_id'],
+                'pid' => $pid,
+                'wbs_code' => $params['wbs_code'],
+                'name' => $params['name'],
+                'work_standards' => $params['work_standards'],
+                'project_role_id' => $params['project_role_id'],
+                'output_data' => $params['output_data'],
+                'sort' => $params['sort'],
+                'weight' => $params['weight']
+            ]);
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 删除项目WBS设置
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public static function delete(array $params): bool
+    {
+		$data = ProjectWbsSet::where('pid',$params['id'])->findOrEmpty();
+		if(!$data->isEmpty()){
+			self::setError('当前节点存在子节点，不能删除');
+			return false;
+		}
+        return ProjectWbsSet::destroy($params['id']);
+    }
+
+
+    /**
+     * @notes 获取项目WBS设置详情
+     * @param $params
+     * @return array
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public static function detail($params): array
+    {
+		$data = ProjectWbsSet::field('id,project_type_id,pid,wbs_code,name,work_standards,project_role_id,output_data,sort,weight')->findOrEmpty($params['id'])->toArray();
+		$projectType = ProjectTypeSet::field('id,name')->where('id',$data['project_type_id'])->findOrEmpty();
+		$projectRole = ProjectRoleSet::field('id,name')->where('id',$data['project_role_id'])->findOrEmpty();
+		$projectWbs = ProjectWbsSet::field('wbs_code')->where('id',$data['pid'])->findOrEmpty();
+		$data['project_type_name'] = $projectType->isEmpty() ? '' : $projectType->name;
+		$data['project_role_name'] = $projectRole->isEmpty() ? '' : $projectRole->name;
+		$data['sup_wbs_code']= $projectWbs->isEmpty() ? '' : $projectWbs->wbs_code;
+        return $data;
+    }
+}

app/adminapi/validate/project/ProjectWbsSetValidate.php

@@ -0,0 +1,157 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\validate\project;
+
+
+use app\common\model\project\ProjectRoleSet;
+use app\common\model\project\ProjectTypeSet;
+use app\common\model\project\ProjectWbsSet;
+use app\common\validate\BaseValidate;
+
+
+/**
+ * 项目WBS设置验证器
+ * Class ProjectWbsSetValidate
+ * @package app\adminapi\validate\project
+ */
+class ProjectWbsSetValidate extends BaseValidate
+{
+
+     /**
+      * 设置校验规则
+      * @var string[]
+      */
+    protected $rule = [
+        'id' => 'require|checkWbs',
+        'project_type_id' => 'require|checkProjectType',
+        'wbs_code' => 'require|unique:'.ProjectWbsSet::class,
+        'name' => 'require|unique:'.ProjectWbsSet::class,
+        'sort' => 'require|integer',
+        'weight' => 'require|integer',
+	    'sup_wbs_code' => 'checkSupCode|different:wbs_code',
+	    'project_role_id' => 'integer|checkProjectRole',
+    ];
+
+	protected $message = [
+		'id.require' => '缺少必要参数',
+		'project_type_id.require' => '请选择项目类型',
+		'wbs_code.require' => 'WBS编码不能为空',
+		'wbs_code.unique' => 'WBS编码不能重复',
+		'name.require' => '节点名称不能为空',
+		'name.unique' => '节点名称不能重复',
+		'sort.require' => '排序号不能为空',
+		'sort.integer' => '排序号必须是整数',
+		'weight.require' => '权重不能为空',
+		'weight.integer' => '权重必须是整数',
+		'sup_wbs_code' => '父级WBS编码不能与WBS编码相同',
+		'project_role_id.integer' => '项目角色数据格式错误',
+	];
+	
+    /**
+     * 参数描述
+     * @var string[]
+     */
+    protected $field = [
+        'id' => 'id',
+        'project_type_id' => '项目类型id',
+        'wbs_code' => 'WBS编码',
+        'name' => '节点名称',
+        'sort' => '排序号',
+        'weight' => '权重',
+    ];
+
+
+    /**
+     * @notes 添加场景
+     * @return ProjectWbsSetValidate
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public function sceneAdd()
+    {
+        return $this->remove('id',true);
+    }
+
+
+    /**
+     * @notes 编辑场景
+     * @return ProjectWbsSetValidate
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public function sceneEdit()
+    {}
+
+
+    /**
+     * @notes 删除场景
+     * @return ProjectWbsSetValidate
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public function sceneDelete()
+    {
+        return $this->only(['id']);
+    }
+
+
+    /**
+     * @notes 详情场景
+     * @return ProjectWbsSetValidate
+     * @author likeadmin
+     * @date 2023/12/13 15:09
+     */
+    public function sceneDetail()
+    {
+        return $this->only(['id']);
+    }
+	
+	public function checkProjectType($value): bool|string
+	{
+		$projectType = ProjectTypeSet::where('id',$value)->findOrEmpty();
+		if($projectType->isEmpty()) {
+			return '项目类型不存在';
+		}
+		return true;
+	}
+	
+	public function checkSupCode($value): bool|string
+	{
+		$projectWbs = ProjectWbsSet::where('wbs_code',$value)->findOrEmpty();
+		if($projectWbs->isEmpty()){
+			return '父级WBS编码错误';
+		}
+		return true;
+	}
+	
+	public function checkProjectRole($value): bool|string
+	{
+		$projectRole = ProjectRoleSet::where('id',$value)->findOrEmpty();
+		if($projectRole->isEmpty()) {
+			return '角色不存在';
+		}
+		return true;
+	}
+	
+	public function checkWbs($value,$rule, $data): bool|string
+	{
+		$data = ProjectWbsSet::where('id',$value)->findOrEmpty();
+		if($data->isEmpty()){
+			return '数据不存在';
+		}
+		return true;
+	}
+
+}

app/common.php

@@ -312,3 +312,18 @@ function group_by($array, $key): array
 	}
 	return $result;
 }
+
+function buildTree($items, $parentField, $parentId = 0): array
+{
+	$tree = [];
+	foreach ($items as $item) {
+		if ($item[$parentField] == $parentId) {
+			$children = buildTree($items, $parentField, $item['id']);
+			if ($children) {
+				$item['children'] = $children;
+			}
+			$tree[] = $item;
+		}
+	}
+	return $tree;
+}

app/common/model/project/ProjectWbsSet.php

@@ -0,0 +1,34 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\common\model\project;
+
+
+use app\common\model\BaseModel;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 项目WBS设置模型
+ * Class ProjectWbsSet
+ * @package app\common\model\project
+ */
+class ProjectWbsSet extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'project_wbs_set';
+    protected $deleteTime = 'delete_time';
+
+    
+}