Merge pull request 'QualityModify' (#58) from zhangwei into dev

Reviewed-on: #58

app/adminapi/controller/quality/QualityModifyController.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\quality;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\quality\QualityModifyLists;
+use app\adminapi\logic\quality\QualityModifyLogic;
+use app\adminapi\validate\quality\QualityModifyValidate;
+
+
+/**
+ * 质量整改控制器
+ * Class QualityModifyController
+ * @package app\adminapi\controller\quality
+ */
+class QualityModifyController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取质量整改列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/20 17:28
+     */
+    public function lists()
+    {
+        return $this->dataLists(new QualityModifyLists());
+    }
+
+
+    /**
+     * @notes 添加质量整改
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/20 17:28
+     */
+    public function add()
+    {
+        $params = (new QualityModifyValidate())->post()->goCheck('add');
+        $result = QualityModifyLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(QualityModifyLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑质量整改
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/20 17:28
+     */
+    public function edit()
+    {
+        $params = (new QualityModifyValidate())->post()->goCheck('edit');
+        $result = QualityModifyLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(QualityModifyLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除质量整改
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/20 17:28
+     */
+    public function delete()
+    {
+        $params = (new QualityModifyValidate())->post()->goCheck('delete');
+        QualityModifyLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取质量整改详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/12/20 17:28
+     */
+    public function detail()
+    {
+        $params = (new QualityModifyValidate())->goCheck('detail');
+        $result = QualityModifyLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/lists/quality/QualityModifyLists.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\quality;
+
+
+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\quality\QualityModify;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 质量整改列表
+ * Class QualityModifyLists
+ * @package app\adminapi\listsquality
+ */
+class QualityModifyLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2023/12/20 17:28
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['check_nature', 'check_user', 'check_unit', 'modify_unit', 'resp_user', 'copy_user'],
+
+        ];
+    }
+
+
+    /**
+     * @notes 获取质量整改列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2023/12/20 17:28
+     */
+    public function lists(): array
+    {
+        return QualityModify::where($this->searchWhere)
+            ->field(['id', 'org_id', 'dept_id', 'project_id', 'check_nature', 'check_date', 'modify_term', 'check_user', 'check_unit', 'modify_unit', 'resp_user', 'copy_user', 'check_item', 'quality_hazards', 'check_result'])
+            ->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/20 17:28
+     */
+    public function count(): int
+    {
+        return QualityModify::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/logic/quality/QualityModifyLogic.php

@@ -0,0 +1,142 @@
+<?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\quality;
+
+
+use app\common\model\dept\Dept;
+use app\common\model\dept\Orgs;
+use app\common\model\project\Project;
+use app\common\model\quality\QualityModify;
+use app\common\logic\BaseLogic;
+use think\facade\Db;
+
+
+/**
+ * 质量整改逻辑
+ * Class QualityModifyLogic
+ * @package app\adminapi\logic\quality
+ */
+class QualityModifyLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加质量整改
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2023/12/20 17:28
+     */
+    public static function add(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            QualityModify::create([
+                'org_id' => $params['org_id'],
+                'dept_id' => $params['dept_id'],
+                'project_id' => $params['project_id'],
+                'check_nature' => $params['check_nature'],
+                'check_date' => strtotime($params['check_date']),
+                'modify_term' => $params['modify_term'],
+                'check_user' => $params['check_user'],
+                'check_unit' => $params['check_unit'],
+                'modify_unit' => $params['modify_unit'],
+                'resp_user' => $params['resp_user'],
+                'copy_user' => $params['copy_user'],
+                'check_item' => $params['check_item'],
+                'quality_hazards' => $params['quality_hazards'],
+                'check_result' => $params['check_result'],
+            ]);
+            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/20 17:28
+     */
+    public static function edit(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            QualityModify::where('id', $params['id'])->update([
+                'org_id' => $params['org_id'],
+                'dept_id' => $params['dept_id'],
+                'project_id' => $params['project_id'],
+                'check_nature' => $params['check_nature'],
+                'check_date' => strtotime($params['check_date']),
+                'modify_term' => $params['modify_term'],
+                'check_user' => $params['check_user'],
+                'check_unit' => $params['check_unit'],
+                'modify_unit' => $params['modify_unit'],
+                'resp_user' => $params['resp_user'],
+                'copy_user' => $params['copy_user'],
+                'check_item' => $params['check_item'],
+                'quality_hazards' => $params['quality_hazards'],
+                'check_result' => $params['check_result'],
+	            '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/20 17:28
+     */
+    public static function delete(array $params): bool
+    {
+        return QualityModify::destroy($params['id']);
+    }
+
+
+    /**
+     * @notes 获取质量整改详情
+     * @param $params
+     * @return array
+     * @author likeadmin
+     * @date 2023/12/20 17:28
+     */
+    public static function detail($params): array
+    {
+		$data = QualityModify::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();
+	    $data['org_name'] = $org['name'];
+	    $data['dept_name'] = $dept['name'];
+	    $data['project_name'] = $project['name'];
+	    $data['project_code'] = $project['project_code'];
+        return $data;
+    }
+}

app/adminapi/validate/quality/QualityModifyValidate.php

@@ -0,0 +1,127 @@
+<?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\quality;
+
+
+use app\common\model\dept\Dept;
+use app\common\model\dept\Orgs;
+use app\common\model\project\Project;
+use app\common\validate\BaseValidate;
+
+
+/**
+ * 质量整改验证器
+ * Class QualityModifyValidate
+ * @package app\adminapi\validate\quality
+ */
+class QualityModifyValidate extends BaseValidate
+{
+
+     /**
+      * 设置校验规则
+      * @var string[]
+      */
+	protected $rule = [
+		'id' => 'require',
+		'org_id' => 'require|checkOrg',
+		'dept_id' => 'require|checkDept',
+		'project_id' => 'require|checkProject',
+		'check_date' => 'dateFormat:Y-m-d',
+	];
+	
+	protected $message = [
+		'id.require' => '缺少必要参数',
+		'org_id.require' => '请选择组织',
+		'dept_id.require' => '请选择部门',
+		'project_id.require' => '请选择项目',
+		'check_date.dateFormat' => '检查日期格式错误',
+	];
+
+
+    /**
+     * @notes 添加场景
+     * @return QualityModifyValidate
+     * @author likeadmin
+     * @date 2023/12/20 17:28
+     */
+    public function sceneAdd()
+    {
+	    return $this->remove('id',true);
+    }
+
+
+    /**
+     * @notes 编辑场景
+     * @return QualityModifyValidate
+     * @author likeadmin
+     * @date 2023/12/20 17:28
+     */
+    public function sceneEdit()
+    {}
+
+
+    /**
+     * @notes 删除场景
+     * @return QualityModifyValidate
+     * @author likeadmin
+     * @date 2023/12/20 17:28
+     */
+    public function sceneDelete()
+    {
+        return $this->only(['id']);
+    }
+
+
+    /**
+     * @notes 详情场景
+     * @return QualityModifyValidate
+     * @author likeadmin
+     * @date 2023/12/20 17: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;
+	}
+}

app/common/model/quality/QualityModify.php

@@ -0,0 +1,37 @@
+<?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\quality;
+
+
+use app\common\model\BaseModel;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 质量整改模型
+ * Class QualityModify
+ * @package app\common\model\quality
+ */
+class QualityModify extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'quality_modify';
+    protected $deleteTime = 'delete_time';
+	
+	public function getCheckDateAttr($value): string
+	{
+		return !empty($value) ? date('Y-m-d',$value) : '';
+	}
+}