Merge branch 'dev' of https://gitea.lihaink.cn/mkm/engineering into dev
This commit is contained in:
yaooo
commit
b6bddc5f26
108
app/adminapi/controller/safety/SafetyCheckController.php
Normal file
108
app/adminapi/controller/safety/SafetyCheckController.php
Normal file
@ -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\SafetyCheckLists;
|
||||
use app\adminapi\logic\safety\SafetyCheckLogic;
|
||||
use app\adminapi\validate\safety\SafetyCheckValidate;
|
||||
|
||||
|
||||
/**
|
||||
* 安全检查控制器
|
||||
* Class SafetyCheckController
|
||||
* @package app\adminapi\controller\safety
|
||||
*/
|
||||
class SafetyCheckController extends BaseAdminController
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @notes 获取安全检查列表
|
||||
* @return \think\response\Json
|
||||
* @author likeadmin
|
||||
* @date 2023/12/19 16:10
|
||||
*/
|
||||
public function lists()
|
||||
{
|
||||
return $this->dataLists(new SafetyCheckLists());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 添加安全检查
|
||||
* @return \think\response\Json
|
||||
* @author likeadmin
|
||||
* @date 2023/12/19 16:10
|
||||
*/
|
||||
public function add()
|
||||
{
|
||||
$params = (new SafetyCheckValidate())->post()->goCheck('add');
|
||||
$result = SafetyCheckLogic::add($params,$this->adminId);
|
||||
if (true === $result) {
|
||||
return $this->success('添加成功', [], 1, 1);
|
||||
}
|
||||
return $this->fail(SafetyCheckLogic::getError());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 编辑安全检查
|
||||
* @return \think\response\Json
|
||||
* @author likeadmin
|
||||
* @date 2023/12/19 16:10
|
||||
*/
|
||||
public function edit()
|
||||
{
|
||||
$params = (new SafetyCheckValidate())->post()->goCheck('edit');
|
||||
$result = SafetyCheckLogic::edit($params,$this->adminId);
|
||||
if (true === $result) {
|
||||
return $this->success('编辑成功', [], 1, 1);
|
||||
}
|
||||
return $this->fail(SafetyCheckLogic::getError());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 删除安全检查
|
||||
* @return \think\response\Json
|
||||
* @author likeadmin
|
||||
* @date 2023/12/19 16:10
|
||||
*/
|
||||
public function delete()
|
||||
{
|
||||
$params = (new SafetyCheckValidate())->post()->goCheck('delete');
|
||||
SafetyCheckLogic::delete($params);
|
||||
return $this->success('删除成功', [], 1, 1);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 获取安全检查详情
|
||||
* @return \think\response\Json
|
||||
* @author likeadmin
|
||||
* @date 2023/12/19 16:10
|
||||
*/
|
||||
public function detail()
|
||||
{
|
||||
$params = (new SafetyCheckValidate())->goCheck('detail');
|
||||
$result = SafetyCheckLogic::detail($params);
|
||||
return $this->data($result);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
89
app/adminapi/lists/safety/SafetyCheckLists.php
Normal file
89
app/adminapi/lists/safety/SafetyCheckLists.php
Normal file
@ -0,0 +1,89 @@
|
||||
<?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\SafetyCheck;
|
||||
use app\common\lists\ListsSearchInterface;
|
||||
|
||||
|
||||
/**
|
||||
* 安全检查列表
|
||||
* Class SafetyCheckLists
|
||||
* @package app\adminapi\listssafety
|
||||
*/
|
||||
class SafetyCheckLists extends BaseAdminDataLists implements ListsSearchInterface
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @notes 设置搜索条件
|
||||
* @return \string[][]
|
||||
* @author likeadmin
|
||||
* @date 2023/12/19 16:10
|
||||
*/
|
||||
public function setSearch(): array
|
||||
{
|
||||
return [
|
||||
'=' => ['check_date'],
|
||||
'%like%' => ['check_name', 'check_user', 'check_company', 'check_area'],
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 获取安全检查列表
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author likeadmin
|
||||
* @date 2023/12/19 16:10
|
||||
*/
|
||||
public function lists(): array
|
||||
{
|
||||
return SafetyCheck::where($this->searchWhere)
|
||||
->field(['id', 'org_id', 'dept_id', 'project_id', 'check_name', 'check_date', 'check_user', 'check_company', 'check_area', 'check_item', 'check_result', 'modify_company', 'resp_user', 'risk_level', 'safety_hazard', 'modify_term', 'remark', 'file', 'check_nature', 'quality_hazard', 'sub_table'])
|
||||
->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 16:10
|
||||
*/
|
||||
public function count(): int
|
||||
{
|
||||
return SafetyCheck::where($this->searchWhere)->count();
|
||||
}
|
||||
|
||||
}
|
||||
161
app/adminapi/logic/safety/SafetyCheckLogic.php
Normal file
161
app/adminapi/logic/safety/SafetyCheckLogic.php
Normal file
@ -0,0 +1,161 @@
|
||||
<?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\SafetyCheck;
|
||||
use app\common\logic\BaseLogic;
|
||||
use think\facade\Db;
|
||||
|
||||
|
||||
/**
|
||||
* 安全检查逻辑
|
||||
* Class SafetyCheckLogic
|
||||
* @package app\adminapi\logic\safety
|
||||
*/
|
||||
class SafetyCheckLogic extends BaseLogic
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @notes 添加安全检查
|
||||
* @param array $params
|
||||
* @return bool
|
||||
* @author likeadmin
|
||||
* @date 2023/12/19 16:10
|
||||
*/
|
||||
public static function add(array $params,$admin_id): bool
|
||||
{
|
||||
Db::startTrans();
|
||||
try {
|
||||
SafetyCheck::create([
|
||||
'org_id' => $params['org_id'],
|
||||
'dept_id' => $params['dept_id'],
|
||||
'project_id' => $params['project_id'],
|
||||
'check_name' => $params['check_name'],
|
||||
'check_date' => strtotime($params['check_date']),
|
||||
'check_user' => $params['check_user'],
|
||||
'check_company' => $params['check_company'],
|
||||
'check_area' => $params['check_area'],
|
||||
'check_item' => $params['check_item'],
|
||||
'check_result' => $params['check_result'],
|
||||
'modify_company' => $params['modify_company'],
|
||||
'resp_user' => $params['resp_user'],
|
||||
'risk_level' => $params['risk_level'],
|
||||
'safety_hazard' => $params['safety_hazard'],
|
||||
'modify_term' => $params['modify_term'],
|
||||
'remark' => $params['remark'],
|
||||
'file' => !empty($params['file']) ? $params['file'] : null,
|
||||
'check_nature' => $params['check_nature'],
|
||||
'quality_hazard' => $params['quality_hazard'],
|
||||
'sub_table' => $params['sub_table'],
|
||||
'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 16:10
|
||||
*/
|
||||
public static function edit(array $params,$admin_id): bool
|
||||
{
|
||||
Db::startTrans();
|
||||
try {
|
||||
SafetyCheck::where('id', $params['id'])->update([
|
||||
'org_id' => $params['org_id'],
|
||||
'dept_id' => $params['dept_id'],
|
||||
'project_id' => $params['project_id'],
|
||||
'check_name' => $params['check_name'],
|
||||
'check_date' => strtotime($params['check_date']),
|
||||
'check_user' => $params['check_user'],
|
||||
'check_company' => $params['check_company'],
|
||||
'check_area' => $params['check_area'],
|
||||
'check_item' => $params['check_item'],
|
||||
'check_result' => $params['check_result'],
|
||||
'modify_company' => $params['modify_company'],
|
||||
'resp_user' => $params['resp_user'],
|
||||
'risk_level' => $params['risk_level'],
|
||||
'safety_hazard' => $params['safety_hazard'],
|
||||
'modify_term' => $params['modify_term'],
|
||||
'remark' => $params['remark'],
|
||||
'file' => !empty($params['file']) ? $params['file'] : null,
|
||||
'check_nature' => $params['check_nature'],
|
||||
'quality_hazard' => $params['quality_hazard'],
|
||||
'sub_table' => $params['sub_table'],
|
||||
'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 16:10
|
||||
*/
|
||||
public static function delete(array $params): bool
|
||||
{
|
||||
return SafetyCheck::destroy($params['id']);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 获取安全检查详情
|
||||
* @param $params
|
||||
* @return array
|
||||
* @author likeadmin
|
||||
* @date 2023/12/19 16:10
|
||||
*/
|
||||
public static function detail($params): array
|
||||
{
|
||||
$data = SafetyCheck::field(['id', 'org_id', 'dept_id', 'project_id', 'check_name', 'check_date', 'check_user', 'check_company', 'check_area', 'check_item', 'check_result', 'modify_company', 'resp_user', 'risk_level', 'safety_hazard', 'modify_term', 'remark', 'file', 'check_nature', 'quality_hazard', 'sub_table', '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;
|
||||
}
|
||||
}
|
||||
139
app/adminapi/validate/safety/SafetyCheckValidate.php
Normal file
139
app/adminapi/validate/safety/SafetyCheckValidate.php
Normal file
@ -0,0 +1,139 @@
|
||||
<?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 SafetyCheckValidate
|
||||
* @package app\adminapi\validate\safety
|
||||
*/
|
||||
class SafetyCheckValidate extends BaseValidate
|
||||
{
|
||||
|
||||
/**
|
||||
* 设置校验规则
|
||||
* @var string[]
|
||||
*/
|
||||
protected $rule = [
|
||||
'id' => 'require',
|
||||
'org_id' => 'require|checkOrg',
|
||||
'dept_id' => 'require|checkDept',
|
||||
'project_id' => 'require|checkProject',
|
||||
'check_date' => 'date',
|
||||
'file' => 'checkFile'
|
||||
];
|
||||
|
||||
protected $message = [
|
||||
'id.require' => '缺少必要参数',
|
||||
'org_id.require' => '请选择组织',
|
||||
'dept_id.require' => '请选择部门',
|
||||
'project_id.require' => '请选择项目',
|
||||
'check_date.date' => '检查日期格式错误',
|
||||
];
|
||||
|
||||
/**
|
||||
* @notes 添加场景
|
||||
* @return SafetyCheckValidate
|
||||
* @author likeadmin
|
||||
* @date 2023/12/19 16:10
|
||||
*/
|
||||
public function sceneAdd()
|
||||
{
|
||||
return $this->remove('id',true);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 编辑场景
|
||||
* @return SafetyCheckValidate
|
||||
* @author likeadmin
|
||||
* @date 2023/12/19 16:10
|
||||
*/
|
||||
public function sceneEdit()
|
||||
{}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 删除场景
|
||||
* @return SafetyCheckValidate
|
||||
* @author likeadmin
|
||||
* @date 2023/12/19 16:10
|
||||
*/
|
||||
public function sceneDelete()
|
||||
{
|
||||
return $this->only(['id']);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 详情场景
|
||||
* @return SafetyCheckValidate
|
||||
* @author likeadmin
|
||||
* @date 2023/12/19 16:10
|
||||
*/
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
42
app/common/model/safety/SafetyCheck.php
Normal file
42
app/common/model/safety/SafetyCheck.php
Normal file
@ -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 SafetyCheck
|
||||
* @package app\common\model\safety
|
||||
*/
|
||||
class SafetyCheck extends BaseModel
|
||||
{
|
||||
use SoftDelete;
|
||||
protected $name = 'safety_check';
|
||||
protected $deleteTime = 'delete_time';
|
||||
|
||||
public function getFileAttr($value)
|
||||
{
|
||||
return json_decode($value,true);
|
||||
}
|
||||
|
||||
public function getCheckDateAttr($value): string
|
||||
{
|
||||
return date('Y-m-d',$value);
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user