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

app/adminapi/controller/safety/SafetyAccidentController.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\safety;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\safety\SafetyAccidentLists;
+use app\adminapi\logic\safety\SafetyAccidentLogic;
+use app\adminapi\validate\safety\SafetyAccidentValidate;
+
+
+/**
+ * 安全事故控制器
+ * Class SafetyAccidentController
+ * @package app\adminapi\controller\safety
+ */
+class SafetyAccidentController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取安全事故列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SafetyAccidentLists());
+    }
+
+
+    /**
+     * @notes 添加安全事故
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public function add()
+    {
+        $params = (new SafetyAccidentValidate())->post()->goCheck('add');
+        $result = SafetyAccidentLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SafetyAccidentLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑安全事故
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public function edit()
+    {
+        $params = (new SafetyAccidentValidate())->post()->goCheck('edit');
+        $result = SafetyAccidentLogic::edit($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SafetyAccidentLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除安全事故
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public function delete()
+    {
+        $params = (new SafetyAccidentValidate())->post()->goCheck('delete');
+        SafetyAccidentLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取安全事故详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public function detail()
+    {
+        $params = (new SafetyAccidentValidate())->goCheck('detail');
+        $result = SafetyAccidentLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/lists/safety/SafetyAccidentLists.php

@@ -0,0 +1,90 @@
+<?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\safety;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\dept\Dept;
+use app\common\model\dept\Orgs;
+use app\common\model\project\Project;
+use app\common\model\safety\SafetyAccident;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 安全事故列表
+ * Class SafetyAccidentLists
+ * @package app\adminapi\listssafety
+ */
+class SafetyAccidentLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public function setSearch(): array
+    {
+        return [
+            '%like%' => ['name', 'type', 'happen_time', 'device_accident'],
+
+        ];
+    }
+
+
+    /**
+     * @notes 获取安全事故列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public function lists(): array
+    {
+        return SafetyAccident::where($this->searchWhere)
+            ->field(['id', 'org_id', 'dept_id', 'project_id', 'name', 'type', 'happen_time', 'device_accident', 'contractor_user', 'our_company_user', 'not_our_company_user', 'content', 'remark', 'file'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($item){
+		        $project = Project::field('name,project_code')->where('id',$item['project_id'])->findOrEmpty();
+		        $org = Orgs::field('name')->where('id',$item['org_id'])->findOrEmpty();
+		        $dept = Dept::field('name')->where('id',$item['dept_id'])->findOrEmpty();
+		        $item['org_name'] = $org['name'];
+		        $item['dept_name'] = $dept['name'];
+		        $item['project_name'] = $project['name'];
+		        $item['project_code'] = $project['project_code'];
+				return $item;
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取安全事故数量
+     * @return int
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public function count(): int
+    {
+        return SafetyAccident::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/safety/SafetyEventLists.php

@@ -63,12 +63,13 @@ class SafetyEventLists extends BaseAdminDataLists implements ListsSearchInterfac
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($item){
-		        $project = Project::field('name')->where('id',$item['project_id'])->findOrEmpty();
+		        $project = Project::field('name,project_code')->where('id',$item['project_id'])->findOrEmpty();
 		        $org = Orgs::field('name')->where('id',$item['org_id'])->findOrEmpty();
 		        $dept = Dept::field('name')->where('id',$item['dept_id'])->findOrEmpty();
 		        $item['org_name'] = $org['name'];
 		        $item['dept_name'] = $dept['name'];
 		        $item['project_name'] = $project['name'];
+		        $item['project_code'] = $project['project_code'];
 				return $item;
 	        })
             ->toArray();

app/adminapi/logic/safety/SafetyAccidentLogic.php

@@ -0,0 +1,147 @@
+<?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\safety;
+
+
+use app\common\model\auth\Admin;
+use app\common\model\dept\Dept;
+use app\common\model\dept\Orgs;
+use app\common\model\project\Project;
+use app\common\model\safety\SafetyAccident;
+use app\common\logic\BaseLogic;
+use think\facade\Db;
+
+
+/**
+ * 安全事故逻辑
+ * Class SafetyAccidentLogic
+ * @package app\adminapi\logic\safety
+ */
+class SafetyAccidentLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加安全事故
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public static function add(array $params,$admin_id): bool
+    {
+        Db::startTrans();
+        try {
+            SafetyAccident::create([
+                'org_id' => $params['org_id'],
+                'dept_id' => $params['dept_id'],
+                'project_id' => $params['project_id'],
+                'name' => $params['name'],
+                'type' => $params['type'],
+                'happen_time' => strtotime($params['happen_time']),
+                'device_accident' => $params['device_accident'],
+                'contractor_user' => $params['contractor_user'],
+                'our_company_user' => $params['our_company_user'],
+                'not_our_company_user' => $params['not_our_company_user'],
+                'content' => $params['content'],
+                'remark' => $params['remark'],
+                'file' => !empty($params['file']) ? $params['file'] : null,
+                'add_user' => $admin_id,
+                'update_user' => $admin_id,
+            ]);
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 编辑安全事故
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public static function edit(array $params,$admin_id): bool
+    {
+        Db::startTrans();
+        try {
+            SafetyAccident::where('id', $params['id'])->update([
+                'org_id' => $params['org_id'],
+                'dept_id' => $params['dept_id'],
+                'project_id' => $params['project_id'],
+                'name' => $params['name'],
+                'type' => $params['type'],
+                'happen_time' => strtotime($params['happen_time']),
+                'device_accident' => $params['device_accident'],
+                'contractor_user' => $params['contractor_user'],
+                'our_company_user' => $params['our_company_user'],
+                'not_our_company_user' => $params['not_our_company_user'],
+                'content' => $params['content'],
+                'remark' => $params['remark'],
+                'file' => !empty($params['file']) ? $params['file'] : null,
+                'update_user' => $admin_id,
+	            'update_time' => time(),
+            ]);
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 删除安全事故
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public static function delete(array $params): bool
+    {
+        return SafetyAccident::destroy($params['id']);
+    }
+
+
+    /**
+     * @notes 获取安全事故详情
+     * @param $params
+     * @return array
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public static function detail($params): array
+    {
+		$data = SafetyAccident::field(['id','org_id','dept_id','project_id','name','type','happen_time','device_accident','contractor_user','our_company_user','not_our_company_user','content','remark','file','add_user','update_user','create_time','update_time'])->findOrEmpty($params['id'])->toArray();
+	    $project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty();
+	    $org = Orgs::field('name')->where('id',$data['org_id'])->findOrEmpty();
+	    $dept = Dept::field('name')->where('id',$data['dept_id'])->findOrEmpty();
+	    $admin = Admin::where('id','in',[$data['add_user'],$data['update_user']])->column('name','id');
+	    $data['org_name'] = $org['name'];
+	    $data['dept_name'] = $dept['name'];
+	    $data['project_name'] = $project['name'];
+	    $data['project_code'] = $project['project_code'];
+	    $data['add_user_name'] = $admin[$data['add_user']];
+	    $data['update_user_name'] = $admin[$data['update_user']];
+        return $data;
+    }
+}

app/adminapi/logic/safety/SafetyEventLogic.php

@@ -122,13 +122,14 @@ class SafetyEventLogic extends BaseLogic
     public static function detail($params): array
     {
 		$data = SafetyEvent::field('id,org_id,dept_id,project_id,name,happen_time,content,remark,file,add_user,update_user,create_time,update_time')->findOrEmpty($params['id'])->toArray();
-	    $project = Project::field('name')->where('id',$data['project_id'])->findOrEmpty();
+	    $project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty();
 	    $org = Orgs::field('name')->where('id',$data['org_id'])->findOrEmpty();
 	    $dept = Dept::field('name')->where('id',$data['dept_id'])->findOrEmpty();
 	    $admin = Admin::where('id','in',[$data['add_user'],$data['update_user']])->column('name','id');
 	    $data['org_name'] = $org['name'];
 	    $data['dept_name'] = $dept['name'];
 	    $data['project_name'] = $project['name'];
+	    $data['project_code'] = $project['project_code'];
 	    $data['add_user_name'] = $admin[$data['add_user']];
 	    $data['update_user_name'] = $admin[$data['update_user']];
         return $data;

app/adminapi/validate/safety/SafetyAccidentValidate.php

@@ -0,0 +1,156 @@
+<?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\safety;
+
+
+use app\common\model\dept\Dept;
+use app\common\model\dept\Orgs;
+use app\common\model\project\Project;
+use app\common\validate\BaseValidate;
+
+
+/**
+ * 安全事故验证器
+ * Class SafetyAccidentValidate
+ * @package app\adminapi\validate\safety
+ */
+class SafetyAccidentValidate extends BaseValidate
+{
+
+     /**
+      * 设置校验规则
+      * @var string[]
+      */
+	protected $rule = [
+		'id' => 'require',
+		'org_id' => 'require|checkOrg',
+		'dept_id' => 'require|checkDept',
+		'project_id' => 'require|checkProject',
+		'happen_time' => 'date',
+		'file' => 'checkFile'
+	];
+	
+	protected $message = [
+		'id.require' => '缺少必要参数',
+		'org_id.require' => '请选择组织',
+		'dept_id.require' => '请选择部门',
+		'project_id.require' => '请选择项目',
+		'happen_time.date' => '发生时间格式错误',
+	];
+
+
+    /**
+     * 参数描述
+     * @var string[]
+     */
+    protected $field = [
+        'id' => 'id',
+        'org_id' => '组织id',
+        'dept_id' => '部门id',
+        'project_id' => '项目id',
+        'add_user' => '添加人',
+        'update_user' => '更新人',
+    ];
+
+
+    /**
+     * @notes 添加场景
+     * @return SafetyAccidentValidate
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public function sceneAdd()
+    {
+        return $this->only(['org_id','dept_id','project_id','name','type','happen_time','device_accident','contractor_user','our_company_user','not_our_company_user','content','remark','file']);
+    }
+
+
+    /**
+     * @notes 编辑场景
+     * @return SafetyAccidentValidate
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public function sceneEdit()
+    {
+        return $this->only(['id','org_id','dept_id','project_id','name','type','happen_time','device_accident','contractor_user','our_company_user','not_our_company_user','content','remark','file']);
+    }
+
+
+    /**
+     * @notes 删除场景
+     * @return SafetyAccidentValidate
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public function sceneDelete()
+    {
+        return $this->only(['id']);
+    }
+
+
+    /**
+     * @notes 详情场景
+     * @return SafetyAccidentValidate
+     * @author likeadmin
+     * @date 2023/12/19 14:28
+     */
+    public function sceneDetail()
+    {
+        return $this->only(['id']);
+    }
+	
+	public function checkOrg($value): bool|string
+	{
+		$data = Orgs::where('id',$value)->findOrEmpty();
+		if($data->isEmpty()){
+			return '组织不存在';
+		}
+		return true;
+	}
+	
+	public function checkDept($value,$rule,$data): bool|string
+	{
+		$dept = Dept::where('id',$value)->findOrEmpty();
+		if($dept->isEmpty()){
+			return '部门不存在';
+		}
+		if($dept['org_id'] != $data['org_id']){
+			return '部门不属于当前选择的组织';
+		}
+		return true;
+	}
+	
+	public function checkProject($value): bool|string
+	{
+		$data = Project::where('id',$value)->findOrEmpty();
+		if($data->isEmpty()){
+			return '项目不存在';
+		}
+		return true;
+	}
+	
+	public function checkFile($value): bool|string
+	{
+		if($value != ''){
+			$file = json_decode($value,true);
+			if(empty($file)){
+				return '附件必须是json数组';
+			}
+		}
+		return true;
+	}
+
+}

app/common/model/safety/SafetyAccident.php

@@ -0,0 +1,42 @@
+<?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\safety;
+
+
+use app\common\model\BaseModel;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 安全事故模型
+ * Class SafetyAccident
+ * @package app\common\model\safety
+ */
+class SafetyAccident extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'safety_accident';
+    protected $deleteTime = 'delete_time';
+	
+	public function getFileAttr($value)
+	{
+		return json_decode($value,true);
+	}
+	
+	public function getHappenTimeAttr($value): string
+	{
+		return date('Y-m-d',$value);
+	}
+}