Merge pull request 'dev' (#205) from dev into master

Reviewed-on: #205

app/adminapi/controller/CostConsultationReportController.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace app\adminapi\controller;
+
+use app\common\model\cost_project\CostApprovedProject;
+use app\common\model\DataReception;
+use app\common\model\dept\Dept;
+use app\common\model\task\TaskAllocation;
+use app\common\model\TaskHandlingThreeLevelReview;
+use think\facade\Db;
+
+class CostConsultationReportController extends  BaseAdminController
+{
+    // 造价报表控制器
+
+    // 造价合同台账
+    public function cost_approved_project_list()
+    {
+        $page_no = $this->request->param('page_no', 1);
+        $page_size = $this->request->param('page_size', 15);
+        $params = $this->request->param();
+        $contract_name = $params['contract_name'] ?? '';
+        $contract_num = $params['contract_num'] ?? '';
+        $part_a = $params['part_a'] ?? '';
+        $query = Db::name('cost_approved_project')->where(function ($query) use ($contract_name, $contract_num, $part_a) {
+            if ($contract_name) {
+                $query->where('contract_name', 'like', '%'.$contract_name.'%');
+            }
+            if ($contract_num) {
+                $query->where('contract_num', '=', $contract_num);
+            }
+            if ($part_a) {
+                $query->where('part_a', 'like', '%'.$part_a.'%');
+            }
+        });
+        $count = $query->count();
+        $lists = $query->page($page_no, $page_size)->select()->each(function($item){
+            $item['start_date'] = date('Y-m-d', $item['start_date']);
+            $item['end_date'] = date('Y-m-d', $item['end_date']);
+            $item['due_time'] = date('Y-m-d', $item['due_time']);
+            $item['create_date'] = date('Y-m-d', $item['create_date']);
+            return $item;
+        });
+        return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size'));
+    }
+
+    // 造价项目信息汇总
+    public function cost_project_report()
+    {
+        $page_no = $this->request->param('page_no', 1);
+        $page_size = $this->request->param('page_size', 15);
+        $params = $this->request->param();
+        $project_name = $params['project_name'] ?? '';
+        $project_num = $params['project_num'] ?? '';
+        $contract_name = $params['contract_name'] ?? '';
+        $aunit = $params['aunit'] ?? '';
+
+        $query = Db::name('cost_project')->alias('p')->leftJoin('cost_approved_project c', 'p.contract_id=c.id')->where(function ($query) use ($project_name, $project_num, $contract_name, $aunit) {
+            if ($contract_name) {
+                $query->where('c.contract_name', 'like', '%'.$contract_name.'%');
+            }
+            if ($project_num) {
+                $query->where('p.project_num', '=', $project_num);
+            }
+            if ($project_name) {
+                $query->where('p.project_name', 'like', '%'.$project_name.'%');
+            }
+            if ($aunit) {
+                $query->where('p.aunit', 'like', '%'.$aunit.'%');
+            }
+        });
+        $count = $query->count();
+        $lists = $query->append(['dept'])->withAttr('dept', function ($value, $data){
+            return Dept::where('id', $data['depar'])->findOrEmpty()->toArray();
+        })->page($page_no, $page_size)->select()->each(function($item){
+            $item['start_date'] = date('Y-m-d', $item['start_date']);
+            $item['end_date'] = date('Y-m-d', $item['end_date']);
+            return $item;
+        });
+        return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size'));
+    }
+
+    // 项目全过程跟踪表
+    public function project_trace()
+    {
+        $page_no = $this->request->param('page_no', 1);
+        $page_size = $this->request->param('page_size', 15);
+        $params = $this->request->param();
+        $project_name = $params['project_name'] ?? '';
+        $project_num = $params['project_num'] ?? '';
+        $contract_name = $params['contract_name'] ?? '';
+
+        $query = Db::name('cost_project')->alias('p')->leftJoin('cost_approved_project c', 'p.contract_id=c.id')->where(function ($query) use ($project_name, $project_num, $contract_name) {
+            if ($contract_name) {
+                $query->where('c.contract_name', 'like', '%'.$contract_name.'%');
+            }
+            if ($project_num) {
+                $query->where('p.project_num', '=', $project_num);
+            }
+            if ($project_name) {
+                $query->where('p.project_name', 'like', '%'.$project_name.'%');
+            }
+        })->append(['task_allocation_status', 'task_handling_three_level_review_status', 'data_reception_status'])
+            ->withAttr('task_allocation_status', function ($data, $value){
+                $count = TaskAllocation::where('cost_project_id', $value['id'])->count();
+                return $count > 0 ? 1: 0;
+            })->withAttr('task_handling_three_level_review_status', function ($data, $value){
+                $count = TaskHandlingThreeLevelReview::where('project_id', $value['id'])->count();
+                return $count > 0 ? 1: 0;
+            })->withAttr('data_reception_status', function ($data, $value){
+                $count = DataReception::where('project_id', $value['id'])->count();
+                return $count > 0 ? 1: 0;
+            });
+        $count = $query->count();
+        $lists = $query->append(['dept'])->withAttr('dept', function ($value, $data){
+            return Dept::where('id', $data['depar'])->findOrEmpty()->toArray();
+        })->page($page_no, $page_size)->select();
+        return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size'));
+    }
+}

app/adminapi/controller/material/MaterialClassifyController.php

@@ -76,6 +76,22 @@ class MaterialClassifyController extends BaseAdminController
         }
         return $this->fail(MaterialClassifyLogic::getError());
     }
+	
+	/**
+	 * @notes 删除工料分类
+	 * @return \think\response\Json
+	 * @author likeadmin
+	 * @date 2024/03/04 14:00
+	 */
+	public function delete()
+	{
+		$params = (new MaterialClassifyValidate())->post()->goCheck('delete');
+		$result = MaterialClassifyLogic::delete($params);
+		if (true === $result) {
+			return $this->success('删除成功', [], 1, 1);
+		}
+		return $this->fail(MaterialClassifyLogic::getError());
+	}
 
 
     /**

app/adminapi/controller/supervision_dangerous/SupervisionDangerousEngineeringCaseController.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\supervision_dangerous;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_dangerous\SupervisionDangerousEngineeringCaseLists;
+use app\adminapi\logic\supervision_dangerous\SupervisionDangerousEngineeringCaseLogic;
+use app\adminapi\validate\supervision_dangerous\SupervisionDangerousEngineeringCaseValidate;
+
+
+/**
+ * 工程监理--危大方案提交列表控制器
+ * Class SupervisionDangerousEngineeringCaseController
+ * @package app\adminapi\controller\supervision_dangerous
+ */
+class SupervisionDangerousEngineeringCaseController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--危大方案提交列表列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 14:00
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionDangerousEngineeringCaseLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--危大方案提交列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 14:00
+     */
+    public function add()
+    {
+        $params = (new SupervisionDangerousEngineeringCaseValidate())->post()->goCheck('add');
+        $result = SupervisionDangerousEngineeringCaseLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionDangerousEngineeringCaseLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--危大方案提交列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 14:00
+     */
+    public function edit()
+    {
+        $params = (new SupervisionDangerousEngineeringCaseValidate())->post()->goCheck('edit');
+        $result = SupervisionDangerousEngineeringCaseLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionDangerousEngineeringCaseLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--危大方案提交列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 14:00
+     */
+    public function delete()
+    {
+        $params = (new SupervisionDangerousEngineeringCaseValidate())->post()->goCheck('delete');
+        SupervisionDangerousEngineeringCaseLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取工程监理--危大方案提交列表详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 14:00
+     */
+    public function detail()
+    {
+        $params = (new SupervisionDangerousEngineeringCaseValidate())->goCheck('detail');
+        $result = SupervisionDangerousEngineeringCaseLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_dangerous/SupervisionDangerousEngineeringMonitoringController.php

@@ -0,0 +1,111 @@
+<?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\supervision_dangerous;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_dangerous\SupervisionDangerousEngineeringMonitoringLists;
+use app\adminapi\logic\supervision_dangerous\SupervisionDangerousEngineeringMonitoringLogic;
+use app\adminapi\validate\supervision_dangerous\SupervisionDangerousEngineeringMonitoringValidate;
+
+
+/**
+ * 工程监理--危大工程监控控制器
+ * Class SupervisionDangerousEngineeringMonitoringController
+ * @package app\adminapi\controller\supervision_dangerous
+ */
+class SupervisionDangerousEngineeringMonitoringController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--危大工程监控列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 11:05
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionDangerousEngineeringMonitoringLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--危大工程监控
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 11:05
+     */
+    public function add()
+    {
+        $params = (new SupervisionDangerousEngineeringMonitoringValidate())->post()->goCheck('add');
+        $result = SupervisionDangerousEngineeringMonitoringLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionDangerousEngineeringMonitoringLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--危大工程监控
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 11:05
+     */
+    public function edit()
+    {
+        $params = (new SupervisionDangerousEngineeringMonitoringValidate())->post()->goCheck('edit');
+        $result = SupervisionDangerousEngineeringMonitoringLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionDangerousEngineeringMonitoringLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--危大工程监控
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 11:05
+     */
+    public function delete()
+    {
+        $params = (new SupervisionDangerousEngineeringMonitoringValidate())->post()->goCheck('delete');
+	    $result = SupervisionDangerousEngineeringMonitoringLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionDangerousEngineeringMonitoringLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取工程监理--危大工程监控详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 11:05
+     */
+    public function detail()
+    {
+        $params = (new SupervisionDangerousEngineeringMonitoringValidate())->goCheck('detail');
+        $result = SupervisionDangerousEngineeringMonitoringLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringController.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\supervision_dangerous;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_dangerous\SupervisionExcessRiskSecurityMonitoringLists;
+use app\adminapi\logic\supervision_dangerous\SupervisionExcessRiskSecurityMonitoringLogic;
+use app\adminapi\validate\supervision_dangerous\SupervisionExcessRiskSecurityMonitoringValidate;
+
+
+/**
+ * 工程监理--超规模危险性较大工程安全监控控制器
+ * Class SupervisionExcessRiskSecurityMonitoringController
+ * @package app\adminapi\controller\supervision_dangerous
+ */
+class SupervisionExcessRiskSecurityMonitoringController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--超规模危险性较大工程安全监控列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 10:11
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionExcessRiskSecurityMonitoringLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--超规模危险性较大工程安全监控
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 10:11
+     */
+    public function add()
+    {
+        $params = (new SupervisionExcessRiskSecurityMonitoringValidate())->post()->goCheck('add');
+        $result = SupervisionExcessRiskSecurityMonitoringLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionExcessRiskSecurityMonitoringLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--超规模危险性较大工程安全监控
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 10:11
+     */
+    public function edit()
+    {
+        $params = (new SupervisionExcessRiskSecurityMonitoringValidate())->post()->goCheck('edit');
+        $result = SupervisionExcessRiskSecurityMonitoringLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionExcessRiskSecurityMonitoringLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--超规模危险性较大工程安全监控
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 10:11
+     */
+    public function delete()
+    {
+        $params = (new SupervisionExcessRiskSecurityMonitoringValidate())->post()->goCheck('delete');
+        SupervisionExcessRiskSecurityMonitoringLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取工程监理--超规模危险性较大工程安全监控详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 10:11
+     */
+    public function detail()
+    {
+        $params = (new SupervisionExcessRiskSecurityMonitoringValidate())->goCheck('detail');
+        $result = SupervisionExcessRiskSecurityMonitoringLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_dangerous/SupervisionHighRiskSecurityMonitoringController.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\supervision_dangerous;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_dangerous\SupervisionHighRiskSecurityMonitoringLists;
+use app\adminapi\logic\supervision_dangerous\SupervisionHighRiskSecurityMonitoringLogic;
+use app\adminapi\validate\supervision_dangerous\SupervisionHighRiskSecurityMonitoringValidate;
+
+
+/**
+ * 工程监理--危险性较大的工程安全监控控制器
+ * Class SupervisionHighRiskSecurityMonitoringController
+ * @package app\adminapi\controller\supervision_dangerous
+ */
+class SupervisionHighRiskSecurityMonitoringController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--危险性较大的工程安全监控列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 09:22
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionHighRiskSecurityMonitoringLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--危险性较大的工程安全监控
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 09:22
+     */
+    public function add()
+    {
+        $params = (new SupervisionHighRiskSecurityMonitoringValidate())->post()->goCheck('add');
+        $result = SupervisionHighRiskSecurityMonitoringLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionHighRiskSecurityMonitoringLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--危险性较大的工程安全监控
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 09:22
+     */
+    public function edit()
+    {
+        $params = (new SupervisionHighRiskSecurityMonitoringValidate())->post()->goCheck('edit');
+        $result = SupervisionHighRiskSecurityMonitoringLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionHighRiskSecurityMonitoringLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--危险性较大的工程安全监控
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 09:22
+     */
+    public function delete()
+    {
+        $params = (new SupervisionHighRiskSecurityMonitoringValidate())->post()->goCheck('delete');
+        SupervisionHighRiskSecurityMonitoringLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取工程监理--危险性较大的工程安全监控详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/04 09:22
+     */
+    public function detail()
+    {
+        $params = (new SupervisionHighRiskSecurityMonitoringValidate())->goCheck('detail');
+        $result = SupervisionHighRiskSecurityMonitoringLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_dangerous/SupervisionLargeMechanicalEquipmentController.php

@@ -0,0 +1,111 @@
+<?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\supervision_dangerous;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_dangerous\SupervisionLargeMechanicalEquipmentLists;
+use app\adminapi\logic\supervision_dangerous\SupervisionLargeMechanicalEquipmentLogic;
+use app\adminapi\validate\supervision_dangerous\SupervisionLargeMechanicalEquipmentValidate;
+
+
+/**
+ * 大型机械设备及仪器台账控制器
+ * Class SupervisionLargeMechanicalEquipmentController
+ * @package app\adminapi\controller\supervision_dangerous
+ */
+class SupervisionLargeMechanicalEquipmentController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取大型机械设备及仪器台账列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionLargeMechanicalEquipmentLists());
+    }
+
+
+    /**
+     * @notes 添加大型机械设备及仪器台账
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function add()
+    {
+        $params = (new SupervisionLargeMechanicalEquipmentValidate())->post()->goCheck('add');
+        $result = SupervisionLargeMechanicalEquipmentLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionLargeMechanicalEquipmentLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑大型机械设备及仪器台账
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function edit()
+    {
+        $params = (new SupervisionLargeMechanicalEquipmentValidate())->post()->goCheck('edit');
+        $result = SupervisionLargeMechanicalEquipmentLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionLargeMechanicalEquipmentLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除大型机械设备及仪器台账
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function delete()
+    {
+        $params = (new SupervisionLargeMechanicalEquipmentValidate())->post()->goCheck('delete');
+	    $result = SupervisionLargeMechanicalEquipmentLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionLargeMechanicalEquipmentLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取大型机械设备及仪器台账详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function detail()
+    {
+        $params = (new SupervisionLargeMechanicalEquipmentValidate())->goCheck('detail');
+        $result = SupervisionLargeMechanicalEquipmentLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_dangerous/SupervisionLargeMechanicalEquipmentMaintenanceRecordController.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\supervision_dangerous;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_dangerous\SupervisionLargeMechanicalEquipmentMaintenanceRecordLists;
+use app\adminapi\logic\supervision_dangerous\SupervisionLargeMechanicalEquipmentMaintenanceRecordLogic;
+use app\adminapi\validate\supervision_dangerous\SupervisionLargeMechanicalEquipmentMaintenanceRecordValidate;
+
+
+/**
+ * 工程监理--大型机械设备及仪器修保养记录控制器
+ * Class SupervisionLargeMechanicalEquipmentMaintenanceRecordController
+ * @package app\adminapi\controller\supervision_dangerous
+ */
+class SupervisionLargeMechanicalEquipmentMaintenanceRecordController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--大型机械设备及仪器修保养记录列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionLargeMechanicalEquipmentMaintenanceRecordLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--大型机械设备及仪器修保养记录
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function add()
+    {
+        $params = (new SupervisionLargeMechanicalEquipmentMaintenanceRecordValidate())->post()->goCheck('add');
+        $result = SupervisionLargeMechanicalEquipmentMaintenanceRecordLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionLargeMechanicalEquipmentMaintenanceRecordLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--大型机械设备及仪器修保养记录
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function edit()
+    {
+        $params = (new SupervisionLargeMechanicalEquipmentMaintenanceRecordValidate())->post()->goCheck('edit');
+        $result = SupervisionLargeMechanicalEquipmentMaintenanceRecordLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionLargeMechanicalEquipmentMaintenanceRecordLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--大型机械设备及仪器修保养记录
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function delete()
+    {
+        $params = (new SupervisionLargeMechanicalEquipmentMaintenanceRecordValidate())->post()->goCheck('delete');
+        SupervisionLargeMechanicalEquipmentMaintenanceRecordLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取工程监理--大型机械设备及仪器修保养记录详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function detail()
+    {
+        $params = (new SupervisionLargeMechanicalEquipmentMaintenanceRecordValidate())->goCheck('detail');
+        $result = SupervisionLargeMechanicalEquipmentMaintenanceRecordLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_dangerous/SupervisionSafetyWarningSignController.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\supervision_dangerous;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_dangerous\SupervisionSafetyWarningSignLists;
+use app\adminapi\logic\supervision_dangerous\SupervisionSafetyWarningSignLogic;
+use app\adminapi\validate\supervision_dangerous\SupervisionSafetyWarningSignValidate;
+
+
+/**
+ * 工程监理--现场安全警示标志控制器
+ * Class SupervisionSafetyWarningSignController
+ * @package app\adminapi\controller\supervision_dangerous
+ */
+class SupervisionSafetyWarningSignController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--现场安全警示标志列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 15:41
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionSafetyWarningSignLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--现场安全警示标志
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 15:41
+     */
+    public function add()
+    {
+        $params = (new SupervisionSafetyWarningSignValidate())->post()->goCheck('add');
+        $result = SupervisionSafetyWarningSignLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionSafetyWarningSignLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--现场安全警示标志
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 15:41
+     */
+    public function edit()
+    {
+        $params = (new SupervisionSafetyWarningSignValidate())->post()->goCheck('edit');
+        $result = SupervisionSafetyWarningSignLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionSafetyWarningSignLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--现场安全警示标志
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 15:41
+     */
+    public function delete()
+    {
+        $params = (new SupervisionSafetyWarningSignValidate())->post()->goCheck('delete');
+        SupervisionSafetyWarningSignLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取工程监理--现场安全警示标志详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 15:41
+     */
+    public function detail()
+    {
+        $params = (new SupervisionSafetyWarningSignValidate())->goCheck('detail');
+        $result = SupervisionSafetyWarningSignLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionAcceptController.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\controller\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionAcceptLists;
+use app\adminapi\logic\supervision_work\SupervisionAcceptLogic;
+use app\adminapi\validate\supervision_work\SupervisionAcceptValidate;
+
+
+/**
+ * 工程监理--验收登记控制器
+ * Class SupervisionAcceptController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionAcceptController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--验收登记列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionAcceptLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--验收登记
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function add()
+    {
+        $params = (new SupervisionAcceptValidate())->post()->goCheck('add');
+        $result = SupervisionAcceptLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionAcceptLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--验收登记
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function edit()
+    {
+        $params = (new SupervisionAcceptValidate())->post()->goCheck('edit');
+        $result = SupervisionAcceptLogic::edit($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionAcceptLogic::getError());
+    }
+	
+	/**
+	 * @notes 编辑工程监理--验收登记
+	 * @return \think\response\Json
+	 * @author likeadmin
+	 * @date 2024/02/27 15:23
+	 */
+	public function accept()
+	{
+		$params = (new SupervisionAcceptValidate())->post()->goCheck('accept');
+		$result = SupervisionAcceptLogic::accept($params);
+		if (true === $result) {
+			return $this->success('操作成功', [], 1, 1);
+		}
+		return $this->fail(SupervisionAcceptLogic::getError());
+	}
+
+
+    /**
+     * @notes 删除工程监理--验收登记
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function delete()
+    {
+        $params = (new SupervisionAcceptValidate())->post()->goCheck('delete');
+	    $result = SupervisionAcceptLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionAcceptLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取工程监理--验收登记详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function detail()
+    {
+        $params = (new SupervisionAcceptValidate())->goCheck('detail');
+        $result = SupervisionAcceptLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionAcceptResultController.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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionAcceptResultLists;
+use app\adminapi\logic\supervision_work\SupervisionAcceptResultLogic;
+use app\adminapi\validate\supervision_work\SupervisionAcceptResultValidate;
+
+
+/**
+ * 工程监理--验收结果控制器
+ * Class SupervisionAcceptResultController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionAcceptResultController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--验收结果列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionAcceptResultLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--验收结果
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function add()
+    {
+        $params = (new SupervisionAcceptResultValidate())->post()->goCheck('add');
+        $result = SupervisionAcceptResultLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionAcceptResultLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--验收结果
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function edit()
+    {
+        $params = (new SupervisionAcceptResultValidate())->post()->goCheck('edit');
+        $result = SupervisionAcceptResultLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionAcceptResultLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--验收结果
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function delete()
+    {
+        $params = (new SupervisionAcceptResultValidate())->post()->goCheck('delete');
+        SupervisionAcceptResultLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取工程监理--验收结果详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function detail()
+    {
+        $params = (new SupervisionAcceptResultValidate())->goCheck('detail');
+        $result = SupervisionAcceptResultLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionCheckItemController.php

@@ -86,8 +86,11 @@ class SupervisionCheckItemController extends BaseAdminController
     public function delete()
     {
         $params = (new SupervisionCheckItemValidate())->post()->goCheck('delete');
-        SupervisionCheckItemLogic::delete($params);
+	    $result = SupervisionCheckItemLogic::delete($params);
-        return $this->success('删除成功', [], 1, 1);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionCheckItemLogic::getError());
     }
 
 

app/adminapi/controller/supervision_work/SupervisionDeviceEntryController.php

@@ -0,0 +1,111 @@
+<?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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionDeviceEntryLists;
+use app\adminapi\logic\supervision_work\SupervisionDeviceEntryLogic;
+use app\adminapi\validate\supervision_work\SupervisionDeviceEntryValidate;
+
+
+/**
+ * 工程监理--设备进场控制器
+ * Class SupervisionDeviceEntryController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionDeviceEntryController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--设备进场列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionDeviceEntryLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--设备进场
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function add()
+    {
+        $params = (new SupervisionDeviceEntryValidate())->post()->goCheck('add');
+        $result = SupervisionDeviceEntryLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionDeviceEntryLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--设备进场
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function edit()
+    {
+        $params = (new SupervisionDeviceEntryValidate())->post()->goCheck('edit');
+        $result = SupervisionDeviceEntryLogic::edit($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionDeviceEntryLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--设备进场
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function delete()
+    {
+        $params = (new SupervisionDeviceEntryValidate())->post()->goCheck('delete');
+	    $result = SupervisionDeviceEntryLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionDeviceEntryLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取工程监理--设备进场详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function detail()
+    {
+        $params = (new SupervisionDeviceEntryValidate())->goCheck('detail');
+        $result = SupervisionDeviceEntryLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionDeviceEntryDetailController.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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionDeviceEntryDetailLists;
+use app\adminapi\logic\supervision_work\SupervisionDeviceEntryDetailLogic;
+use app\adminapi\validate\supervision_work\SupervisionDeviceEntryDetailValidate;
+
+
+/**
+ * 工程监理--设备进场明细控制器
+ * Class SupervisionDeviceEntryDetailController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionDeviceEntryDetailController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--设备进场明细列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionDeviceEntryDetailLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--设备进场明细
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function add()
+    {
+        $params = (new SupervisionDeviceEntryDetailValidate())->post()->goCheck('add');
+        $result = SupervisionDeviceEntryDetailLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionDeviceEntryDetailLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--设备进场明细
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function edit()
+    {
+        $params = (new SupervisionDeviceEntryDetailValidate())->post()->goCheck('edit');
+        $result = SupervisionDeviceEntryDetailLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionDeviceEntryDetailLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--设备进场明细
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function delete()
+    {
+        $params = (new SupervisionDeviceEntryDetailValidate())->post()->goCheck('delete');
+        SupervisionDeviceEntryDetailLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取工程监理--设备进场明细详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function detail()
+    {
+        $params = (new SupervisionDeviceEntryDetailValidate())->goCheck('detail');
+        $result = SupervisionDeviceEntryDetailLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionDiaryController.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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionDiaryLists;
+use app\adminapi\logic\supervision_work\SupervisionDiaryLogic;
+use app\adminapi\validate\supervision_work\SupervisionDiaryValidate;
+
+
+/**
+ * 工程监理--监理日记控制器
+ * Class SupervisionDiaryController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionDiaryController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--监理日记列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 13:53
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionDiaryLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--监理日记
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 13:53
+     */
+    public function add()
+    {
+        $params = (new SupervisionDiaryValidate())->post()->goCheck('add');
+        $result = SupervisionDiaryLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionDiaryLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--监理日记
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 13:53
+     */
+    public function edit()
+    {
+        $params = (new SupervisionDiaryValidate())->post()->goCheck('edit');
+        $result = SupervisionDiaryLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionDiaryLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--监理日记
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 13:53
+     */
+    public function delete()
+    {
+        $params = (new SupervisionDiaryValidate())->post()->goCheck('delete');
+        SupervisionDiaryLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理日记详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 13:53
+     */
+    public function detail()
+    {
+        $params = (new SupervisionDiaryValidate())->goCheck('detail');
+        $result = SupervisionDiaryLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionEntityParallelTestingController.php

@@ -0,0 +1,111 @@
+<?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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionEntityParallelTestingLists;
+use app\adminapi\logic\supervision_work\SupervisionEntityParallelTestingLogic;
+use app\adminapi\validate\supervision_work\SupervisionEntityParallelTestingValidate;
+
+
+/**
+ * 工程监理--实体平行检验控制器
+ * Class SupervisionEntityParallelTestingController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionEntityParallelTestingController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--实体平行检验列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 16:32
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionEntityParallelTestingLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--实体平行检验
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 16:32
+     */
+    public function add()
+    {
+        $params = (new SupervisionEntityParallelTestingValidate())->post()->goCheck('add');
+        $result = SupervisionEntityParallelTestingLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionEntityParallelTestingLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--实体平行检验
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 16:32
+     */
+    public function edit()
+    {
+        $params = (new SupervisionEntityParallelTestingValidate())->post()->goCheck('edit');
+        $result = SupervisionEntityParallelTestingLogic::edit($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionEntityParallelTestingLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--实体平行检验
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 16:32
+     */
+    public function delete()
+    {
+        $params = (new SupervisionEntityParallelTestingValidate())->post()->goCheck('delete');
+	    $result = SupervisionEntityParallelTestingLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionEntityParallelTestingLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取工程监理--实体平行检验详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 16:32
+     */
+    public function detail()
+    {
+        $params = (new SupervisionEntityParallelTestingValidate())->goCheck('detail');
+        $result = SupervisionEntityParallelTestingLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionInspectionController.php

@@ -69,7 +69,7 @@ class SupervisionInspectionController extends BaseAdminController
     public function edit()
     {
         $params = (new SupervisionInspectionValidate())->post()->goCheck('edit');
-        $result = SupervisionInspectionLogic::edit($params);
+        $result = SupervisionInspectionLogic::edit($params,$this->adminId);
         if (true === $result) {
             return $this->success('编辑成功', [], 1, 1);
         }
@@ -86,8 +86,11 @@ class SupervisionInspectionController extends BaseAdminController
     public function delete()
     {
         $params = (new SupervisionInspectionValidate())->post()->goCheck('delete');
-        SupervisionInspectionLogic::delete($params);
+	    $result = SupervisionInspectionLogic::delete($params);
-        return $this->success('删除成功', [], 1, 1);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionInspectionLogic::getError());
     }
 
 

app/adminapi/controller/supervision_work/SupervisionInspectionProblemController.php

@@ -1,108 +0,0 @@
-<?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\supervision_work;
-
-
-use app\adminapi\controller\BaseAdminController;
-use app\adminapi\lists\supervision_work\SupervisionInspectionProblemLists;
-use app\adminapi\logic\supervision_work\SupervisionInspectionProblemLogic;
-use app\adminapi\validate\supervision_work\SupervisionInspectionProblemValidate;
-
-
-/**
- * 工程监理--巡视问题控制器
- * Class SupervisionInspectionProblemController
- * @package app\adminapi\controller\supervision_work
- */
-class SupervisionInspectionProblemController extends BaseAdminController
-{
-
-
-    /**
-     * @notes 获取工程监理--巡视问题列表
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/02/26 17:18
-     */
-    public function lists()
-    {
-        return $this->dataLists(new SupervisionInspectionProblemLists());
-    }
-
-
-    /**
-     * @notes 添加工程监理--巡视问题
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/02/26 17:18
-     */
-    public function add()
-    {
-        $params = (new SupervisionInspectionProblemValidate())->post()->goCheck('add');
-        $result = SupervisionInspectionProblemLogic::add($params);
-        if (true === $result) {
-            return $this->success('添加成功', [], 1, 1);
-        }
-        return $this->fail(SupervisionInspectionProblemLogic::getError());
-    }
-
-
-    /**
-     * @notes 编辑工程监理--巡视问题
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/02/26 17:18
-     */
-    public function edit()
-    {
-        $params = (new SupervisionInspectionProblemValidate())->post()->goCheck('edit');
-        $result = SupervisionInspectionProblemLogic::edit($params);
-        if (true === $result) {
-            return $this->success('编辑成功', [], 1, 1);
-        }
-        return $this->fail(SupervisionInspectionProblemLogic::getError());
-    }
-
-
-    /**
-     * @notes 删除工程监理--巡视问题
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/02/26 17:18
-     */
-    public function delete()
-    {
-        $params = (new SupervisionInspectionProblemValidate())->post()->goCheck('delete');
-        SupervisionInspectionProblemLogic::delete($params);
-        return $this->success('删除成功', [], 1, 1);
-    }
-
-
-    /**
-     * @notes 获取工程监理--巡视问题详情
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/02/26 17:18
-     */
-    public function detail()
-    {
-        $params = (new SupervisionInspectionProblemValidate())->goCheck('detail');
-        $result = SupervisionInspectionProblemLogic::detail($params);
-        return $this->data($result);
-    }
-
-
-}

app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php

@@ -0,0 +1,111 @@
+<?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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionMaterialEntryLists;
+use app\adminapi\logic\supervision_work\SupervisionMaterialEntryLogic;
+use app\adminapi\validate\supervision_work\SupervisionMaterialEntryValidate;
+
+
+/**
+ * 材料进场控制器
+ * Class SupervisionMaterialEntryController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionMaterialEntryController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取材料进场列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionMaterialEntryLists());
+    }
+
+
+    /**
+     * @notes 添加材料进场
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function add()
+    {
+        $params = (new SupervisionMaterialEntryValidate())->post()->goCheck('add');
+        $result = SupervisionMaterialEntryLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionMaterialEntryLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑材料进场
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function edit()
+    {
+        $params = (new SupervisionMaterialEntryValidate())->post()->goCheck('edit');
+        $result = SupervisionMaterialEntryLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionMaterialEntryLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除材料进场
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function delete()
+    {
+        $params = (new SupervisionMaterialEntryValidate())->post()->goCheck('delete');
+	    $result = SupervisionMaterialEntryLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionMaterialEntryLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取材料进场详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function detail()
+    {
+        $params = (new SupervisionMaterialEntryValidate())->goCheck('detail');
+        $result = SupervisionMaterialEntryLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionMaterialEntryDetailController.php

@@ -0,0 +1,111 @@
+<?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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionMaterialEntryDetailLists;
+use app\adminapi\logic\supervision_work\SupervisionMaterialEntryDetailLogic;
+use app\adminapi\validate\supervision_work\SupervisionMaterialEntryDetailValidate;
+
+
+/**
+ * 工程监理--材料进场明细控制器
+ * Class SupervisionMaterialEntryDetailController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionMaterialEntryDetailController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--材料进场明细列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionMaterialEntryDetailLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--材料进场明细
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function add()
+    {
+        $params = (new SupervisionMaterialEntryDetailValidate())->post()->goCheck('add');
+        $result = SupervisionMaterialEntryDetailLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionMaterialEntryDetailLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--材料进场明细
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function edit()
+    {
+        $params = (new SupervisionMaterialEntryDetailValidate())->post()->goCheck('edit');
+        $result = SupervisionMaterialEntryDetailLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionMaterialEntryDetailLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--材料进场明细
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function delete()
+    {
+        $params = (new SupervisionMaterialEntryDetailValidate())->post()->goCheck('delete');
+	    $result = SupervisionMaterialEntryDetailLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionMaterialEntryDetailLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取工程监理--材料进场明细详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function detail()
+    {
+        $params = (new SupervisionMaterialEntryDetailValidate())->goCheck('detail');
+        $result = SupervisionMaterialEntryDetailLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionMaterialEquipmentInfoController.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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionMaterialEquipmentInfoLists;
+use app\adminapi\logic\supervision_work\SupervisionMaterialEquipmentInfoLogic;
+use app\adminapi\validate\supervision_work\SupervisionMaterialEquipmentInfoValidate;
+
+
+/**
+ * 工程监理--材料设备信息控制器
+ * Class SupervisionMaterialEquipmentInfoController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionMaterialEquipmentInfoController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--材料设备信息列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 16:28
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionMaterialEquipmentInfoLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--材料设备信息
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 16:28
+     */
+    public function add()
+    {
+        $params = (new SupervisionMaterialEquipmentInfoValidate())->post()->goCheck('add');
+        $result = SupervisionMaterialEquipmentInfoLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionMaterialEquipmentInfoLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--材料设备信息
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 16:28
+     */
+    public function edit()
+    {
+        $params = (new SupervisionMaterialEquipmentInfoValidate())->post()->goCheck('edit');
+        $result = SupervisionMaterialEquipmentInfoLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionMaterialEquipmentInfoLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--材料设备信息
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 16:28
+     */
+    public function delete()
+    {
+        $params = (new SupervisionMaterialEquipmentInfoValidate())->post()->goCheck('delete');
+        SupervisionMaterialEquipmentInfoLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取工程监理--材料设备信息详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 16:28
+     */
+    public function detail()
+    {
+        $params = (new SupervisionMaterialEquipmentInfoValidate())->goCheck('detail');
+        $result = SupervisionMaterialEquipmentInfoLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingController.php

@@ -0,0 +1,111 @@
+<?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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionMaterialParallelTestingLists;
+use app\adminapi\logic\supervision_work\SupervisionMaterialParallelTestingLogic;
+use app\adminapi\validate\supervision_work\SupervisionMaterialParallelTestingValidate;
+
+
+/**
+ * 工程监理--材料平行检验控制器
+ * Class SupervisionMaterialParallelTestingController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionMaterialParallelTestingController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--材料平行检验列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionMaterialParallelTestingLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--材料平行检验
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function add()
+    {
+        $params = (new SupervisionMaterialParallelTestingValidate())->post()->goCheck('add');
+        $result = SupervisionMaterialParallelTestingLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionMaterialParallelTestingLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--材料平行检验
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function edit()
+    {
+        $params = (new SupervisionMaterialParallelTestingValidate())->post()->goCheck('edit');
+        $result = SupervisionMaterialParallelTestingLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionMaterialParallelTestingLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--材料平行检验
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function delete()
+    {
+        $params = (new SupervisionMaterialParallelTestingValidate())->post()->goCheck('delete');
+	    $result = SupervisionMaterialParallelTestingLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionMaterialParallelTestingLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取工程监理--材料平行检验详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function detail()
+    {
+        $params = (new SupervisionMaterialParallelTestingValidate())->goCheck('detail');
+        $result = SupervisionMaterialParallelTestingLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingDetailController.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\controller\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionMaterialParallelTestingDetailLists;
+use app\adminapi\logic\supervision_work\SupervisionMaterialParallelTestingDetailLogic;
+use app\adminapi\validate\supervision_work\SupervisionMaterialParallelTestingDetailValidate;
+
+
+/**
+ * 工程监理--材料平行检验明细控制器
+ * Class SupervisionMaterialParallelTestingDetailController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionMaterialParallelTestingDetailController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--材料平行检验明细列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionMaterialParallelTestingDetailLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--材料平行检验明细
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function add()
+    {
+        $params = (new SupervisionMaterialParallelTestingDetailValidate())->post()->goCheck('add');
+        $result = SupervisionMaterialParallelTestingDetailLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionMaterialParallelTestingDetailLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--材料平行检验明细
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function edit()
+    {
+        $params = (new SupervisionMaterialParallelTestingDetailValidate())->post()->goCheck('edit');
+        $result = SupervisionMaterialParallelTestingDetailLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionMaterialParallelTestingDetailLogic::getError());
+    }
+	
+	/**
+	 * @notes 检验工程监理--见证取样明细
+	 * @return \think\response\Json
+	 * @author likeadmin
+	 * @date 2024/02/29 09:22
+	 */
+	public function check()
+	{
+		$params = (new SupervisionMaterialParallelTestingDetailValidate())->post()->goCheck('check');
+		$result = SupervisionMaterialParallelTestingDetailLogic::check($params,$this->adminId);
+		if (true === $result) {
+			return $this->success('检验成功', [], 1, 1);
+		}
+		return $this->fail(SupervisionMaterialParallelTestingDetailLogic::getError());
+	}
+
+
+    /**
+     * @notes 删除工程监理--材料平行检验明细
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function delete()
+    {
+        $params = (new SupervisionMaterialParallelTestingDetailValidate())->post()->goCheck('delete');
+	    $result = SupervisionMaterialParallelTestingDetailLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionMaterialParallelTestingDetailLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取工程监理--材料平行检验明细详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function detail()
+    {
+        $params = (new SupervisionMaterialParallelTestingDetailValidate())->goCheck('detail');
+        $result = SupervisionMaterialParallelTestingDetailLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionMeetingMinutesController.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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionMeetingMinutesLists;
+use app\adminapi\logic\supervision_work\SupervisionMeetingMinutesLogic;
+use app\adminapi\validate\supervision_work\SupervisionMeetingMinutesValidate;
+
+
+/**
+ * 工程监理--会议纪要控制器
+ * Class SupervisionMeetingMinutesController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionMeetingMinutesController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--会议纪要列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 14:31
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionMeetingMinutesLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--会议纪要
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 14:31
+     */
+    public function add()
+    {
+        $params = (new SupervisionMeetingMinutesValidate())->post()->goCheck('add');
+        $result = SupervisionMeetingMinutesLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionMeetingMinutesLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--会议纪要
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 14:31
+     */
+    public function edit()
+    {
+        $params = (new SupervisionMeetingMinutesValidate())->post()->goCheck('edit');
+        $result = SupervisionMeetingMinutesLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionMeetingMinutesLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--会议纪要
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 14:31
+     */
+    public function delete()
+    {
+        $params = (new SupervisionMeetingMinutesValidate())->post()->goCheck('delete');
+        SupervisionMeetingMinutesLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取工程监理--会议纪要详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 14:31
+     */
+    public function detail()
+    {
+        $params = (new SupervisionMeetingMinutesValidate())->goCheck('detail');
+        $result = SupervisionMeetingMinutesLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionNoticeController.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\controller\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionNoticeLists;
+use app\adminapi\logic\supervision_work\SupervisionNoticeLogic;
+use app\adminapi\validate\supervision_work\SupervisionNoticeValidate;
+
+
+/**
+ * 工程监理--监理通知单控制器
+ * Class SupervisionNoticeController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionNoticeController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--监理通知单列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionNoticeLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--监理通知单
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function add()
+    {
+        $params = (new SupervisionNoticeValidate())->post()->goCheck('add');
+        $result = SupervisionNoticeLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionNoticeLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--监理通知单
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function edit()
+    {
+        $params = (new SupervisionNoticeValidate())->post()->goCheck('edit');
+        $result = SupervisionNoticeLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionNoticeLogic::getError());
+    }
+	
+	/**
+	 * @notes 回复工程监理--监理通知单
+	 * @return \think\response\Json
+	 * @author likeadmin
+	 * @date 2024/03/01 09:20
+	 */
+	public function reply()
+	{
+		$params = (new SupervisionNoticeValidate())->post()->goCheck('reply');
+		$result = SupervisionNoticeLogic::reply($params);
+		if (true === $result) {
+			return $this->success('回复成功', [], 1, 1);
+		}
+		return $this->fail(SupervisionNoticeLogic::getError());
+	}
+
+
+    /**
+     * @notes 删除工程监理--监理通知单
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function delete()
+    {
+        $params = (new SupervisionNoticeValidate())->post()->goCheck('delete');
+	    $result = SupervisionNoticeLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionNoticeLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理通知单详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function detail()
+    {
+        $params = (new SupervisionNoticeValidate())->goCheck('detail');
+        $result = SupervisionNoticeLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionNoticeProblemController.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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionNoticeProblemLists;
+use app\adminapi\logic\supervision_work\SupervisionNoticeProblemLogic;
+use app\adminapi\validate\supervision_work\SupervisionNoticeProblemValidate;
+
+
+/**
+ * 工程监理--监理通知问题控制器
+ * Class SupervisionNoticeProblemController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionNoticeProblemController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--监理通知问题列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionNoticeProblemLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--监理通知问题
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function add()
+    {
+        $params = (new SupervisionNoticeProblemValidate())->post()->goCheck('add');
+        $result = SupervisionNoticeProblemLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionNoticeProblemLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--监理通知问题
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function edit()
+    {
+        $params = (new SupervisionNoticeProblemValidate())->post()->goCheck('edit');
+        $result = SupervisionNoticeProblemLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionNoticeProblemLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--监理通知问题
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function delete()
+    {
+        $params = (new SupervisionNoticeProblemValidate())->post()->goCheck('delete');
+        SupervisionNoticeProblemLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理通知问题详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function detail()
+    {
+        $params = (new SupervisionNoticeProblemValidate())->goCheck('detail');
+        $result = SupervisionNoticeProblemLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionProblemController.php

@@ -0,0 +1,124 @@
+<?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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionProblemLists;
+use app\adminapi\logic\supervision_work\SupervisionProblemLogic;
+use app\adminapi\validate\supervision_work\SupervisionProblemValidate;
+
+
+/**
+ * 问题跟踪台账控制器
+ * Class SupervisionProblemController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionProblemController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取问题跟踪台账列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 09:19
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionProblemLists());
+    }
+
+
+    /**
+     * @notes 添加问题跟踪台账
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 09:19
+     */
+    public function add()
+    {
+        $params = (new SupervisionProblemValidate())->post()->goCheck('add');
+        $result = SupervisionProblemLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionProblemLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑问题跟踪台账
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 09:19
+     */
+    public function edit()
+    {
+        $params = (new SupervisionProblemValidate())->post()->goCheck('edit');
+        $result = SupervisionProblemLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionProblemLogic::getError());
+    }
+	
+	/**
+	 * @notes 检查验收问题跟踪台账
+	 * @return \think\response\Json
+	 * @author likeadmin
+	 * @date 2024/02/28 09:19
+	 */
+	public function check()
+	{
+		$params = (new SupervisionProblemValidate())->post()->goCheck('check');
+		$result = SupervisionProblemLogic::check($params);
+		if (true === $result) {
+			return $this->success('检查验收成功', [], 1, 1);
+		}
+		return $this->fail(SupervisionProblemLogic::getError());
+	}
+
+
+    /**
+     * @notes 删除问题跟踪台账
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 09:19
+     */
+    public function delete()
+    {
+        $params = (new SupervisionProblemValidate())->post()->goCheck('delete');
+        SupervisionProblemLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取问题跟踪台账详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/28 09:19
+     */
+    public function detail()
+    {
+        $params = (new SupervisionProblemValidate())->goCheck('detail');
+        $result = SupervisionProblemLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionSideStationController.php

@@ -0,0 +1,111 @@
+<?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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionSideStationLists;
+use app\adminapi\logic\supervision_work\SupervisionSideStationLogic;
+use app\adminapi\validate\supervision_work\SupervisionSideStationValidate;
+
+
+/**
+ * 工程监理--旁站登记控制器
+ * Class SupervisionSideStationController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionSideStationController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--旁站登记列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionSideStationLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--旁站登记
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function add()
+    {
+        $params = (new SupervisionSideStationValidate())->post()->goCheck('add');
+        $result = SupervisionSideStationLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionSideStationLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--旁站登记
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function edit()
+    {
+        $params = (new SupervisionSideStationValidate())->post()->goCheck('edit');
+        $result = SupervisionSideStationLogic::edit($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionSideStationLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--旁站登记
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function delete()
+    {
+        $params = (new SupervisionSideStationValidate())->post()->goCheck('delete');
+	    $result = SupervisionSideStationLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionSideStationLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取工程监理--旁站登记详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function detail()
+    {
+        $params = (new SupervisionSideStationValidate())->goCheck('detail');
+        $result = SupervisionSideStationLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionSideStationResultController.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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionSideStationResultLists;
+use app\adminapi\logic\supervision_work\SupervisionSideStationResultLogic;
+use app\adminapi\validate\supervision_work\SupervisionSideStationResultValidate;
+
+
+/**
+ * 工程监理--旁站结果控制器
+ * Class SupervisionSideStationResultController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionSideStationResultController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--旁站结果列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionSideStationResultLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--旁站结果
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function add()
+    {
+        $params = (new SupervisionSideStationResultValidate())->post()->goCheck('add');
+        $result = SupervisionSideStationResultLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionSideStationResultLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--旁站结果
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function edit()
+    {
+        $params = (new SupervisionSideStationResultValidate())->post()->goCheck('edit');
+        $result = SupervisionSideStationResultLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionSideStationResultLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--旁站结果
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function delete()
+    {
+        $params = (new SupervisionSideStationResultValidate())->post()->goCheck('delete');
+        SupervisionSideStationResultLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取工程监理--旁站结果详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function detail()
+    {
+        $params = (new SupervisionSideStationResultValidate())->goCheck('detail');
+        $result = SupervisionSideStationResultLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionTestBlocksSpecimensController.php

@@ -0,0 +1,111 @@
+<?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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionTestBlocksSpecimensLists;
+use app\adminapi\logic\supervision_work\SupervisionTestBlocksSpecimensLogic;
+use app\adminapi\validate\supervision_work\SupervisionTestBlocksSpecimensValidate;
+
+
+/**
+ * 工程监理--试块试件见证控制器
+ * Class SupervisionTestBlocksSpecimensController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionTestBlocksSpecimensController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--试块试件见证列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 14:02
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionTestBlocksSpecimensLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--试块试件见证
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 14:02
+     */
+    public function add()
+    {
+        $params = (new SupervisionTestBlocksSpecimensValidate())->post()->goCheck('add');
+        $result = SupervisionTestBlocksSpecimensLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionTestBlocksSpecimensLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--试块试件见证
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 14:02
+     */
+    public function edit()
+    {
+        $params = (new SupervisionTestBlocksSpecimensValidate())->post()->goCheck('edit');
+        $result = SupervisionTestBlocksSpecimensLogic::edit($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionTestBlocksSpecimensLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--试块试件见证
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 14:02
+     */
+    public function delete()
+    {
+        $params = (new SupervisionTestBlocksSpecimensValidate())->post()->goCheck('delete');
+	    $result = SupervisionTestBlocksSpecimensLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionTestBlocksSpecimensLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取工程监理--试块试件见证详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 14:02
+     */
+    public function detail()
+    {
+        $params = (new SupervisionTestBlocksSpecimensValidate())->goCheck('detail');
+        $result = SupervisionTestBlocksSpecimensLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionWitnessSamplingController.php

@@ -0,0 +1,111 @@
+<?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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionWitnessSamplingLists;
+use app\adminapi\logic\supervision_work\SupervisionWitnessSamplingLogic;
+use app\adminapi\validate\supervision_work\SupervisionWitnessSamplingValidate;
+
+
+/**
+ * 工程监理--见证取样控制器
+ * Class SupervisionWitnessSamplingController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionWitnessSamplingController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--见证取样列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionWitnessSamplingLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--见证取样
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function add()
+    {
+        $params = (new SupervisionWitnessSamplingValidate())->post()->goCheck('add');
+        $result = SupervisionWitnessSamplingLogic::add($params,$this->adminId);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionWitnessSamplingLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--见证取样
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function edit()
+    {
+        $params = (new SupervisionWitnessSamplingValidate())->post()->goCheck('edit');
+        $result = SupervisionWitnessSamplingLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionWitnessSamplingLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--见证取样
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function delete()
+    {
+        $params = (new SupervisionWitnessSamplingValidate())->post()->goCheck('delete');
+	    $result = SupervisionWitnessSamplingLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionWitnessSamplingLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取工程监理--见证取样详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function detail()
+    {
+        $params = (new SupervisionWitnessSamplingValidate())->goCheck('detail');
+        $result = SupervisionWitnessSamplingLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionWitnessSamplingDetailController.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\controller\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionWitnessSamplingDetailLists;
+use app\adminapi\logic\supervision_work\SupervisionWitnessSamplingDetailLogic;
+use app\adminapi\validate\supervision_work\SupervisionWitnessSamplingDetailValidate;
+
+
+/**
+ * 工程监理--见证取样明细控制器
+ * Class SupervisionWitnessSamplingDetailController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionWitnessSamplingDetailController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--见证取样明细列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionWitnessSamplingDetailLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--见证取样明细
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function add()
+    {
+        $params = (new SupervisionWitnessSamplingDetailValidate())->post()->goCheck('add');
+        $result = SupervisionWitnessSamplingDetailLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionWitnessSamplingDetailLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--见证取样明细
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function edit()
+    {
+        $params = (new SupervisionWitnessSamplingDetailValidate())->post()->goCheck('edit');
+        $result = SupervisionWitnessSamplingDetailLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionWitnessSamplingDetailLogic::getError());
+    }
+	
+	/**
+	 * @notes 检验工程监理--见证取样明细
+	 * @return \think\response\Json
+	 * @author likeadmin
+	 * @date 2024/02/29 09:22
+	 */
+	public function check()
+	{
+		$params = (new SupervisionWitnessSamplingDetailValidate())->post()->goCheck('check');
+		$result = SupervisionWitnessSamplingDetailLogic::check($params,$this->adminId);
+		if (true === $result) {
+			return $this->success('检验成功', [], 1, 1);
+		}
+		return $this->fail(SupervisionWitnessSamplingDetailLogic::getError());
+	}
+
+
+    /**
+     * @notes 删除工程监理--见证取样明细
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function delete()
+    {
+        $params = (new SupervisionWitnessSamplingDetailValidate())->post()->goCheck('delete');
+	    $result = SupervisionWitnessSamplingDetailLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionWitnessSamplingDetailLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取工程监理--见证取样明细详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function detail()
+    {
+        $params = (new SupervisionWitnessSamplingDetailValidate())->goCheck('detail');
+        $result = SupervisionWitnessSamplingDetailLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionWorkContactController.php

@@ -0,0 +1,111 @@
+<?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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionWorkContactLists;
+use app\adminapi\logic\supervision_work\SupervisionWorkContactLogic;
+use app\adminapi\validate\supervision_work\SupervisionWorkContactValidate;
+
+
+/**
+ * 工程监理--监理工作联系单控制器
+ * Class SupervisionWorkContactController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionWorkContactController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--监理工作联系单列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionWorkContactLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--监理工作联系单
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function add()
+    {
+        $params = (new SupervisionWorkContactValidate())->post()->goCheck('add');
+        $result = SupervisionWorkContactLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionWorkContactLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--监理工作联系单
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function edit()
+    {
+        $params = (new SupervisionWorkContactValidate())->post()->goCheck('edit');
+        $result = SupervisionWorkContactLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionWorkContactLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--监理工作联系单
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function delete()
+    {
+        $params = (new SupervisionWorkContactValidate())->post()->goCheck('delete');
+	    $result = SupervisionWorkContactLogic::delete($params);
+	    if (true === $result) {
+		    return $this->success('删除成功', [], 1, 1);
+	    }
+	    return $this->fail(SupervisionWorkContactLogic::getError());
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理工作联系单详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function detail()
+    {
+        $params = (new SupervisionWorkContactValidate())->goCheck('detail');
+        $result = SupervisionWorkContactLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/controller/supervision_work/SupervisionWorkContactProblemController.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\supervision_work;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\supervision_work\SupervisionWorkContactProblemLists;
+use app\adminapi\logic\supervision_work\SupervisionWorkContactProblemLogic;
+use app\adminapi\validate\supervision_work\SupervisionWorkContactProblemValidate;
+
+
+/**
+ * 工程监理--监理工作联系单问题控制器
+ * Class SupervisionWorkContactProblemController
+ * @package app\adminapi\controller\supervision_work
+ */
+class SupervisionWorkContactProblemController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取工程监理--监理工作联系单问题列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function lists()
+    {
+        return $this->dataLists(new SupervisionWorkContactProblemLists());
+    }
+
+
+    /**
+     * @notes 添加工程监理--监理工作联系单问题
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function add()
+    {
+        $params = (new SupervisionWorkContactProblemValidate())->post()->goCheck('add');
+        $result = SupervisionWorkContactProblemLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionWorkContactProblemLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑工程监理--监理工作联系单问题
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function edit()
+    {
+        $params = (new SupervisionWorkContactProblemValidate())->post()->goCheck('edit');
+        $result = SupervisionWorkContactProblemLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(SupervisionWorkContactProblemLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除工程监理--监理工作联系单问题
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function delete()
+    {
+        $params = (new SupervisionWorkContactProblemValidate())->post()->goCheck('delete');
+        SupervisionWorkContactProblemLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理工作联系单问题详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function detail()
+    {
+        $params = (new SupervisionWorkContactProblemValidate())->goCheck('detail');
+        $result = SupervisionWorkContactProblemLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/lists/ApprovalIssuanceAchievementDocumentsLists.php

@@ -1,77 +1,104 @@
-<?php
+<?php
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
+// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
+// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
+// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
+// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | author: likeadminTeam
+// | author: likeadminTeam
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-
+
-namespace app\adminapi\lists;
+namespace app\adminapi\lists;
-
+
-
+
-use app\adminapi\lists\BaseAdminDataLists;
+use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\ApprovalIssuanceAchievementDocuments;
+use app\common\lists\ListsExcelInterface;
-use app\common\lists\ListsSearchInterface;
+use app\common\model\ApprovalIssuanceAchievementDocuments;
-
+use app\common\lists\ListsSearchInterface;
-
+
-/**
+
- * ApprovalIssuanceAchievementDocuments列表
+/**
- * Class ApprovalIssuanceAchievementDocumentsLists
+ * ApprovalIssuanceAchievementDocuments列表
- * @package app\adminapi\lists
+ * Class ApprovalIssuanceAchievementDocumentsLists
- */
+ * @package app\adminapi\lists
-class ApprovalIssuanceAchievementDocumentsLists extends BaseAdminDataLists implements ListsSearchInterface
+ */
-{
+class ApprovalIssuanceAchievementDocumentsLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
-
+{
-
+
-    /**
+
-     * @notes 设置搜索条件
+    /**
-     * @return \string[][]
+     * @notes 设置搜索条件
-     * @author likeadmin
+     * @return \string[][]
-     * @date 2024/02/22 17:57
+     * @author likeadmin
-     */
+     * @date 2024/02/22 17:57
-    public function setSearch(): array
+     */
-    {
+    public function setSearch(): array
-        return [
+    {
-            '=' => ['project', 'project_num'],
+        return [
-        ];
+            '=' => ['project', 'project_num'],
-    }
+
-
+        ];
-
+    }
-    /**
+
-     * @notes 获取列表
+
-     * @return array
+    /**
-     * @throws \think\db\exception\DataNotFoundException
+     * @notes 获取列表
-     * @throws \think\db\exception\DbException
+     * @return array
-     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\db\exception\DataNotFoundException
-     * @author likeadmin
+     * @throws \think\db\exception\DbException
-     * @date 2024/02/22 17:57
+     * @throws \think\db\exception\ModelNotFoundException
-     */
+     * @author likeadmin
-    public function lists(): array
+     * @date 2024/02/22 17:57
-    {
+     */
-        return ApprovalIssuanceAchievementDocuments::where($this->searchWhere)
+    public function lists(): array
-            ->field(['id', 'dataid', 'num', 'project', 'project_num', 'task', 'processes', 'number', 'apptime', 'person', 'tips', 'fd_1', 'fd_2', 'fd_3'])
+    {
-            ->limit($this->limitOffset, $this->limitLength)
+        return ApprovalIssuanceAchievementDocuments::where($this->searchWhere)
-            ->order(['id' => 'desc'])
+            ->with(['projectInfo'])
-            ->select()
+            ->limit($this->limitOffset, $this->limitLength)
-            ->toArray();
+            ->order(['id' => 'desc'])
-    }
+            ->select()
-
+            ->toArray();
-
+    }
-    /**
+
-     * @notes 获取数量
+
-     * @return int
+    /**
-     * @author likeadmin
+     * @notes 获取数量
-     * @date 2024/02/22 17:57
+     * @return int
-     */
+     * @author likeadmin
-    public function count(): int
+     * @date 2024/02/22 17:57
-    {
+     */
-        return ApprovalIssuanceAchievementDocuments::where($this->searchWhere)->count();
+    public function count(): int
-    }
+    {
-
+        return ApprovalIssuanceAchievementDocuments::where($this->searchWhere)->count();
+    }
+
+    public function setFileName(): string
+    {
+        return '成果文件审定、签发';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'num' => '单据编号',
+            'project_id' => '项目id',
+            'task' => '任务名称',
+            'processes' => '工序',
+            'number' => '资料份数',
+            'apptime' => '登记日期',
+            'person' => '登记人',
+            'tips' => '备注',
+        ];
+    }
 }

app/adminapi/lists/DataReceptionLists.php

@@ -1,77 +1,103 @@
-<?php
+<?php
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
+// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
+// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
+// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
+// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | author: likeadminTeam
+// | author: likeadminTeam
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-
+
-namespace app\adminapi\lists;
+namespace app\adminapi\lists;
-
+
-
+
-use app\adminapi\lists\BaseAdminDataLists;
+use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\DataReception;
+use app\common\lists\ListsExcelInterface;
-use app\common\lists\ListsSearchInterface;
+use app\common\model\DataReception;
-
+use app\common\lists\ListsSearchInterface;
-
+
-/**
+
- * DataReception列表
+/**
- * Class DataReceptionLists
+ * DataReception列表
- * @package app\adminapi\lists
+ * Class DataReceptionLists
- */
+ * @package app\adminapi\lists
-class DataReceptionLists extends BaseAdminDataLists implements ListsSearchInterface
+ */
-{
+class DataReceptionLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
-
+{
-
+
-    /**
+
-     * @notes 设置搜索条件
+    /**
-     * @return \string[][]
+     * @notes 设置搜索条件
-     * @author likeadmin
+     * @return \string[][]
-     * @date 2024/02/23 09:21
+     * @author likeadmin
-     */
+     * @date 2024/02/23 09:21
-    public function setSearch(): array
+     */
-    {
+    public function setSearch(): array
-        return [
+    {
-            '=' => ['num', 'project', 'project_num'],
+        return [
-        ];
+            '=' => ['num', 'project', 'project_num'],
-    }
+
-
+        ];
-
+    }
-    /**
+
-     * @notes 获取列表
+
-     * @return array
+    /**
-     * @throws \think\db\exception\DataNotFoundException
+     * @notes 获取列表
-     * @throws \think\db\exception\DbException
+     * @return array
-     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\db\exception\DataNotFoundException
-     * @author likeadmin
+     * @throws \think\db\exception\DbException
-     * @date 2024/02/23 09:21
+     * @throws \think\db\exception\ModelNotFoundException
-     */
+     * @author likeadmin
-    public function lists(): array
+     * @date 2024/02/23 09:21
-    {
+     */
-        return DataReception::where($this->searchWhere)
+    public function lists(): array
-            ->field(['id', 'dataid', 'num', 'project', 'project_num', 'apptime', 'person', 'number', 'position', 'tips'])
+    {
-            ->limit($this->limitOffset, $this->limitLength)
+        return DataReception::where($this->searchWhere)
-            ->order(['id' => 'desc'])
+            ->with(['projectInfo'])
-            ->select()
+            ->limit($this->limitOffset, $this->limitLength)
-            ->toArray();
+            ->order(['id' => 'desc'])
-    }
+            ->select()
-
+            ->toArray();
-
+    }
-    /**
+
-     * @notes 获取数量
+
-     * @return int
+    /**
-     * @author likeadmin
+     * @notes 获取数量
-     * @date 2024/02/23 09:21
+     * @return int
-     */
+     * @author likeadmin
-    public function count(): int
+     * @date 2024/02/23 09:21
-    {
+     */
-        return DataReception::where($this->searchWhere)->count();
+    public function count(): int
-    }
+    {
-
+        return DataReception::where($this->searchWhere)->count();
+    }
+
+    public function setFileName(): string
+    {
+        return '资料接收';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'num' => '单据编号',
+            'project_id' => '项目id',
+            'apptime' => '登记日期',
+            'person' => '登记人',
+            'number' => '资料份数',
+            'position' => '存放位置',
+            'tips' => '说明',
+        ];
+    }
 }

app/adminapi/lists/ProjectCommissionLists.php

@@ -1,77 +1,115 @@
-<?php
+<?php
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
+// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
+// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
+// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
+// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | author: likeadminTeam
+// | author: likeadminTeam
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-
+
-namespace app\adminapi\lists;
+namespace app\adminapi\lists;
-
+
-
+
-use app\adminapi\lists\BaseAdminDataLists;
+use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\ProjectCommission;
+use app\common\lists\ListsExcelInterface;
-use app\common\lists\ListsSearchInterface;
+use app\common\model\ProjectCommission;
-
+use app\common\lists\ListsSearchInterface;
-
+use app\common\model\ProjectCommissionDetail;
-/**
+
- * ProjectCommission列表
+
- * Class ProjectCommissionLists
+/**
- * @package app\adminapi\lists
+ * ProjectCommission列表
- */
+ * Class ProjectCommissionLists
-class ProjectCommissionLists extends BaseAdminDataLists implements ListsSearchInterface
+ * @package app\adminapi\lists
-{
+ */
-
+class ProjectCommissionLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
-
+{
-    /**
+
-     * @notes 设置搜索条件
+
-     * @return \string[][]
+    /**
-     * @author likeadmin
+     * @notes 设置搜索条件
-     * @date 2024/02/23 09:37
+     * @return \string[][]
-     */
+     * @author likeadmin
-    public function setSearch(): array
+     * @date 2024/02/23 09:37
-    {
+     */
-        return [
+    public function setSearch(): array
-            '=' => ['num', 'project', 'project_num'],
+    {
-        ];
+        return [
-    }
+            '=' => ['num', 'project', 'project_num'],
-
+
-
+        ];
-    /**
+    }
-     * @notes 获取列表
+
-     * @return array
+
-     * @throws \think\db\exception\DataNotFoundException
+    /**
-     * @throws \think\db\exception\DbException
+     * @notes 获取列表
-     * @throws \think\db\exception\ModelNotFoundException
+     * @return array
-     * @author likeadmin
+     * @throws \think\db\exception\DataNotFoundException
-     * @date 2024/02/23 09:37
+     * @throws \think\db\exception\DbException
-     */
+     * @throws \think\db\exception\ModelNotFoundException
-    public function lists(): array
+     * @author likeadmin
-    {
+     * @date 2024/02/23 09:37
-        return ProjectCommission::where($this->searchWhere)
+     */
-            ->field(['id', 'dataid', 'num', 'project', 'project_num', 'head', 'affcontract', 'industry', 'hk', 'rate', 'ticheng', 'paid_amount', 'bczfze', 'djr', 'apptime', 'remark'])
+    public function lists(): array
-            ->limit($this->limitOffset, $this->limitLength)
+    {
-            ->order(['id' => 'desc'])
+        return ProjectCommission::with(['projectInfo', 'contract'])
-            ->select()
+            ->append(['children'])
-            ->toArray();
+            ->where($this->searchWhere)
-    }
+            ->limit($this->limitOffset, $this->limitLength)
-
+            ->order(['id' => 'desc'])
-
+            ->withAttr('children', function ($value, $data){
-    /**
+                $details = ProjectCommissionDetail::where('project_commission_id', $data['id'])->select();
-     * @notes 获取数量
+                return $details;
-     * @return int
+            })
-     * @author likeadmin
+            ->select()
-     * @date 2024/02/23 09:37
+            ->toArray();
-     */
+    }
-    public function count(): int
+
-    {
+
-        return ProjectCommission::where($this->searchWhere)->count();
+    /**
-    }
+     * @notes 获取数量
-
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/23 09:37
+     */
+    public function count(): int
+    {
+        return ProjectCommission::where($this->searchWhere)->count();
+    }
+
+    public function setFileName(): string
+    {
+        return '项目提成';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'num' => '单据编号',
+            'project_id' => '项目id',
+            'affcontract' => '关联合同',
+            'industry' => '行业',
+            'hk' => '项目回款总额',
+            'rate' => '提成比例（%）',
+            'ticheng' => '应提成总金额',
+            'paid_amount' => '已支付总额',
+            'bczfze' => '本次支付总额',
+            'djr' => '登记人',
+            'apptime' => '登记日期',
+            'remark' => '备注',
+        ];
+    }
+
 }

app/adminapi/lists/TaskDetailLists.php

@@ -55,6 +55,7 @@ class TaskDetailLists extends BaseAdminDataLists implements ListsSearchInterface
     public function lists(): array
     {
         return TaskDetail::where($this->searchWhere)
+            ->with(['taskTypeInfo', 'taskAllocation'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()

app/adminapi/lists/TaskHandlingThreeLevelReviewLists.php

@@ -16,6 +16,7 @@ namespace app\adminapi\lists;
 
 
 use app\adminapi\lists\BaseAdminDataLists;
+use app\common\lists\ListsExcelInterface;
 use app\common\model\TaskHandlingThreeLevelReview;
 use app\common\lists\ListsSearchInterface;
 
@@ -25,7 +26,7 @@ use app\common\lists\ListsSearchInterface;
  * Class TaskHandlingThreeLevelReviewLists
  * @package app\adminapi\lists
  */
-class TaskHandlingThreeLevelReviewLists extends BaseAdminDataLists implements ListsSearchInterface
+class TaskHandlingThreeLevelReviewLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
 {
 
 
@@ -55,7 +56,7 @@ class TaskHandlingThreeLevelReviewLists extends BaseAdminDataLists implements Li
     public function lists(): array
     {
         return TaskHandlingThreeLevelReview::where($this->searchWhere)
-            ->field(['id', 'dataid', 'num', 'project', 'project_num', 'task', 'processes', 'rtype', 'zType', 'engineer', 'head', 'examine', 'one', 'two', 'three', 'apptime', 'level', 'area', 'type', 'use', 'construction', 'ask', 'according', 'clbc', 'ssje', 'gcshd', 'hzhj', 'rg', 'xmhd', 'bmhd', 'shbhd', 'kaigong', 'jungong', 'bz'])
+            ->with(['projectInfo'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
@@ -74,4 +75,53 @@ class TaskHandlingThreeLevelReviewLists extends BaseAdminDataLists implements Li
         return TaskHandlingThreeLevelReview::where($this->searchWhere)->count();
     }
 
+    public function setFileName(): string
+    {
+        return '任务办理与三级审核';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'num' => '单据编号',
+            'project_id' => '项目id',
+            'task' => '任务名称',
+            'processes' => '工序',
+            'rtype' => '任务类型',
+            'zType' => '专业类型',
+            'engineer' => '工程师',
+            'head' => '项目负责人',
+            'examine' => '审核流程',
+            'one' => '一级审核人',
+            'two' => '二级审核人',
+            'three' => '三级审核人',
+            'apptime' => '登记日期',
+            'level' => '任务级次',
+            'area' => '建筑面积',
+            'type' => '建筑结构类型',
+            'use' => '建筑用途',
+            'construction' => '施工单位',
+            'ask' => '编制要求',
+            'according' => '造价依据',
+            'clbc' => '材料补差',
+            'ssje' => '送审金额',
+            'gcshd' => '工程师核定价',
+            'hzhj' => '核增/核减金额',
+            'rg' => '人工单价',
+            'xmhd' => '项目负责人核定价',
+            'bmhd' => '部门负责人核定价',
+            'shbhd' => '审核部核定价',
+            'kaigong' => '开工日期',
+            'jungong' => '竣工日期',
+            'bz' => '备注',
+        ];
+    }
+
 }

app/adminapi/lists/cost_project/CostApprovedProjectLists.php

@@ -16,6 +16,7 @@ namespace app\adminapi\lists\cost_project;
 
 
 use app\adminapi\lists\BaseAdminDataLists;
+use app\common\lists\ListsExcelInterface;
 use app\common\model\cost_project\CostApprovedProject;
 use app\common\lists\ListsSearchInterface;
 
@@ -25,7 +26,7 @@ use app\common\lists\ListsSearchInterface;
  * Class CostApprovedProjectLists
  * @package app\adminapi\listscost_project
  */
-class CostApprovedProjectLists extends BaseAdminDataLists implements ListsSearchInterface
+class CostApprovedProjectLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
 {
 
 
@@ -56,7 +57,6 @@ class CostApprovedProjectLists extends BaseAdminDataLists implements ListsSearch
     public function lists(): array
     {
         return CostApprovedProject::where($this->searchWhere)
-            ->field(['id', 'contract_name', 'contract_num', 'part_a', 'part_b', 'business_nature', 'industry_nature', 'fund_sources', 'const_area', 'project_money', 'start_date', 'end_date', 'dept', 'regulators', 'project_director'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($data){
@@ -80,4 +80,59 @@ class CostApprovedProjectLists extends BaseAdminDataLists implements ListsSearch
         return CostApprovedProject::where($this->searchWhere)->count();
     }
 
+    public function setFileName(): string
+    {
+        return '待立项造价合同';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'contract_name' => '合同名称',
+            'contract_num' => '合同编号',
+            'part_a' => '甲方签约单位',
+            'part_a_contract' => '甲方联系人',
+            'part_a_address' => '业主地址',
+            'part_b' => '乙方签约',
+            'part_b_signatory' => '乙方签约人',
+            'business_nature' => '业务性质',
+            'fund_sources' => '资金来源',
+            'const_area' => '建设区域',
+            'project_money' => '工程总投资',
+            'project_scale' => '工程规模及概况',
+            'money' => '签订金额(元)',
+            'rate' => '合同签订费率(%)',
+            'contract_service' => '合同服务工期',
+            'start_date' => '合同计划开始日期',
+            'end_date' => '合同计划结束日期',
+            'performance' => '合同履约金(元)',
+            'due_time' => '履约金到期时间',
+            'payment' => '合同付款方式',
+            'content' => '合同主要内容',
+            'founder' => '创建人',
+            'create_date' => '创建日期',
+            'dept' => '签订部门',
+            'signing_person' => '签订负责人',
+            'regulators' => '监管部门',
+            'project_director' => '项目总监/经理',
+            'way' => '实施方式',
+            'seal_name' => '盖章名称',
+            'limit' => '是否限制',
+            'limit_num' => '限制次数',
+            'file_type' => '文件类',
+            'seal_num' => '盖章份数',
+            'sealer' => '盖章人',
+            'plance_seal' => '骑缝盖章',
+            'send_date' => '发出日期',
+            'number' => '邮寄编号',
+        ];
+    }
+
 }

app/adminapi/lists/cost_project/CostProjectLists.php

@@ -16,6 +16,7 @@ namespace app\adminapi\lists\cost_project;
 
 
 use app\adminapi\lists\BaseAdminDataLists;
+use app\common\lists\ListsExcelInterface;
 use app\common\model\cost_project\CostProject;
 use app\common\lists\ListsSearchInterface;
 
@@ -25,7 +26,7 @@ use app\common\lists\ListsSearchInterface;
  * Class CostProjectLists
  * @package app\adminapi\listscost_project
  */
-class CostProjectLists extends BaseAdminDataLists implements ListsSearchInterface
+class CostProjectLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
 {
 
 
@@ -55,13 +56,26 @@ class CostProjectLists extends BaseAdminDataLists implements ListsSearchInterfac
      */
     public function lists(): array
     {
+        $task_allocation = $this->request->param('task_allocation', 0);
+        // 筛选出关联了任务类别的项目
+        if ($task_allocation == 1) {
+            return CostProject::alias('p')
+                ->join('task_type t', 'p.id=t.cost_project_id')
+                ->where($this->searchWhere)
+                ->field('p.*')
+                ->limit($this->limitOffset, $this->limitLength)
+                ->with(['contract'])
+                ->order(['id' => 'desc'])
+                ->select()
+                ->toArray();
+        }
         return CostProject::where($this->searchWhere)
-            ->field(['id', 'project_num', 'project_name', 'contract_id', 'types', 'industry', 'province', 'city', 'address', 'starting', 'endtime', 'jhgq', 'depar', 'principal', 'person', 'invest', 'budget', 'cost', 'approval', 'aunit', 'Acontact', 'acontactnum', 'date', 'generalize', 'note', 'remark', 'annex'])
             ->limit($this->limitOffset, $this->limitLength)
             ->with(['contract'])
             ->order(['id' => 'desc'])
             ->select()
             ->toArray();
+
     }
 
 
@@ -73,7 +87,55 @@ class CostProjectLists extends BaseAdminDataLists implements ListsSearchInterfac
      */
     public function count(): int
     {
+        $task_allocation = $this->request->param('task_allocation', 0);
+        // 筛选出关联了任务类别的项目
+        if ($task_allocation == 1) {
+            return CostProject::alias('p')->join('task_type t', 'p.id=t.cost_project_id')->where($this->searchWhere)->count();
+        }
         return CostProject::where($this->searchWhere)->count();
     }
 
+    public function setFileName(): string
+    {
+        return '造价项目';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'project_num' => '项目编号',
+            'project_name' => '项目名称',
+            'contract_id' => '关联合同',
+            'types' => '咨询类型',
+            'industry' => '行业',
+            'province' => '所在省份',
+            'city' => '所在市区',
+            'address' => '具体地址',
+            'starting' => '计划开始日期',
+            'endtime' => '计划结束日期',
+            'jhgq' => '计划工期（天）',
+            'org_id' => '组织id',
+            'depar' => '项目所属部门',
+            'principal' => '项目负责人',
+            'person' => '项目相关人员',
+            'invest' => '项目总投资（万元）',
+            'budget' => '预算造价（万元）',
+            'cost' => '送审造价（万元）',
+            'approval' => '审定造价（万元）',
+            'aunit' => '委托单位',
+            'Acontact' => '委托方联系人',
+            'acontactnum' => '联系电话',
+            'generalize' => '登记日期',
+            'note' => '项目规模及概括',
+            'remark' => '注意事项'
+        ];
+    }
+
 }

app/adminapi/lists/dept/JobsLists.php

@@ -18,6 +18,7 @@ use app\adminapi\lists\BaseAdminDataLists;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\dept\Dept;
 use app\common\model\dept\Jobs;
+use app\common\model\dept\Orgs;
 
 /**
  * 岗位列表
@@ -60,7 +61,9 @@ class JobsLists extends BaseAdminDataLists implements ListsSearchInterface
 	        ->limit($this->limitOffset, $this->limitLength)
 	        ->order(['sort' => 'desc', 'id' => 'desc'])
 	        ->select()->each(function($item){
-			    $dept = Dept::where('id',$item['dept_id'])->findOrEmpty();
+			    $dept = Dept::field('name,org_id')->where('id',$item['dept_id'])->findOrEmpty();
+				$org = Orgs::field('name')->where('id',$dept['org_id'])->findOrEmpty();
+			    $item['org_name'] = $org->isEmpty() ? '' : $org['name'];
 			    $item['dept_name'] = $dept->isEmpty() ? '' : $dept['name'];
 			    return $item;
 		    })

app/adminapi/lists/project_process_management/ApplyWithSealLists.php

@@ -1,77 +1,117 @@
-<?php
+<?php
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
+// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
+// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
+// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
+// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | author: likeadminTeam
+// | author: likeadminTeam
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-
+
-namespace app\adminapi\lists\project_process_management;
+namespace app\adminapi\lists\project_process_management;
-
+
-
+
-use app\adminapi\lists\BaseAdminDataLists;
+use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\project_process_management\ApplyWithSeal;
+use app\common\lists\ListsExcelInterface;
-use app\common\lists\ListsSearchInterface;
+use app\common\model\project_process_management\ApplyWithSeal;
-
+use app\common\lists\ListsSearchInterface;
-
+
-/**
+
- * ApplyWithSeal列表
+/**
- * Class ApplyWithSealLists
+ * ApplyWithSeal列表
- * @package app\adminapi\listsproject_process_management
+ * Class ApplyWithSealLists
- */
+ * @package app\adminapi\listsproject_process_management
-class ApplyWithSealLists extends BaseAdminDataLists implements ListsSearchInterface
+ */
-{
+class ApplyWithSealLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
-
+{
-
+
-    /**
+
-     * @notes 设置搜索条件
+    /**
-     * @return \string[][]
+     * @notes 设置搜索条件
-     * @author likeadmin
+     * @return \string[][]
-     * @date 2024/02/23 15:05
+     * @author likeadmin
-     */
+     * @date 2024/02/23 15:05
-    public function setSearch(): array
+     */
-    {
+    public function setSearch(): array
-        return [
+    {
-            '=' => ['num'],
+        return [
-        ];
+            '=' => ['num'],
-    }
+
-
+        ];
-
+    }
-    /**
+
-     * @notes 获取列表
+
-     * @return array
+    /**
-     * @throws \think\db\exception\DataNotFoundException
+     * @notes 获取列表
-     * @throws \think\db\exception\DbException
+     * @return array
-     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\db\exception\DataNotFoundException
-     * @author likeadmin
+     * @throws \think\db\exception\DbException
-     * @date 2024/02/23 15:05
+     * @throws \think\db\exception\ModelNotFoundException
-     */
+     * @author likeadmin
-    public function lists(): array
+     * @date 2024/02/23 15:05
-    {
+     */
-        return ApplyWithSeal::where($this->searchWhere)
+    public function lists(): array
-            ->field(['id', 'dataid', 'num', 'types', 'filetype', 'ridingseam', 'name', 'frequency', 'limit', 'depar', 'stampman', 'project', 'principal', 'content', 'loan', 'borrow', 'returndate', 'applicant', 'date', 'sjborrow', 'sjborrower', 'sjreturn', 'returnee', 'annex'])
+    {
-            ->limit($this->limitOffset, $this->limitLength)
+        return ApplyWithSeal::with(['projectInfo', 'dept'])->where($this->searchWhere)
-            ->order(['id' => 'desc'])
+            ->limit($this->limitOffset, $this->limitLength)
-            ->select()
+            ->order(['id' => 'desc'])
-            ->toArray();
+            ->select()
-    }
+            ->toArray();
-
+    }
-
+
-    /**
+
-     * @notes 获取数量
+    /**
-     * @return int
+     * @notes 获取数量
-     * @author likeadmin
+     * @return int
-     * @date 2024/02/23 15:05
+     * @author likeadmin
-     */
+     * @date 2024/02/23 15:05
-    public function count(): int
+     */
-    {
+    public function count(): int
-        return ApplyWithSeal::where($this->searchWhere)->count();
+    {
-    }
+        return ApplyWithSeal::where($this->searchWhere)->count();
-
+    }
+
+    public function setFileName(): string
+    {
+        return '用章申请';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'num' => '单据编号',
+            'project_id' => '项目id',
+            'types' => '登记人',
+            'filetype' => '登记人',
+            'ridingseam' => '进度申报造价合计',
+            'name' => '进度审核造价合计',
+            'frequency' => '累计应付工程款合计',
+            'limit' => '累计应付工程款合计',
+            'org_id' => '累计应付工程款合计',
+            'depar' => '累计应付工程款合计',
+            'stampman' => '累计应付工程款合计',
+            'content' => '累计应付工程款合计',
+            'loan' => '累计应付工程款合计',
+            'borrow' => '累计应付工程款合计',
+            'returndate' => '累计应付工程款合计',
+            'applicant' => '累计应付工程款合计',
+            'date' => '累计应付工程款合计',
+            'sjborrow' => '累计应付工程款合计',
+            'sjborrower' => '累计应付工程款合计',
+            'sjreturn' => '累计应付工程款合计',
+            'returnee' => '累计应付工程款合计'
+        ];
+    }
+
 }

app/adminapi/lists/project_process_management/JianliProjectProgressReportLists.php

@@ -1,77 +1,110 @@
-<?php
+<?php
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
+// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
+// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
+// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
+// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | author: likeadminTeam
+// | author: likeadminTeam
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-
+
-namespace app\adminapi\lists\project_process_management;
+namespace app\adminapi\lists\project_process_management;
-
+
-
+
-use app\adminapi\lists\BaseAdminDataLists;
+use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\project_process_management\JianliProjectProgressReport;
+use app\common\lists\ListsExcelInterface;
-use app\common\lists\ListsSearchInterface;
+use app\common\model\project_process_management\JianliProjectProgressReport;
-
+use app\common\lists\ListsSearchInterface;
-
+
-/**
+
- * JianliProjectProgressReport列表
+/**
- * Class JianliProjectProgressReportLists
+ * JianliProjectProgressReport列表
- * @package app\adminapi\listsproject_process_management
+ * Class JianliProjectProgressReportLists
- */
+ * @package app\adminapi\listsproject_process_management
-class JianliProjectProgressReportLists extends BaseAdminDataLists implements ListsSearchInterface
+ */
-{
+class JianliProjectProgressReportLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
-
+{
-
+
-    /**
+
-     * @notes 设置搜索条件
+    /**
-     * @return \string[][]
+     * @notes 设置搜索条件
-     * @author likeadmin
+     * @return \string[][]
-     * @date 2024/02/23 11:47
+     * @author likeadmin
-     */
+     * @date 2024/02/23 11:47
-    public function setSearch(): array
+     */
-    {
+    public function setSearch(): array
-        return [
+    {
-            '=' => ['num', 'project', 'project_num', 'datas'],
+        return [
-        ];
+            '=' => ['num', 'project', 'project_num', 'datas'],
-    }
+
-
+        ];
-
+    }
-    /**
+
-     * @notes 获取列表
+
-     * @return array
+    /**
-     * @throws \think\db\exception\DataNotFoundException
+     * @notes 获取列表
-     * @throws \think\db\exception\DbException
+     * @return array
-     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\db\exception\DataNotFoundException
-     * @author likeadmin
+     * @throws \think\db\exception\DbException
-     * @date 2024/02/23 11:47
+     * @throws \think\db\exception\ModelNotFoundException
-     */
+     * @author likeadmin
-    public function lists(): array
+     * @date 2024/02/23 11:47
-    {
+     */
-        return JianliProjectProgressReport::where($this->searchWhere)
+    public function lists(): array
-            ->field(['id', 'dataid', 'num', 'project', 'project_num', 'bm_master', 'wt_unit', 'xm_master', 'start_date', 'end_date', 'duration', 'working_hours', 'done_progress', 'bjd_progress', 'djr', 'apptime', 'jdms'])
+    {
-            ->limit($this->limitOffset, $this->limitLength)
+        return JianliProjectProgressReport::with(['projectInfo'])->where($this->searchWhere)
-            ->order(['id' => 'desc'])
+            ->limit($this->limitOffset, $this->limitLength)
-            ->select()
+            ->order(['id' => 'desc'])
-            ->toArray();
+            ->select()
-    }
+            ->toArray();
-
+    }
-
+
-    /**
+
-     * @notes 获取数量
+    /**
-     * @return int
+     * @notes 获取数量
-     * @author likeadmin
+     * @return int
-     * @date 2024/02/23 11:47
+     * @author likeadmin
-     */
+     * @date 2024/02/23 11:47
-    public function count(): int
+     */
-    {
+    public function count(): int
-        return JianliProjectProgressReport::where($this->searchWhere)->count();
+    {
-    }
+        return JianliProjectProgressReport::where($this->searchWhere)->count();
-
+    }
+
+    public function setFileName(): string
+    {
+        return '项目进度汇报';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'num' => '单据编号',
+            'project_id' => '项目id',
+            'bm_master' => '部门负责人',
+            'wt_unit' => '委托单位',
+            'xm_master' => '项目负责人',
+            'start_date' => '实际开始日期',
+            'end_date' => '实际结束日期',
+            'duration' => '工期（天）',
+            'working_hours' => '工时',
+            'done_progress' => '累计已完成进度（%）',
+            'bjd_progress' => '本阶段完成进度(%)',
+            'djr' => '登记人',
+            'apptime' => '登记时间',
+            'jdms' => '形象进度描述'
+        ];
+    }
+
 }

app/adminapi/lists/project_process_management/ProjectChangeVisaLists.php

@@ -16,8 +16,10 @@ namespace app\adminapi\lists\project_process_management;
 
 
 use app\adminapi\lists\BaseAdminDataLists;
+use app\common\lists\ListsExcelInterface;
 use app\common\model\project_process_management\ProjectChangeVisa;
 use app\common\lists\ListsSearchInterface;
+use app\common\model\project_process_management\ProjectChangeVisaContent;
 
 
 /**
@@ -25,7 +27,7 @@ use app\common\lists\ListsSearchInterface;
  * Class ProjectChangeVisaLists
  * @package app\adminapi\listsproject_process_management
  */
-class ProjectChangeVisaLists extends BaseAdminDataLists implements ListsSearchInterface
+class ProjectChangeVisaLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
 {
 
 
@@ -55,9 +57,15 @@ class ProjectChangeVisaLists extends BaseAdminDataLists implements ListsSearchIn
      */
     public function lists(): array
     {
-        return ProjectChangeVisa::where($this->searchWhere)
+        return ProjectChangeVisa::with(['projectInfo'])
+            ->append(['children'])
+            ->where($this->searchWhere)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
+            ->withAttr('children', function ($value, $data){
+                $details = ProjectChangeVisaContent::where('project_change_visa_id', $data['id'])->select();
+                return $details;
+            })
             ->select()
             ->toArray();
     }
@@ -74,4 +82,26 @@ class ProjectChangeVisaLists extends BaseAdminDataLists implements ListsSearchIn
         return ProjectChangeVisa::where($this->searchWhere)->count();
     }
 
+    public function setFileName(): string
+    {
+        return '项目变更签证';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'num' => '单据编号',
+            'project_id' => '项目id',
+            'djr' => '登记人',
+            'apptime' => '登记日期',
+        ];
+    }
+
 }

app/adminapi/lists/project_process_management/ProjectProgressPaymentLists.php

@@ -1,77 +1,111 @@
-<?php
+<?php
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
+// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
+// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
+// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
+// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | author: likeadminTeam
+// | author: likeadminTeam
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-
+
-namespace app\adminapi\lists\project_process_management;
+namespace app\adminapi\lists\project_process_management;
-
+
-
+
-use app\adminapi\lists\BaseAdminDataLists;
+use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\project_process_management\ProjectProgressPayment;
+use app\common\lists\ListsExcelInterface;
-use app\common\lists\ListsSearchInterface;
+use app\common\model\project_process_management\ProjectProgressPayment;
-
+use app\common\lists\ListsSearchInterface;
-
+use app\common\model\project_process_management\ProjectProgressPaymentDetail;
-/**
+
- * ProjectProgressPayment列表
+
- * Class ProjectProgressPaymentLists
+/**
- * @package app\adminapi\listsproject_process_management
+ * ProjectProgressPayment列表
- */
+ * Class ProjectProgressPaymentLists
-class ProjectProgressPaymentLists extends BaseAdminDataLists implements ListsSearchInterface
+ * @package app\adminapi\listsproject_process_management
-{
+ */
-
+class ProjectProgressPaymentLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
-
+{
-    /**
+
-     * @notes 设置搜索条件
+
-     * @return \string[][]
+    /**
-     * @author likeadmin
+     * @notes 设置搜索条件
-     * @date 2024/02/23 13:47
+     * @return \string[][]
-     */
+     * @author likeadmin
-    public function setSearch(): array
+     * @date 2024/02/23 13:47
-    {
+     */
-        return [
+    public function setSearch(): array
-            '=' => ['num', 'project', 'project_num'],
+    {
-        ];
+        return [
-    }
+            '=' => ['num', 'project', 'project_num'],
-
+
-
+        ];
-    /**
+    }
-     * @notes 获取列表
+
-     * @return array
+
-     * @throws \think\db\exception\DataNotFoundException
+    /**
-     * @throws \think\db\exception\DbException
+     * @notes 获取列表
-     * @throws \think\db\exception\ModelNotFoundException
+     * @return array
-     * @author likeadmin
+     * @throws \think\db\exception\DataNotFoundException
-     * @date 2024/02/23 13:47
+     * @throws \think\db\exception\DbException
-     */
+     * @throws \think\db\exception\ModelNotFoundException
-    public function lists(): array
+     * @author likeadmin
-    {
+     * @date 2024/02/23 13:47
-        return ProjectProgressPayment::where($this->searchWhere)
+     */
-            ->field(['id', 'dataid', 'num', 'project', 'project_num', 'djr', 'djrq', 'sbhj', 'shhj', 'ljhj', 'annex'])
+    public function lists(): array
-            ->limit($this->limitOffset, $this->limitLength)
+    {
-            ->order(['id' => 'desc'])
+        return ProjectProgressPayment::with(['projectInfo'])->where($this->searchWhere)
-            ->select()
+            ->append(['children'])
-            ->toArray();
+            ->limit($this->limitOffset, $this->limitLength)
-    }
+            ->order(['id' => 'desc'])
-
+            ->withAttr('children', function ($value, $data){
-
+                $details = ProjectProgressPaymentDetail::where('project_progress_payment_id', $data['id'])->select();
-    /**
+                return $details;
-     * @notes 获取数量
+            })
-     * @return int
+            ->select()
-     * @author likeadmin
+            ->each(function($item){
-     * @date 2024/02/23 13:47
+                $item['annex'] = json_decode($item['annex'], true);
-     */
+            })
-    public function count(): int
+            ->toArray();
-    {
+    }
-        return ProjectProgressPayment::where($this->searchWhere)->count();
+
-    }
+
-
+    /**
+     * @notes 获取数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/23 13:47
+     */
+    public function count(): int
+    {
+        return ProjectProgressPayment::where($this->searchWhere)->count();
+    }
+
+    public function setFileName(): string
+    {
+        return '项目进度汇报';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'num' => '单据编号',
+            'project_id' => '项目id',
+            'djr' => '登记人',
+            'djrq' => '登记人',
+            'sbhj' => '进度申报造价合计',
+            'shhj' => '进度审核造价合计',
+            'ljhj' => '累计应付工程款合计'
+        ];
+    }
 }

app/adminapi/lists/project_process_management/ProjectRectificationLists.php

@@ -1,77 +1,108 @@
-<?php
+<?php
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
+// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
+// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
+// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
+// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | author: likeadminTeam
+// | author: likeadminTeam
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-
+
-namespace app\adminapi\lists\project_process_management;
+namespace app\adminapi\lists\project_process_management;
-
+
-
+
-use app\adminapi\lists\BaseAdminDataLists;
+use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\project_process_management\ProjectRectification;
+use app\common\lists\ListsExcelInterface;
-use app\common\lists\ListsSearchInterface;
+use app\common\model\project_process_management\ProjectRectification;
-
+use app\common\lists\ListsSearchInterface;
-
+
-/**
+
- * ProjectRectification列表
+/**
- * Class ProjectRectificationLists
+ * ProjectRectification列表
- * @package app\adminapi\listsproject_process_management
+ * Class ProjectRectificationLists
- */
+ * @package app\adminapi\listsproject_process_management
-class ProjectRectificationLists extends BaseAdminDataLists implements ListsSearchInterface
+ */
-{
+class ProjectRectificationLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
-
+{
-
+
-    /**
+
-     * @notes 设置搜索条件
+    /**
-     * @return \string[][]
+     * @notes 设置搜索条件
-     * @author likeadmin
+     * @return \string[][]
-     * @date 2024/02/23 11:22
+     * @author likeadmin
-     */
+     * @date 2024/02/23 11:22
-    public function setSearch(): array
+     */
-    {
+    public function setSearch(): array
-        return [
+    {
-            '=' => ['num', 'project', 'project_num'],
+        return [
-        ];
+            '=' => ['num', 'project', 'project_num'],
-    }
+
-
+        ];
-
+    }
-    /**
+
-     * @notes 获取列表
+
-     * @return array
+    /**
-     * @throws \think\db\exception\DataNotFoundException
+     * @notes 获取列表
-     * @throws \think\db\exception\DbException
+     * @return array
-     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\db\exception\DataNotFoundException
-     * @author likeadmin
+     * @throws \think\db\exception\DbException
-     * @date 2024/02/23 11:22
+     * @throws \think\db\exception\ModelNotFoundException
-     */
+     * @author likeadmin
-    public function lists(): array
+     * @date 2024/02/23 11:22
-    {
+     */
-        return ProjectRectification::where($this->searchWhere)
+    public function lists(): array
-            ->field(['id', 'dataid', 'num', 'project', 'project_num', 'wt_unit', 'xm_master', 'zx_type', 'zg_master', 'dj_person', 'apptime', 'problem', 'deal_desc'])
+    {
-            ->limit($this->limitOffset, $this->limitLength)
+        return ProjectRectification::with(['projectInfo'])
-            ->order(['id' => 'desc'])
+            ->where($this->searchWhere)
-            ->select()
+            ->limit($this->limitOffset, $this->limitLength)
-            ->toArray();
+            ->order(['id' => 'desc'])
-    }
+            ->select()
-
+            ->toArray();
-
+    }
-    /**
+
-     * @notes 获取数量
+
-     * @return int
+    /**
-     * @author likeadmin
+     * @notes 获取数量
-     * @date 2024/02/23 11:22
+     * @return int
-     */
+     * @author likeadmin
-    public function count(): int
+     * @date 2024/02/23 11:22
-    {
+     */
-        return ProjectRectification::where($this->searchWhere)->count();
+    public function count(): int
-    }
+    {
-
+        return ProjectRectification::where($this->searchWhere)->count();
+    }
+
+    public function setFileName(): string
+    {
+        return '项目整改';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'num' => '单据编号',
+            'project_id' => '项目id',
+            'wt_unit' => '委托单位',
+            'jsdw' => '建设单位',
+            'bmfz' => '部门负责人',
+            'xmfz' => '项目负责人',
+            'riqi' => '踏勘日期',
+            'people' => '踏勘人员',
+            'djr' => '登记人',
+            'apptime' => '登记日期',
+            'content' => '踏勘内容',
+            'remark' => '核实结果',
+        ];
+    }
 }

app/adminapi/lists/project_process_management/ProjectSurveySignatureLists.php

@@ -16,6 +16,7 @@ namespace app\adminapi\lists\project_process_management;
 
 
 use app\adminapi\lists\BaseAdminDataLists;
+use app\common\lists\ListsExcelInterface;
 use app\common\model\project_process_management\ProjectSurveySignature;
 use app\common\lists\ListsSearchInterface;
 
@@ -25,7 +26,7 @@ use app\common\lists\ListsSearchInterface;
  * Class ProjectSurveySignatureLists
  * @package app\adminapi\listsproject_process_management
  */
-class ProjectSurveySignatureLists extends BaseAdminDataLists implements ListsSearchInterface
+class ProjectSurveySignatureLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
 {
 
 
@@ -55,7 +56,8 @@ class ProjectSurveySignatureLists extends BaseAdminDataLists implements ListsSea
      */
     public function lists(): array
     {
-        return ProjectSurveySignature::where($this->searchWhere)
+        return ProjectSurveySignature::with(['projectInfo'])
+            ->where($this->searchWhere)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
@@ -74,4 +76,34 @@ class ProjectSurveySignatureLists extends BaseAdminDataLists implements ListsSea
         return ProjectSurveySignature::where($this->searchWhere)->count();
     }
 
+    public function setFileName(): string
+    {
+        return '项目踏勘会签';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'num' => '单据编号',
+            'project_id' => '项目id',
+            'wt_unit' => '委托单位',
+            'jsdw' => '建设单位',
+            'bmfz' => '部门负责人',
+            'xmfz' => '项目负责人',
+            'riqi' => '踏勘日期',
+            'people' => '踏勘人员',
+            'djr' => '登记人',
+            'apptime' => '登记日期',
+            'content' => '踏勘内容',
+            'remark' => '核实结果',
+        ];
+    }
+
 }

app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringCaseLists.php

@@ -0,0 +1,86 @@
+<?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\supervision_dangerous;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
+use app\common\model\supervision_project\SupervisionProject;
+
+
+/**
+ * 工程监理--危大方案提交列表列表
+ * Class SupervisionDangerousEngineeringCaseLists
+ * @package app\adminapi\listssupervision_dangerous
+ */
+class SupervisionDangerousEngineeringCaseLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/03/04 14:00
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['dangerous_engineering_monitoring_id'],
+            '%like%' => ['case_name', 'assessor'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--危大方案提交列表列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/03/04 14:00
+     */
+    public function lists(): array
+    {
+        return SupervisionDangerousEngineeringCase::where($this->searchWhere)
+            ->field(['id', 'dangerous_engineering_monitoring_id', 'case_name', 'assessor'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project')->where('id',$data['dangerous_engineering_monitoring_id'])->findOrEmpty();
+		        $project = SupervisionProject::field('project_name')->where('id',$dangerous_engineering_monitoring['project_id'])->findOrEmpty();
+		        $data['dangerous_engineering_monitoring_title'] = $project['project_name'];
+		        $data['project_name'] = $project['project_name'];
+		        $data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text;
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--危大方案提交列表数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/03/04 14:00
+     */
+    public function count(): int
+    {
+        return SupervisionDangerousEngineeringCase::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLists.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\supervision_dangerous;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\supervision_project\SupervisionProject;
+
+
+/**
+ * 工程监理--危大工程监控列表
+ * Class SupervisionDangerousEngineeringMonitoringLists
+ * @package app\adminapi\listssupervision_dangerous
+ */
+class SupervisionDangerousEngineeringMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/03/04 11:05
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id', 'type', 'partial_project'],
+            '%like%' => ['position'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--危大工程监控列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/03/04 11:05
+     */
+    public function lists(): array
+    {
+        return SupervisionDangerousEngineeringMonitoring::where($this->searchWhere)
+            ->field(['id', 'project_id', 'type', 'partial_project', 'planned_construction_time', 'position'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+		        $data['partial_project_text'] = $data->partial_project_text;
+		        $data['type_text'] = $data->type_text;
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--危大工程监控数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/03/04 11:05
+     */
+    public function count(): int
+    {
+        return SupervisionDangerousEngineeringMonitoring::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLists.php

@@ -0,0 +1,83 @@
+<?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\supervision_dangerous;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\supervision_project\SupervisionProject;
+
+
+/**
+ * 工程监理--超规模危险性较大工程安全监控列表
+ * Class SupervisionExcessRiskSecurityMonitoringLists
+ * @package app\adminapi\listssupervision_dangerous
+ */
+class SupervisionExcessRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/03/04 10:11
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id', 'partial_project'],
+            '%like%' => ['project_characteristics'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--超规模危险性较大工程安全监控列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/03/04 10:11
+     */
+    public function lists(): array
+    {
+        return SupervisionExcessRiskSecurityMonitoring::where($this->searchWhere)
+            ->field(['id', 'project_id', 'partial_project', 'attribution_date', 'project_characteristics', 'planned_construction_time', 'actual_construction_time', 'problems_rectification'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+		        $data['partial_project_text'] = $data->partial_project_text;
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--超规模危险性较大工程安全监控数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/03/04 10:11
+     */
+    public function count(): int
+    {
+        return SupervisionExcessRiskSecurityMonitoring::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLists.php

@@ -0,0 +1,82 @@
+<?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\supervision_dangerous;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\supervision_project\SupervisionProject;
+
+
+/**
+ * 工程监理--危险性较大的工程安全监控列表
+ * Class SupervisionHighRiskSecurityMonitoringLists
+ * @package app\adminapi\listssupervision_dangerous
+ */
+class SupervisionHighRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/03/04 09:22
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id', 'partial_project', 'project_characteristics'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--危险性较大的工程安全监控列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/03/04 09:22
+     */
+    public function lists(): array
+    {
+        return SupervisionHighRiskSecurityMonitoring::where($this->searchWhere)
+            ->field(['id', 'project_id', 'partial_project', 'attribution_date', 'project_characteristics', 'planned_construction_time'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+		        $data['partial_project_text'] = $data->partial_project_text;
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--危险性较大的工程安全监控数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/03/04 09:22
+     */
+    public function count(): int
+    {
+        return SupervisionHighRiskSecurityMonitoring::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_dangerous/SupervisionLargeMechanicalEquipmentLists.php

@@ -0,0 +1,87 @@
+<?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\supervision_dangerous;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipment;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\supervision_project\SupervisionParticipatingUnits;
+use app\common\model\supervision_project\SupervisionProject;
+
+
+/**
+ * 大型机械设备及仪器台账列表
+ * Class SupervisionLargeMechanicalEquipmentLists
+ * @package app\adminapi\listssupervision_dangerous
+ */
+class SupervisionLargeMechanicalEquipmentLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id', 'company_id', 'approval_type'],
+            '%like%' => ['sn', 'name', 'use_site', 'approval_result'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取大型机械设备及仪器台账列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function lists(): array
+    {
+        return SupervisionLargeMechanicalEquipment::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+		        $data['company_name'] = $company['unit_name'];
+		        $data['approval_type_text'] = $data->approval_type_text;
+		        $data['first_audit_opinion_text'] = $data->first_audit_opinion_text;
+		        $data['final_audit_opinion_text'] = $data->final_audit_opinion_text;
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取大型机械设备及仪器台账数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function count(): int
+    {
+        return SupervisionLargeMechanicalEquipment::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_dangerous/SupervisionLargeMechanicalEquipmentMaintenanceRecordLists.php

@@ -0,0 +1,76 @@
+<?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\supervision_dangerous;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipmentMaintenanceRecord;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--大型机械设备及仪器修保养记录列表
+ * Class SupervisionLargeMechanicalEquipmentMaintenanceRecordLists
+ * @package app\adminapi\listssupervision_dangerous
+ */
+class SupervisionLargeMechanicalEquipmentMaintenanceRecordLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['large_mechanical_equipment_id'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--大型机械设备及仪器修保养记录列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function lists(): array
+    {
+        return SupervisionLargeMechanicalEquipmentMaintenanceRecord::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--大型机械设备及仪器修保养记录数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/03/02 09:51
+     */
+    public function count(): int
+    {
+        return SupervisionLargeMechanicalEquipmentMaintenanceRecord::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_dangerous/SupervisionSafetyWarningSignLists.php

@@ -0,0 +1,81 @@
+<?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\supervision_dangerous;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_dangerous\SupervisionSafetyWarningSign;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\supervision_project\SupervisionProject;
+
+
+/**
+ * 工程监理--现场安全警示标志列表
+ * Class SupervisionSafetyWarningSignLists
+ * @package app\adminapi\listssupervision_dangerous
+ */
+class SupervisionSafetyWarningSignLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/03/01 15:41
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id'],
+            '%like%' => ['check_user', 'check_area'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--现场安全警示标志列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/03/01 15:41
+     */
+    public function lists(): array
+    {
+        return SupervisionSafetyWarningSign::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--现场安全警示标志数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/03/01 15:41
+     */
+    public function count(): int
+    {
+        return SupervisionSafetyWarningSign::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionAcceptLists.php

@@ -0,0 +1,97 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\auth\Admin;
+use app\common\model\supervision_project\SupervisionParticipatingUnits;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionAccept;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\supervision_work\SupervisionCheckItem;
+use app\common\model\supervision_work\SupervisionProblem;
+
+
+/**
+ * 工程监理--验收登记列表
+ * Class SupervisionAcceptLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionAcceptLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id', 'accept_type'],
+            '%like%' => ['accept_code'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--验收登记列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function lists(): array
+    {
+        return SupervisionAccept::withoutField('update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $check_item = SupervisionCheckItem::field('node_name')->where('id',$data['check_item_id'])->findOrEmpty();
+		        $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
+		        $check_item_detail = SupervisionCheckItem::where('id','in',$data['check_item_detail_ids'])->column('node_name');
+		        $create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+		        $data['check_item_name'] = $check_item['node_name'];
+		        $data['company_name'] = $company['unit_name'];
+		        $data['check_item_detail_name'] = implode(',',$check_item_detail);
+		        $data['create_user_name'] = $create_user['name'];
+		        $data['accept_type_text'] = $data->accept_type_text;
+		        $data['accept_result_text'] = $data->accept_result_text;
+		        $data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',3)->count();
+		        $data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',3)->where('is_rectification',1)->count();
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--验收登记数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function count(): int
+    {
+        return SupervisionAccept::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionAcceptResultLists.php

@@ -0,0 +1,79 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_work\SupervisionAcceptResult;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--验收结果列表
+ * Class SupervisionAcceptResultLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionAcceptResultLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['accept_id', 'must_check', 'check_result'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--验收结果列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function lists(): array
+    {
+        return SupervisionAcceptResult::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $data['must_check_text'] = $data->must_check_text;
+		        $data['check_result_text'] = $data->check_result_text;
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--验收结果数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/27 15:23
+     */
+    public function count(): int
+    {
+        return SupervisionAcceptResult::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionDeviceEntryDetailLists.php

@@ -0,0 +1,81 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_work\SupervisionDeviceEntryDetail;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--设备进场明细列表
+ * Class SupervisionDeviceEntryDetailLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionDeviceEntryDetailLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['device_entry_id', 'contract_brand', 'documentation', 'verify'],
+            '%like%' => ['name', 'brand', 'model'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--设备进场明细列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function lists(): array
+    {
+        return SupervisionDeviceEntryDetail::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $data['contract_brand_text'] = $data->contract_brand_text;
+		        $data['documentation_text'] = $data->documentation_text;
+		        $data['verify_text'] = $data->verify_text;
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--设备进场明细数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function count(): int
+    {
+        return SupervisionDeviceEntryDetail::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionDeviceEntryLists.php

@@ -0,0 +1,91 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\auth\Admin;
+use app\common\model\supervision_project\SupervisionParticipatingUnits;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionDeviceEntry;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\supervision_work\SupervisionProblem;
+
+
+/**
+ * 工程监理--设备进场列表
+ * Class SupervisionDeviceEntryLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionDeviceEntryLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id', 'enter_result'],
+            '%like%' => ['code'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--设备进场列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function lists(): array
+    {
+        return SupervisionDeviceEntry::withoutField('update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
+		        $create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+		        $data['company_name'] = $company['unit_name'];
+		        $data['create_user_name'] = $create_user['name'];
+		        $data['enter_result_text'] = $data->enter_result_text;
+		        $data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',4)->count();
+		        $data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',4)->where('is_rectification',1)->count();
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--设备进场数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/28 16:12
+     */
+    public function count(): int
+    {
+        return SupervisionDeviceEntry::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionDiaryLists.php

@@ -0,0 +1,81 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionDiary;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--监理日记列表
+ * Class SupervisionDiaryLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionDiaryLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/03/01 13:53
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id'],
+            '%like%' => ['user', 'director'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理日记列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/03/01 13:53
+     */
+    public function lists(): array
+    {
+        return SupervisionDiary::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理日记数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/03/01 13:53
+     */
+    public function count(): int
+    {
+        return SupervisionDiary::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionEntityParallelTestingLists.php

@@ -0,0 +1,88 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\auth\Admin;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionCheckItem;
+use app\common\model\supervision_work\SupervisionEntityParallelTesting;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--实体平行检验列表
+ * Class SupervisionEntityParallelTestingLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionEntityParallelTestingLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/29 16:32
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id', 'result'],
+            '%like%' => ['theme', 'code', 'position'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--实体平行检验列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/29 16:32
+     */
+    public function lists(): array
+    {
+        return SupervisionEntityParallelTesting::withoutField('update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $check_item = SupervisionCheckItem::field('node_name')->where('id',$data['check_item_id'])->findOrEmpty();
+		        $create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+		        $data['check_item_name'] = $check_item['node_name'];
+		        $data['create_user_name'] = $create_user['name'];
+		        $data['result_text'] = $data->result_text;
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--实体平行检验数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/29 16:32
+     */
+    public function count(): int
+    {
+        return SupervisionEntityParallelTesting::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionInspectionLists.php

@@ -22,6 +22,7 @@ use app\common\model\supervision_project\SupervisionProject;
 use app\common\model\supervision_work\SupervisionCheckItem;
 use app\common\model\supervision_work\SupervisionInspection;
 use app\common\lists\ListsSearchInterface;
+use app\common\model\supervision_work\SupervisionProblem;
 
 
 /**
@@ -75,6 +76,8 @@ class SupervisionInspectionLists extends BaseAdminDataLists implements ListsSear
 		        $data['create_user_name'] = $create_user['name'];
 		        $data['inspection_type_text'] = $data->inspection_type_text;
 		        $data['is_important_text'] = $data->is_important_text;
+				$data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',1)->count();
+				$data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',1)->where('is_rectification',1)->count();
 	        })
             ->toArray();
     }

app/adminapi/lists/supervision_work/SupervisionInspectionProblemLists.php

@@ -1,76 +0,0 @@
-<?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\supervision_work;
-
-
-use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\supervision_work\SupervisionInspectionProblem;
-use app\common\lists\ListsSearchInterface;
-
-
-/**
- * 工程监理--巡视问题列表
- * Class SupervisionInspectionProblemLists
- * @package app\adminapi\listssupervision_work
- */
-class SupervisionInspectionProblemLists extends BaseAdminDataLists implements ListsSearchInterface
-{
-
-
-    /**
-     * @notes 设置搜索条件
-     * @return \string[][]
-     * @author likeadmin
-     * @date 2024/02/26 17:18
-     */
-    public function setSearch(): array
-    {
-        return [
-            '=' => ['inspection_id'],
-        ];
-    }
-
-
-    /**
-     * @notes 获取工程监理--巡视问题列表
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @author likeadmin
-     * @date 2024/02/26 17:18
-     */
-    public function lists(): array
-    {
-        return SupervisionInspectionProblem::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
-            ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
-            ->select()
-            ->toArray();
-    }
-
-
-    /**
-     * @notes 获取工程监理--巡视问题数量
-     * @return int
-     * @author likeadmin
-     * @date 2024/02/26 17:18
-     */
-    public function count(): int
-    {
-        return SupervisionInspectionProblem::where($this->searchWhere)->count();
-    }
-
-}

app/adminapi/lists/supervision_work/SupervisionMaterialEntryDetailLists.php

@@ -0,0 +1,79 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_work\SupervisionMaterialEntryDetail;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--材料进场明细列表
+ * Class SupervisionMaterialEntryDetailLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionMaterialEntryDetailLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['material_entry_id'],
+            '%like%' => ['name', 'model'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--材料进场明细列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function lists(): array
+    {
+        return SupervisionMaterialEntryDetail::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $data['contract_brand_text'] = $data->contract_brand_text;
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--材料进场明细数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function count(): int
+    {
+        return SupervisionMaterialEntryDetail::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionMaterialEntryLists.php

@@ -0,0 +1,87 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_project\SupervisionParticipatingUnits;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionMaterialEntry;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\supervision_work\SupervisionMaterialEntryDetail;
+
+
+/**
+ * 材料进场列表
+ * Class SupervisionMaterialEntryLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionMaterialEntryLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function setSearch(): array
+    {
+	    return [
+			'=' => ['project_id','enter_result','parallel_test'],
+		    '%like%' => ['theme', 'code'],
+	    ];
+    }
+
+
+    /**
+     * @notes 获取材料进场列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function lists(): array
+    {
+	    return SupervisionMaterialEntry::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
+		    ->limit($this->limitOffset, $this->limitLength)
+		    ->order(['id' => 'desc'])
+		    ->select()->each(function($data){
+			    $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+			    $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
+			    $data['project_name'] = $project['project_name'];
+			    $data['company_name'] = $company['unit_name'];
+			    $data['enter_result_text'] = $data->enter_result_text;
+			    $data['parallel_test_text'] = $data->parallel_test_text;
+		    })
+		    ->toArray();
+    }
+
+
+    /**
+     * @notes 获取材料进场数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/28 13:41
+     */
+    public function count(): int
+    {
+	    return SupervisionMaterialEntry::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionMaterialEquipmentInfoLists.php

@@ -0,0 +1,83 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionMaterialEquipmentInfo;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--材料设备信息列表
+ * Class SupervisionMaterialEquipmentInfoLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionMaterialEquipmentInfoLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/27 16:28
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id', 'contract_brand', 'type'],
+            '%like%' => ['name', 'brand', 'model'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--材料设备信息列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/27 16:28
+     */
+    public function lists(): array
+    {
+        return SupervisionMaterialEquipmentInfo::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+		        $data['contract_brand_text'] = $data->contract_brand_text;
+		        $data['type_text'] = $data->type_text;
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--材料设备信息数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/27 16:28
+     */
+    public function count(): int
+    {
+        return SupervisionMaterialEquipmentInfo::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionMaterialParallelTestingDetailLists.php

@@ -0,0 +1,94 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_work\SupervisionMaterialEntry;
+use app\common\model\supervision_work\SupervisionMaterialEntryDetail;
+use app\common\model\supervision_work\SupervisionMaterialParallelTesting;
+use app\common\model\supervision_work\SupervisionMaterialParallelTestingDetail;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\supervision_work\SupervisionProblem;
+
+
+/**
+ * 工程监理--材料平行检验明细列表
+ * Class SupervisionMaterialParallelTestingDetailLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionMaterialParallelTestingDetailLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['material_parallel_testing_id', 'material_entry_detail_id', 'check_result'],
+            '%like%' => ['check_code', 'check_user'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--材料平行检验明细列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function lists(): array
+    {
+        return SupervisionMaterialParallelTestingDetail::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $material_parallel_testing = SupervisionMaterialParallelTesting::field('inspection_date')->where('id',$data['material_parallel_testing_id'])->findOrEmpty();
+		        $material_entry_detail = SupervisionMaterialEntryDetail::field('material_entry_id,name,brand,model,contract_brand,entry_number')->where('id',$data['material_entry_detail_id'])->findOrEmpty();
+		        $material_entry = SupervisionMaterialEntry::field('enter_time')->where('id',$material_entry_detail['material_entry_id'])->findOrEmpty();
+		        $data['name'] = $material_entry_detail['name'];
+		        $data['brand'] = $material_entry_detail['brand'];
+		        $data['model'] = $material_entry_detail['model'];
+		        $data['contract_brand_text'] = $material_entry_detail->contract_brand_text;
+		        $data['entry_number'] = $material_entry_detail['entry_number'];
+		        $data['enter_time'] = $material_entry['enter_time'];
+				$data['inspection_date'] = $material_parallel_testing['inspection_date'];
+		        $data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',7)->count();
+		        $data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',7)->where('is_rectification',1)->count();
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--材料平行检验明细数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function count(): int
+    {
+        return SupervisionMaterialParallelTestingDetail::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionMaterialParallelTestingLists.php

@@ -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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_project\SupervisionParticipatingUnits;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionMaterialEntry;
+use app\common\model\supervision_work\SupervisionMaterialParallelTesting;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--材料平行检验列表
+ * Class SupervisionMaterialParallelTestingLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionMaterialParallelTestingLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function setSearch(): array
+    {
+	    return [
+		    '=' => ['project_id', 'material_entry_id'],
+		    '%like%' => ['code', 'inspector'],
+	    ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--材料平行检验列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function lists(): array
+    {
+        return SupervisionMaterialParallelTesting::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $material_entry = SupervisionMaterialEntry::field('code,theme,company_id,enter_time')->where('id',$data['material_entry_id'])->findOrEmpty();
+		        $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$material_entry['company_id'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+		        $data['company_name'] = $company['unit_name'];
+		        $data['material_entry_code'] = $material_entry['code'];
+		        $data['theme'] = $material_entry['theme'];
+		        $data['enter_time'] = $material_entry['enter_time'];
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--材料平行检验数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/29 15:00
+     */
+    public function count(): int
+    {
+        return SupervisionMaterialParallelTesting::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionMeetingMinutesLists.php

@@ -0,0 +1,81 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionMeetingMinutes;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--会议纪要列表
+ * Class SupervisionMeetingMinutesLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionMeetingMinutesLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/03/01 14:31
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id'],
+            '%like%' => ['theme', 'type', 'emcee', 'recorder'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--会议纪要列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/03/01 14:31
+     */
+    public function lists(): array
+    {
+        return SupervisionMeetingMinutes::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--会议纪要数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/03/01 14:31
+     */
+    public function count(): int
+    {
+        return SupervisionMeetingMinutes::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionNoticeLists.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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_project\SupervisionParticipatingUnits;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionNotice;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--监理通知单列表
+ * Class SupervisionNoticeLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionNoticeLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id'],
+            '%like%' => ['code', 'notify_user'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理通知单列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function lists(): array
+    {
+        return SupervisionNotice::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+		        $data['company_name'] = $company['unit_name'];
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理通知单数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function count(): int
+    {
+        return SupervisionNotice::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionNoticeProblemLists.php

@@ -0,0 +1,80 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_work\SupervisionNotice;
+use app\common\model\supervision_work\SupervisionNoticeProblem;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--监理通知问题列表
+ * Class SupervisionNoticeProblemLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionNoticeProblemLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['notice_id'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理通知问题列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function lists(): array
+    {
+        return SupervisionNoticeProblem::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $notice = SupervisionNotice::field('code')->where('id',$data['notice_id'])->findOrEmpty();
+		        $data['code'] = $notice['code'];
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理通知问题数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/03/01 09:20
+     */
+    public function count(): int
+    {
+        return SupervisionNoticeProblem::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionProblemLists.php

@@ -0,0 +1,85 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\auth\Admin;
+use app\common\model\supervision_work\SupervisionProblem;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 问题跟踪台账列表
+ * Class SupervisionProblemLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionProblemLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/28 09:19
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['data_id', 'data_type', 'problem_cate'],
+            '%like%' => ['problem_description', 'problem_name'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取问题跟踪台账列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/28 09:19
+     */
+    public function lists(): array
+    {
+        return SupervisionProblem::withoutField('update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
+		        $data['create_user_name'] = $create_user['name'];
+		        $data['problem_cate'] = strval($data['problem_cate']);
+		        $data['problem_cate_text'] = $data->problem_cate_text;
+		        $data['rectification_result_text'] = $data->rectification_result_text;
+		        $data['is_rectification_text'] = $data->is_rectification_text;
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取问题跟踪台账数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/28 09:19
+     */
+    public function count(): int
+    {
+        return SupervisionProblem::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionSideStationLists.php

@@ -0,0 +1,97 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\auth\Admin;
+use app\common\model\supervision_project\SupervisionParticipatingUnits;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionCheckItem;
+use app\common\model\supervision_work\SupervisionProblem;
+use app\common\model\supervision_work\SupervisionSideStation;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--旁站登记列表
+ * Class SupervisionSideStationLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionSideStationLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id', 'side_station_type'],
+            '%like%' => ['side_station_code'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--旁站登记列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function lists(): array
+    {
+        return SupervisionSideStation::withoutField('update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $check_item = SupervisionCheckItem::field('node_name')->where('id',$data['check_item_id'])->findOrEmpty();
+		        $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
+		        $check_item_detail = SupervisionCheckItem::where('id','in',$data['check_item_detail_ids'])->column('node_name');
+		        $create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+		        $data['check_item_name'] = $check_item['node_name'];
+		        $data['company_name'] = $company['unit_name'];
+		        $data['check_item_detail_name'] = implode(',',$check_item_detail);
+		        $data['create_user_name'] = $create_user['name'];
+		        $data['side_station_type_text'] = $data->side_station_type_text;
+		        $data['side_station_result_text'] = $data->side_station_result_text;
+		        $data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',2)->count();
+		        $data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',2)->where('is_rectification',1)->count();
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--旁站登记数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function count(): int
+    {
+        return SupervisionSideStation::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionSideStationResultLists.php

@@ -0,0 +1,79 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_work\SupervisionSideStationResult;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--旁站结果列表
+ * Class SupervisionSideStationResultLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionSideStationResultLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['side_station_id', 'must_check', 'check_result'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--旁站结果列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function lists(): array
+    {
+        return SupervisionSideStationResult::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $data['must_check_text'] = $data->must_check_text;
+		        $data['check_result_text'] = $data->check_result_text;
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--旁站结果数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/27 13:58
+     */
+    public function count(): int
+    {
+        return SupervisionSideStationResult::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionTestBlocksSpecimensLists.php

@@ -0,0 +1,91 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\auth\Admin;
+use app\common\model\supervision_project\SupervisionParticipatingUnits;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionProblem;
+use app\common\model\supervision_work\SupervisionTestBlocksSpecimens;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--试块试件见证列表
+ * Class SupervisionTestBlocksSpecimensLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionTestBlocksSpecimensLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/29 14:02
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id', 'test_result'],
+            '%like%' => ['test_type', 'code', 'witness', 'test_site'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--试块试件见证列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/29 14:02
+     */
+    public function lists(): array
+    {
+        return SupervisionTestBlocksSpecimens::withoutField('update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
+		        $create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+		        $data['company_name'] = $company['unit_name'];
+		        $data['create_user_name'] = $create_user['name'];
+		        $data['test_result_text'] = $data->test_result_text;
+		        $data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',6)->count();
+		        $data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',6)->where('is_rectification',1)->count();
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--试块试件见证数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/29 14:02
+     */
+    public function count(): int
+    {
+        return SupervisionTestBlocksSpecimens::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionWitnessSamplingDetailLists.php

@@ -0,0 +1,95 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_work\SupervisionMaterialEntry;
+use app\common\model\supervision_work\SupervisionMaterialEntryDetail;
+use app\common\model\supervision_work\SupervisionProblem;
+use app\common\model\supervision_work\SupervisionWitnessSampling;
+use app\common\model\supervision_work\SupervisionWitnessSamplingDetail;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--见证取样明细列表
+ * Class SupervisionWitnessSamplingDetailLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionWitnessSamplingDetailLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['witness_sampling_id', 'material_entry_detail_id', 'check_result'],
+            '%like%' => ['check_code', 'check_user'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--见证取样明细列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function lists(): array
+    {
+        return SupervisionWitnessSamplingDetail::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+				$witness_sampling = SupervisionWitnessSampling::field('sampling_date')->where('id',$data['witness_sampling_id'])->findOrEmpty();
+		        $material_entry_detail = SupervisionMaterialEntryDetail::field('material_entry_id,name,brand,model,contract_brand,entry_number')->where('id',$data['material_entry_detail_id'])->findOrEmpty();
+				$material_entry = SupervisionMaterialEntry::field('enter_time')->where('id',$material_entry_detail['material_entry_id'])->findOrEmpty();
+		        $data['name'] = $material_entry_detail['name'];
+		        $data['brand'] = $material_entry_detail['brand'];
+		        $data['model'] = $material_entry_detail['model'];
+		        $data['contract_brand_text'] = $material_entry_detail->contract_brand_text;
+		        $data['entry_number'] = $material_entry_detail['entry_number'];
+				$data['enter_time'] = $material_entry['enter_time'];
+				$data['sampling_date'] = $witness_sampling['sampling_date'];
+				$data['check_result_text'] = $data->check_result_text;
+		        $data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',5)->count();
+		        $data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',5)->where('is_rectification',1)->count();
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--见证取样明细数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function count(): int
+    {
+        return SupervisionWitnessSamplingDetail::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_project\SupervisionParticipatingUnits;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionMaterialEntry;
+use app\common\model\supervision_work\SupervisionWitnessSampling;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\supervision_work\SupervisionWitnessSamplingDetail;
+
+
+/**
+ * 工程监理--见证取样列表
+ * Class SupervisionWitnessSamplingLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function setSearch(): array
+    {
+	    return [
+		    '=' => ['project_id', 'material_entry_id'],
+		    '%like%' => ['code', 'witness', 'sampler'],
+	    ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--见证取样列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function lists(): array
+    {
+        return SupervisionWitnessSampling::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $material_entry = SupervisionMaterialEntry::field('code,theme,company_id,enter_time')->where('id',$data['material_entry_id'])->findOrEmpty();
+		        $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$material_entry['company_id'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+		        $data['company_name'] = $company['unit_name'];
+				$data['material_entry_code'] = $material_entry['code'];
+				$data['theme'] = $material_entry['theme'];
+		        $data['enter_time'] = $material_entry['enter_time'];
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--见证取样数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/29 09:22
+     */
+    public function count(): int
+    {
+        return SupervisionWitnessSamplingDetail::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionWorkContactLists.php

@@ -0,0 +1,82 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionWorkContact;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--监理工作联系单列表
+ * Class SupervisionWorkContactLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionWorkContactLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['project_id'],
+            '%like%' => ['code', 'initiator', 'theme', 'copy_user'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理工作联系单列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function lists(): array
+    {
+        return SupervisionWorkContact::where($this->searchWhere)
+            ->field(['id', 'project_id', 'code', 'initiator', 'initiation_date', 'theme', 'copy_user'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		        $data['project_name'] = $project['project_name'];
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理工作联系单数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function count(): int
+    {
+        return SupervisionWorkContact::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/supervision_work/SupervisionWorkContactProblemLists.php

@@ -0,0 +1,80 @@
+<?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\supervision_work;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\supervision_work\SupervisionWorkContact;
+use app\common\model\supervision_work\SupervisionWorkContactProblem;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 工程监理--监理工作联系单问题列表
+ * Class SupervisionWorkContactProblemLists
+ * @package app\adminapi\listssupervision_work
+ */
+class SupervisionWorkContactProblemLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['work_contact_id'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理工作联系单问题列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function lists(): array
+    {
+        return SupervisionWorkContactProblem::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function($data){
+		        $work_contact = SupervisionWorkContact::field('code')->where('id',$data['work_contact_id'])->findOrEmpty();
+		        $data['code'] = $work_contact['code'];
+	        })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取工程监理--监理工作联系单问题数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/03/01 11:01
+     */
+    public function count(): int
+    {
+        return SupervisionWorkContactProblem::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/lists/task/TaskAllocationLists.php

@@ -16,6 +16,7 @@ namespace app\adminapi\lists\task;
 
 
 use app\adminapi\lists\BaseAdminDataLists;
+use app\common\lists\ListsExcelInterface;
 use app\common\model\task\TaskAllocation;
 use app\common\lists\ListsSearchInterface;
 
@@ -25,7 +26,7 @@ use app\common\lists\ListsSearchInterface;
  * Class TaskAllocationLists
  * @package app\adminapi\liststask
  */
-class TaskAllocationLists extends BaseAdminDataLists implements ListsSearchInterface
+class TaskAllocationLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
 {
 
 
@@ -74,4 +75,25 @@ class TaskAllocationLists extends BaseAdminDataLists implements ListsSearchInter
         return TaskAllocation::where($this->searchWhere)->count();
     }
 
+    public function setFileName(): string
+    {
+        return '任务分配';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'task_type_id' => '任务类别id',
+            'cost_project_id' => '项目id',
+            'num' => '单据编号',
+            'apptime' => '登记日期',
+        ];
+    }
 }

app/adminapi/lists/task/TaskTypeLists.php

@@ -16,6 +16,7 @@ namespace app\adminapi\lists\task;
 
 
 use app\adminapi\lists\BaseAdminDataLists;
+use app\common\lists\ListsExcelInterface;
 use app\common\model\task\TaskType;
 use app\common\lists\ListsSearchInterface;
 
@@ -25,7 +26,7 @@ use app\common\lists\ListsSearchInterface;
  * Class TaskTypeLists
  * @package app\adminapi\liststask
  */
-class TaskTypeLists extends BaseAdminDataLists implements ListsSearchInterface
+class TaskTypeLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
 {
 
 
@@ -62,7 +63,6 @@ class TaskTypeLists extends BaseAdminDataLists implements ListsSearchInterface
                 if ($startTime && $endTime) {
                     $query->whereBetweenTime('create_time', $startTime.' 00:00:00', $endTime.' 23:59:59');
                 }})
-            ->field(['id', 'dataid', 'cost_project_id', 'num', 'name', 'superior_sort', 'level', 'remarks','create_time'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
@@ -80,5 +80,29 @@ class TaskTypeLists extends BaseAdminDataLists implements ListsSearchInterface
     {
         return TaskType::where($this->searchWhere)->count();
     }
+    public function setFileName(): string
+    {
+        return '任务类别';
+    }
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 段誉
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        return [
+            'id' => 'id',
+            'cost_project_id' => '项目id',
+            'num' => '任务编号',
+            'name' => '任务名称',
+            'superior_sort' => '上级类别',
+            'level' => '任务级次',
+            'remarks' => '备注'
+        ];
+    }
+
 
 }

app/adminapi/logic/ApprovalIssuanceAchievementDocumentsLogic.php

@@ -41,10 +41,9 @@ class ApprovalIssuanceAchievementDocumentsLogic extends BaseLogic
         Db::startTrans();
         try {
             ApprovalIssuanceAchievementDocuments::create([
-                'dataid' => $params['dataid'],
+                'dataid' => generate_sn(ApprovalIssuanceAchievementDocuments::class, 'dataid'),
-                'num' => $params['num'],
+                'num' => generate_sn(ApprovalIssuanceAchievementDocuments::class, 'num'),
-                'project' => $params['project'],
+                'project_id' => $params['project_id'],
-                'project_num' => $params['project_num'],
                 'task' => $params['task'],
                 'processes' => $params['processes'],
                 'number' => $params['number'],
@@ -78,10 +77,7 @@ class ApprovalIssuanceAchievementDocumentsLogic extends BaseLogic
         Db::startTrans();
         try {
             ApprovalIssuanceAchievementDocuments::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
+                'project_id' => $params['project_id'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
                 'task' => $params['task'],
                 'processes' => $params['processes'],
                 'number' => $params['number'],

app/adminapi/logic/DataReceptionLogic.php

@@ -41,22 +41,21 @@ class DataReceptionLogic extends BaseLogic
         Db::startTrans();
         try {
             DataReception::create([
-                'dataid' => $params['dataid'],
+                'dataid' => generate_sn(DataReception::class, 'dataid'),
-                'num' => $params['num'],
+                'num' => generate_sn(DataReception::class, 'num'),
-                'project' => $params['project'],
+                'project_id' => $params['project_id'],
-                'project_num' => $params['project_num'],
                 'apptime' => $params['apptime'],
                 'person' => $params['person'],
                 'number' => $params['number'],
                 'position' => $params['position'],
                 'tips' => $params['tips'],
-                'bidding_file' => $params['bidding_file'],
+                'bidding_file' => json_encode($params['bidding_file']),
-                'zbkzj_file' => $params['zbkzj_file'],
+                'zbkzj_file' => json_encode($params['zbkzj_file']),
-                'gczjht_file' => $params['gczjht_file'],
+                'gczjht_file' => json_encode($params['gczjht_file']),
-                'xmbgqzzl_file' => $params['xmbgqzzl_file'],
+                'xmbgqzzl_file' => json_encode($params['xmbgqzzl_file']),
-                'ssgsysjs_file' => $params['ssgsysjs_file'],
+                'ssgsysjs_file' => json_encode($params['ssgsysjs_file']),
-                'wlhj_file' => $params['wlhj_file'],
+                'wlhj_file' => json_encode($params['wlhj_file']),
-                'other_file' => $params['other_file'],
+                'other_file' => json_encode($params['other_file']),
             ]);
 
             Db::commit();
@@ -81,22 +80,19 @@ class DataReceptionLogic extends BaseLogic
         Db::startTrans();
         try {
             DataReception::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
+                'project_id' => $params['project_id'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
                 'apptime' => $params['apptime'],
                 'person' => $params['person'],
                 'number' => $params['number'],
                 'position' => $params['position'],
                 'tips' => $params['tips'],
-                'bidding_file' => $params['bidding_file'],
+                'bidding_file' => json_encode($params['bidding_file']),
-                'zbkzj_file' => $params['zbkzj_file'],
+                'zbkzj_file' => json_encode($params['zbkzj_file']),
-                'gczjht_file' => $params['gczjht_file'],
+                'gczjht_file' => json_encode($params['gczjht_file']),
-                'xmbgqzzl_file' => $params['xmbgqzzl_file'],
+                'xmbgqzzl_file' => json_encode($params['xmbgqzzl_file']),
-                'ssgsysjs_file' => $params['ssgsysjs_file'],
+                'ssgsysjs_file' => json_encode($params['ssgsysjs_file']),
-                'wlhj_file' => $params['wlhj_file'],
+                'wlhj_file' => json_encode($params['wlhj_file']),
-                'other_file' => $params['other_file'],
+                'other_file' => json_encode($params['other_file']),
             ]);
 
             Db::commit();
@@ -131,6 +127,14 @@ class DataReceptionLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return DataReception::findOrEmpty($params['id'])->toArray();
+        $data = DataReception::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data['bidding_file'] = json_decode($data['bidding_file'], true);
+        $data['zbkzj_file'] = json_decode($data['zbkzj_file'], true);
+        $data['gczjht_file'] = json_decode($data['gczjht_file'], true);
+        $data['xmbgqzzl_file'] = json_decode($data['xmbgqzzl_file'], true);
+        $data['ssgsysjs_file'] = json_decode($data['ssgsysjs_file'], true);
+        $data['wlhj_file'] = json_decode($data['wlhj_file'], true);
+        $data['other_file'] = json_decode($data['other_file'], true);
+        return $data;
     }
 }

app/adminapi/logic/ProjectCommissionDetailLogic.php

@@ -41,7 +41,7 @@ class ProjectCommissionDetailLogic extends BaseLogic
         Db::startTrans();
         try {
             ProjectCommissionDetail::create([
-                'project_commission_dataid' => $params['project_commission_dataid'],
+                'project_commission_id' => $params['project_commission_id'],
                 'engineer' => $params['engineer'],
                 'engineer_id' => $params['engineer_id'],
                 'task_name' => $params['task_name'],
@@ -78,7 +78,6 @@ class ProjectCommissionDetailLogic extends BaseLogic
         Db::startTrans();
         try {
             ProjectCommissionDetail::where('id', $params['id'])->update([
-                'project_commission_dataid' => $params['project_commission_dataid'],
                 'engineer' => $params['engineer'],
                 'engineer_id' => $params['engineer_id'],
                 'task_name' => $params['task_name'],

app/adminapi/logic/ProjectCommissionLogic.php

@@ -17,6 +17,7 @@ namespace app\adminapi\logic;
 
 use app\common\model\ProjectCommission;
 use app\common\logic\BaseLogic;
+use app\common\model\ProjectCommissionDetail;
 use think\facade\Db;
 
 
@@ -40,12 +41,10 @@ class ProjectCommissionLogic extends BaseLogic
     {
         Db::startTrans();
         try {
-            ProjectCommission::create([
+            $projectCommission = ProjectCommission::create([
-                'dataid' => $params['dataid'],
+                'dataid' => generate_sn(ProjectCommission::class,'dataid'),
-                'num' => $params['num'],
+                'num' => generate_sn(ProjectCommission::class,'num'),
-                'project' => $params['project'],
+                'project_id' => $params['project_id'],
-                'project_num' => $params['project_num'],
-                'head' => $params['head'],
                 'affcontract' => $params['affcontract'],
                 'industry' => $params['industry'],
                 'hk' => $params['hk'],
@@ -58,6 +57,10 @@ class ProjectCommissionLogic extends BaseLogic
                 'remark' => $params['remark'],
             ]);
 
+            foreach ($params['project_commission_detail'] as $item) {
+                $item['project_commission_id'] = $projectCommission->id;
+                ProjectCommissionDetailLogic::add($item);
+            }
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -80,11 +83,7 @@ class ProjectCommissionLogic extends BaseLogic
         Db::startTrans();
         try {
             ProjectCommission::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
+                'project_id' => $params['project_id'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
-                'head' => $params['head'],
                 'affcontract' => $params['affcontract'],
                 'industry' => $params['industry'],
                 'hk' => $params['hk'],
@@ -129,6 +128,8 @@ class ProjectCommissionLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return ProjectCommission::findOrEmpty($params['id'])->toArray();
+        $data = ProjectCommission::with(['projectInfo', 'contract'])->findOrEmpty($params['id'])->toArray();
+        $data['project_commission_detail'] = ProjectCommissionDetail::where('project_commission_id', $params['id'])->select()->toArray();
+        return $data;
     }
 }

app/adminapi/logic/TaskDetailLogic.php

@@ -41,7 +41,7 @@ class TaskDetailLogic extends BaseLogic
         Db::startTrans();
         try {
             TaskDetail::create([
-                'task_allocation_id' => $params['task_allocation_dataid'],
+                'task_allocation_id' => $params['task_allocation_id'],
                 'task_type_id' => $params['task_type_id'],
                 'process' => $params['process'],
                 'professional_type' => $params['professional_type'],
@@ -89,8 +89,6 @@ class TaskDetailLogic extends BaseLogic
         Db::startTrans();
         try {
             TaskDetail::where('id', $params['id'])->update([
-                'task_allocation_id' => $params['task_allocation_dataid'],
-                'task_type_id' => $params['task_type_id'],
                 'process' => $params['process'],
                 'professional_type' => $params['professional_type'],
                 'engineer' => $params['engineer'],

app/adminapi/logic/TaskHandlingThreeLevelReviewLogic.php

@@ -38,13 +38,13 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic
      */
     public static function add(array $params): bool
     {
+
         Db::startTrans();
         try {
             TaskHandlingThreeLevelReview::create([
-                'dataid' => $params['dataid'],
+                'dataid' => generate_sn(TaskHandlingThreeLevelReview::class, 'dataid'),
-                'num' => $params['num'],
+                'num' => generate_sn(TaskHandlingThreeLevelReview::class, 'num'),
-                'project' => $params['project'],
+                'project_id' => $params['project_id'],
-                'project_num' => $params['project_num'],
                 'task' => $params['task'],
                 'processes' => $params['processes'],
                 'rtype' => $params['rtype'],
@@ -74,10 +74,10 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic
                 'kaigong' => $params['kaigong'],
                 'jungong' => $params['jungong'],
                 'bz' => $params['bz'],
-                'result_file' => $params['result_file'],
+                'result_file' => json_encode($params['result_file']),
-                'master_annex' => $params['master_annex'],
+                'master_annex' => json_encode($params['master_annex']),
-                'bm_annex' => $params['bm_annex'],
+                'bm_annex' => json_encode($params['bm_annex']),
-                'shb_annex' => $params['shb_annex'],
+                'shb_annex' => json_encode($params['shb_annex'])
             ]);
 
             Db::commit();
@@ -102,10 +102,7 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic
         Db::startTrans();
         try {
             TaskHandlingThreeLevelReview::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
+                'project_id' => $params['project_id'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
                 'task' => $params['task'],
                 'processes' => $params['processes'],
                 'rtype' => $params['rtype'],
@@ -135,10 +132,10 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic
                 'kaigong' => $params['kaigong'],
                 'jungong' => $params['jungong'],
                 'bz' => $params['bz'],
-                'result_file' => $params['result_file'],
+                'result_file' => json_encode($params['result_file']),
-                'master_annex' => $params['master_annex'],
+                'master_annex' => json_encode($params['master_annex']),
-                'bm_annex' => $params['bm_annex'],
+                'bm_annex' => json_encode($params['bm_annex']),
-                'shb_annex' => $params['shb_annex'],
+                'shb_annex' => json_encode($params['shb_annex'])
             ]);
 
             Db::commit();
@@ -173,6 +170,11 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return TaskHandlingThreeLevelReview::findOrEmpty($params['id'])->toArray();
+        $data =  TaskHandlingThreeLevelReview::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data['result_file'] = json_decode($data['result_file'], true);
+        $data['master_annex'] = json_decode($data['master_annex'], true);
+        $data['bm_annex'] = json_decode($data['bm_annex'], true);
+        $data['shb_annex'] = json_decode($data['shb_annex'], true);
+        return $data;
     }
 }

app/adminapi/logic/cost_project/CostApprovedProjectLogic.php

@@ -28,6 +28,7 @@ class CostApprovedProjectLogic extends BaseLogic
             CostApprovedProject::create([
                 'contract_name' => $params['contract_name'],
                 'contract_num' => date('Ymd',time()).'-'.mt_rand(100000, 999999),
+                'contract_type' => $params['contract_type'],
                 'part_a' => $params['part_a'],
                 'part_a_contract' => $params['part_a_contract'] ?? '',
                 'part_a_address' => $params['part_a_address'] ?? '',
@@ -88,6 +89,7 @@ class CostApprovedProjectLogic extends BaseLogic
         Db::startTrans();
         try {
             CostApprovedProject::where('id', $params['id'])->update([
+                'contract_type' => $params['contract_type'],
 	            'contract_name' => $params['contract_name'],
 	            'part_a' => $params['part_a'],
 	            'part_a_contract' => $params['part_a_contract'] ?? '',

app/adminapi/logic/cost_project/CostProjectLogic.php

@@ -61,6 +61,7 @@ class CostProjectLogic extends BaseLogic
                 'cost' => $params['cost'],
                 'approval' => $params['approval'],
                 'aunit' => $params['aunit'],
+                'js_unit' => $params['js_unit'],
                 'Acontact' => $params['Acontact'],
                 'acontactnum' => $params['acontactnum'],
                 'date' => $params['date'],
@@ -112,6 +113,7 @@ class CostProjectLogic extends BaseLogic
                 'cost' => $params['cost'],
                 'approval' => $params['approval'],
                 'aunit' => $params['aunit'],
+                'js_unit' => $params['js_unit'],
                 'Acontact' => $params['Acontact'],
                 'acontactnum' => $params['acontactnum'],
                 'date' => $params['date'],

app/adminapi/logic/material/MaterialClassifyLogic.php

@@ -89,6 +89,11 @@ class MaterialClassifyLogic extends BaseLogic
      */
     public static function delete(array $params): bool
     {
+		$data = MaterialClassify::where('pid',$params['id'])->findOrEmpty();
+		if(!$data->isEmpty()){
+			self::setError('当前分类下存在子分类,须先删除子分类');
+			return false;
+		}
         return MaterialClassify::destroy($params['id']);
     }
 

app/adminapi/logic/project_process_management/ApplyWithSealLogic.php

@@ -41,18 +41,18 @@ class ApplyWithSealLogic extends BaseLogic
         Db::startTrans();
         try {
             ApplyWithSeal::create([
-                'dataid' => $params['dataid'],
+                'dataid' => generate_sn(ApplyWithSeal::class, 'dataid'),
-                'num' => $params['num'],
+                'num' => generate_sn(ApplyWithSeal::class, 'num'),
                 'types' => $params['types'],
                 'filetype' => $params['filetype'],
                 'ridingseam' => $params['ridingseam'],
                 'name' => $params['name'],
                 'frequency' => $params['frequency'],
                 'limit' => $params['limit'],
+                'org_id' => $params['org_id'],
                 'depar' => $params['depar'],
                 'stampman' => $params['stampman'],
-                'project' => $params['project'],
+                'project_id' => $params['project_id'],
-                'principal' => $params['principal'],
                 'content' => $params['content'],
                 'loan' => $params['loan'],
                 'borrow' => $params['borrow'],
@@ -63,7 +63,7 @@ class ApplyWithSealLogic extends BaseLogic
                 'sjborrower' => $params['sjborrower'],
                 'sjreturn' => $params['sjreturn'],
                 'returnee' => $params['returnee'],
-                'annex' => $params['annex'],
+                'annex' => json_encode($params['annex']),
             ]);
 
             Db::commit();
@@ -88,18 +88,16 @@ class ApplyWithSealLogic extends BaseLogic
         Db::startTrans();
         try {
             ApplyWithSeal::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
-                'num' => $params['num'],
                 'types' => $params['types'],
                 'filetype' => $params['filetype'],
                 'ridingseam' => $params['ridingseam'],
                 'name' => $params['name'],
                 'frequency' => $params['frequency'],
                 'limit' => $params['limit'],
+                'org_id' => $params['org_id'],
                 'depar' => $params['depar'],
                 'stampman' => $params['stampman'],
-                'project' => $params['project'],
+                'project_id' => $params['project_id'],
-                'principal' => $params['principal'],
                 'content' => $params['content'],
                 'loan' => $params['loan'],
                 'borrow' => $params['borrow'],
@@ -110,7 +108,7 @@ class ApplyWithSealLogic extends BaseLogic
                 'sjborrower' => $params['sjborrower'],
                 'sjreturn' => $params['sjreturn'],
                 'returnee' => $params['returnee'],
-                'annex' => $params['annex'],
+                'annex' => json_encode($params['annex'])
             ]);
 
             Db::commit();
@@ -145,6 +143,8 @@ class ApplyWithSealLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return ApplyWithSeal::findOrEmpty($params['id'])->toArray();
+        $data = ApplyWithSeal::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data['annex'] = json_decode($data['annex'], true);
+        return $data;
     }
 }

app/adminapi/logic/project_process_management/JianliProjectProgressReportLogic.php

@@ -41,10 +41,9 @@ class JianliProjectProgressReportLogic extends BaseLogic
         Db::startTrans();
         try {
             JianliProjectProgressReport::create([
-                'dataid' => $params['dataid'],
+                'dataid' => generate_sn(JianliProjectProgressReport::class, 'dataid'),
-                'num' => $params['num'],
+                'num' => generate_sn(JianliProjectProgressReport::class, 'num'),
-                'project' => $params['project'],
+                'project_id' => $params['project_id'],
-                'project_num' => $params['project_num'],
                 'bm_master' => $params['bm_master'],
                 'wt_unit' => $params['wt_unit'],
                 'xm_master' => $params['xm_master'],
@@ -57,7 +56,7 @@ class JianliProjectProgressReportLogic extends BaseLogic
                 'djr' => $params['djr'],
                 'apptime' => $params['apptime'],
                 'jdms' => $params['jdms'],
-                'datas' => $params['datas'],
+                'annex' => json_encode($params['annex']),
                 'fd_23' => $params['fd_23'],
             ]);
 
@@ -83,10 +82,7 @@ class JianliProjectProgressReportLogic extends BaseLogic
         Db::startTrans();
         try {
             JianliProjectProgressReport::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
+                'project_id' => $params['project_id'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
                 'bm_master' => $params['bm_master'],
                 'wt_unit' => $params['wt_unit'],
                 'xm_master' => $params['xm_master'],
@@ -99,7 +95,7 @@ class JianliProjectProgressReportLogic extends BaseLogic
                 'djr' => $params['djr'],
                 'apptime' => $params['apptime'],
                 'jdms' => $params['jdms'],
-                'datas' => $params['datas'],
+                'annex' => json_encode($params['annex']),
                 'fd_23' => $params['fd_23'],
             ]);
 
@@ -135,6 +131,8 @@ class JianliProjectProgressReportLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return JianliProjectProgressReport::findOrEmpty($params['id'])->toArray();
+        $data = JianliProjectProgressReport::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data['annex'] = json_decode($data['annex'], true);
+        return $data;
     }
 }

app/adminapi/logic/project_process_management/ProjectChangeVisaContentLogic.php

@@ -41,7 +41,7 @@ class ProjectChangeVisaContentLogic extends BaseLogic
         Db::startTrans();
         try {
             ProjectChangeVisaContent::create([
-                'project_change_visa_dataid' => $params['project_change_visa_dataid'],
+                'project_change_visa_id' => $params['project_change_visa_id'],
                 'directory' => $params['directory'],
                 'unit_name' => $params['unit_name'],
                 'time' => $params['time'],

app/adminapi/logic/project_process_management/ProjectChangeVisaLogic.php

@@ -17,6 +17,7 @@ namespace app\adminapi\logic\project_process_management;
 
 use app\common\model\project_process_management\ProjectChangeVisa;
 use app\common\logic\BaseLogic;
+use app\common\model\project_process_management\ProjectChangeVisaContent;
 use think\facade\Db;
 
 
@@ -40,15 +41,17 @@ class ProjectChangeVisaLogic extends BaseLogic
     {
         Db::startTrans();
         try {
-            ProjectChangeVisa::create([
+            $projectChangeVisa = ProjectChangeVisa::create([
-                'dataid' => $params['dataid'],
+                'dataid' => generate_sn(ProjectChangeVisa::class, 'dataid'),
-                'num' => $params['num'],
+                'num' => generate_sn(ProjectChangeVisa::class, 'num'),
-                'project' => $params['project'],
+                'project_id' => $params['project_id'],
-                'project_num' => $params['project_num'],
                 'djr' => $params['djr'],
                 'djrq' => $params['djrq'],
             ]);
-
+            foreach ($params['project_change_visa_content'] as $item) {
+                $item['project_change_visa_id'] = $projectChangeVisa->id;
+                ProjectChangeVisaContentLogic::add($item);
+            }
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -71,10 +74,7 @@ class ProjectChangeVisaLogic extends BaseLogic
         Db::startTrans();
         try {
             ProjectChangeVisa::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
+                'project_id' => $params['project_id'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
                 'djr' => $params['djr'],
                 'djrq' => $params['djrq'],
             ]);
@@ -111,6 +111,8 @@ class ProjectChangeVisaLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return ProjectChangeVisa::findOrEmpty($params['id'])->toArray();
+        $data =  ProjectChangeVisa::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data['project_change_visa_content'] = ProjectChangeVisaContent::where('project_change_visa_id', $data['id'])->select();
+        return $data;
     }
 }

app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php

@@ -17,6 +17,7 @@ namespace app\adminapi\logic\project_process_management;
 
 use app\common\model\project_process_management\ProjectProgressPayment;
 use app\common\logic\BaseLogic;
+use app\common\model\project_process_management\ProjectProgressPaymentDetail;
 use think\facade\Db;
 
 
@@ -40,19 +41,21 @@ class ProjectProgressPaymentLogic extends BaseLogic
     {
         Db::startTrans();
         try {
-            ProjectProgressPayment::create([
+            $p = ProjectProgressPayment::create([
-                'dataid' => $params['dataid'],
+                'dataid' => generate_sn(ProjectProgressPayment::class, 'dataid'),
-                'num' => $params['num'],
+                'num' => generate_sn(ProjectProgressPayment::class, 'num'),
-                'project' => $params['project'],
+                'project_id' => $params['project_id'],
-                'project_num' => $params['project_num'],
                 'djr' => $params['djr'],
                 'djrq' => $params['djrq'],
                 'sbhj' => $params['sbhj'],
                 'shhj' => $params['shhj'],
                 'ljhj' => $params['ljhj'],
-                'annex' => $params['annex'],
+                'annex' => json_encode($params['annex'])
             ]);
-
+            foreach ($params['project_progress_payment_detail'] as $item) {
+                $item['project_progress_payment_id'] = $p->id;
+                ProjectProgressPaymentDetailLogic::add($item);
+            }
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -75,16 +78,13 @@ class ProjectProgressPaymentLogic extends BaseLogic
         Db::startTrans();
         try {
             ProjectProgressPayment::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
+                'project_id' => $params['project_id'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
                 'djr' => $params['djr'],
                 'djrq' => $params['djrq'],
                 'sbhj' => $params['sbhj'],
                 'shhj' => $params['shhj'],
                 'ljhj' => $params['ljhj'],
-                'annex' => $params['annex'],
+                'annex' => json_encode($params['annex'])
             ]);
 
             Db::commit();
@@ -119,6 +119,9 @@ class ProjectProgressPaymentLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return ProjectProgressPayment::findOrEmpty($params['id'])->toArray();
+        $data = ProjectProgressPayment::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data['annex'] = json_decode($data['annex'], true);
+        $data['project_progress_payment_detail'] = ProjectProgressPaymentDetail::where('project_progress_payment_id', $data['id'])->select();
+        return $data;
     }
 }

app/adminapi/logic/project_process_management/ProjectRectificationLogic.php

@@ -41,10 +41,9 @@ class ProjectRectificationLogic extends BaseLogic
         Db::startTrans();
         try {
             ProjectRectification::create([
-                'dataid' => $params['dataid'],
+                'dataid' => generate_sn(ProjectRectification::class, 'dataid'),
-                'num' => $params['num'],
+                'num' => generate_sn(ProjectRectification::class, 'num'),
-                'project' => $params['project'],
+                'project_id' => $params['project_id'],
-                'project_num' => $params['project_num'],
                 'wt_unit' => $params['wt_unit'],
                 'xm_master' => $params['xm_master'],
                 'zx_type' => $params['zx_type'],
@@ -79,10 +78,7 @@ class ProjectRectificationLogic extends BaseLogic
         Db::startTrans();
         try {
             ProjectRectification::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
+                'project_id' => $params['project_id'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
                 'wt_unit' => $params['wt_unit'],
                 'xm_master' => $params['xm_master'],
                 'zx_type' => $params['zx_type'],
@@ -127,6 +123,6 @@ class ProjectRectificationLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return ProjectRectification::findOrEmpty($params['id'])->toArray();
+        return ProjectRectification::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
     }
 }

app/adminapi/logic/project_process_management/ProjectSurveySignatureLogic.php

@@ -41,10 +41,9 @@ class ProjectSurveySignatureLogic extends BaseLogic
         Db::startTrans();
         try {
             ProjectSurveySignature::create([
-                'dataid' => $params['dataid'],
+                'dataid' => generate_sn(ProjectSurveySignature::class, 'dataid'),
-                'num' => $params['num'],
+                'num' => generate_sn(ProjectSurveySignature::class, 'num'),
-                'project' => $params['project'],
+                'project_id' => $params['project_id'],
-                'project_num' => $params['project_num'],
                 'wt_unit' => $params['wt_unit'],
                 'jsdw' => $params['jsdw'],
                 'bmfz' => $params['bmfz'],
@@ -56,6 +55,7 @@ class ProjectSurveySignatureLogic extends BaseLogic
                 'content' => $params['content'],
                 'result' => $params['result'],
                 'remark' => $params['remark'],
+                'annex'  => json_encode($params['annex'])
             ]);
 
             Db::commit();
@@ -80,10 +80,7 @@ class ProjectSurveySignatureLogic extends BaseLogic
         Db::startTrans();
         try {
             ProjectSurveySignature::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
+                'project_id' => $params['project_id'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
                 'wt_unit' => $params['wt_unit'],
                 'jsdw' => $params['jsdw'],
                 'bmfz' => $params['bmfz'],
@@ -95,6 +92,7 @@ class ProjectSurveySignatureLogic extends BaseLogic
                 'content' => $params['content'],
                 'result' => $params['result'],
                 'remark' => $params['remark'],
+                'annex'  => json_encode($params['annex'])
             ]);
 
             Db::commit();
@@ -129,6 +127,8 @@ class ProjectSurveySignatureLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return ProjectSurveySignature::findOrEmpty($params['id'])->toArray();
+        $data = ProjectSurveySignature::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data['annex'] = json_decode($data['annex'], true);
+        return $data;
     }
 }

app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringCaseLogic.php

@@ -0,0 +1,136 @@
+<?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\supervision_dangerous;
+
+
+use app\common\model\auth\Admin;
+use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase;
+use app\common\logic\BaseLogic;
+use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
+use app\common\model\supervision_project\SupervisionProject;
+use think\facade\Db;
+
+
+/**
+ * 工程监理--危大方案提交列表逻辑
+ * Class SupervisionDangerousEngineeringCaseLogic
+ * @package app\adminapi\logic\supervision_dangerous
+ */
+class SupervisionDangerousEngineeringCaseLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加工程监理--危大方案提交列表
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2024/03/04 14:00
+     */
+    public static function add(array $params,$admin_id): bool
+    {
+		$dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::where('id',$params['dangerous_engineering_monitoring_id'])->findOrEmpty();
+		if($dangerous_engineering_monitoring['status'] != 0){
+			self::setError('当前危大工程监控信息已提交方案');
+			return false;
+		}
+        Db::startTrans();
+        try {
+            SupervisionDangerousEngineeringCase::create([
+                'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'],
+                'case_name' => $params['case_name'],
+                'assessor' => $params['assessor'],
+                'review_content' => $params['review_content'],
+                'remark' => $params['remark'],
+                'annex' => $params['annex'] ? json_encode($params['annex']) : null,
+                'create_user' => $admin_id
+            ]);
+	        SupervisionDangerousEngineeringMonitoring::where('id',$params['dangerous_engineering_monitoring_id'])->update([
+				'status' => 1,
+		        '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 2024/03/04 14:00
+     */
+    public static function edit(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            SupervisionDangerousEngineeringCase::where('id', $params['id'])->update([
+	            'case_name' => $params['case_name'],
+	            'assessor' => $params['assessor'],
+	            'review_content' => $params['review_content'],
+	            'remark' => $params['remark'],
+	            'annex' => $params['annex'] ? json_encode($params['annex']) : null,
+	            '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 2024/03/04 14:00
+     */
+    public static function delete(array $params): bool
+    {
+        return SupervisionDangerousEngineeringCase::destroy($params['id']);
+    }
+
+
+    /**
+     * @notes 获取工程监理--危大方案提交列表详情
+     * @param $params
+     * @return array
+     * @author likeadmin
+     * @date 2024/03/04 14:00
+     */
+    public static function detail($params): array
+    {
+		$data = SupervisionDangerousEngineeringCase::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
+	    $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project')->where('id',$data['dangerous_engineering_monitoring_id'])->findOrEmpty();
+		$project = SupervisionProject::field('project_name')->where('id',$dangerous_engineering_monitoring['project_id'])->findOrEmpty();
+		$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
+		$data['dangerous_engineering_monitoring_title'] = $project['project_name'];
+		$data['project_name'] = $project['project_name'];
+		$data['type'] = $dangerous_engineering_monitoring->type_text;
+		$data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text;
+		$data['create_user_name'] = $create_user['name'];
+        return $data->toArray();
+    }
+}

app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLogic.php

@@ -0,0 +1,131 @@
+<?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\supervision_dangerous;
+
+
+use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
+use app\common\logic\BaseLogic;
+use app\common\model\supervision_project\SupervisionProject;
+use app\common\model\supervision_work\SupervisionCheckItem;
+use think\facade\Db;
+
+
+/**
+ * 工程监理--危大工程监控逻辑
+ * Class SupervisionDangerousEngineeringMonitoringLogic
+ * @package app\adminapi\logic\supervision_dangerous
+ */
+class SupervisionDangerousEngineeringMonitoringLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加工程监理--危大工程监控
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2024/03/04 11:05
+     */
+    public static function add(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            SupervisionDangerousEngineeringMonitoring::create([
+                'project_id' => $params['project_id'],
+                'type' => $params['type'],
+                'partial_project' => $params['partial_project'],
+                'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0,
+                'check_item_id' => $params['check_item_id'],
+                'position' => $params['position'],
+                'project_characteristics' => $params['project_characteristics'],
+                'supervisor' => $params['supervisor'],
+                'responsible_person' => $params['responsible_person']
+            ]);
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 编辑工程监理--危大工程监控
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2024/03/04 11:05
+     */
+    public static function edit(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            SupervisionDangerousEngineeringMonitoring::where('id', $params['id'])->update([
+	            'project_id' => $params['project_id'],
+	            'type' => $params['type'],
+	            'partial_project' => $params['partial_project'],
+	            'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0,
+	            'check_item_id' => $params['check_item_id'],
+	            'position' => $params['position'],
+	            'project_characteristics' => $params['project_characteristics'],
+	            'supervisor' => $params['supervisor'],
+	            'responsible_person' => $params['responsible_person'],
+	            '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 2024/03/04 11:05
+     */
+    public static function delete(array $params): bool
+    {
+		// todo
+        return SupervisionDangerousEngineeringMonitoring::destroy($params['id']);
+    }
+
+
+    /**
+     * @notes 获取工程监理--危大工程监控详情
+     * @param $params
+     * @return array
+     * @author likeadmin
+     * @date 2024/03/04 11:05
+     */
+    public static function detail($params): array
+    {
+		$data = SupervisionDangerousEngineeringMonitoring::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
+	    $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+		$node = SupervisionCheckItem::field('node_name')->where('id',$data['check_item_id'])->findOrEmpty();
+	    $data['project_name'] = $project['project_name'];
+		$data['node_name'] = $node['node_name'];
+	    $data['partial_project_text'] = $data->partial_project_text;
+	    $data['type_text'] = $data->type_text;
+        return $data->toArray();
+    }
+}

app/adminapi/logic/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLogic.php

@@ -0,0 +1,155 @@
+<?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\supervision_dangerous;
+
+
+use app\common\model\auth\Admin;
+use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring;
+use app\common\logic\BaseLogic;
+use app\common\model\supervision_project\SupervisionProject;
+use think\facade\Db;
+
+
+/**
+ * 工程监理--超规模危险性较大工程安全监控逻辑
+ * Class SupervisionExcessRiskSecurityMonitoringLogic
+ * @package app\adminapi\logic\supervision_dangerous
+ */
+class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加工程监理--超规模危险性较大工程安全监控
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2024/03/04 10:11
+     */
+    public static function add(array $params,$admin_id): bool
+    {
+        Db::startTrans();
+        try {
+            SupervisionExcessRiskSecurityMonitoring::create([
+                'project_id' => $params['project_id'],
+                'partial_project' => $params['partial_project'],
+                'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0,
+                'project_characteristics' => $params['project_characteristics'],
+                'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0,
+                'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0,
+                'is_discuss' => $params['is_discuss'],
+                'is_modify' => $params['is_modify'],
+                'is_agree' => $params['is_agree'],
+                'is_accept' => $params['is_accept'],
+                'is_accept_to_plan' => $params['is_accept_to_plan'],
+                'check_user' => $params['check_user'],
+                'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0,
+                'problems_rectification' => $params['problems_rectification'],
+                'responsible_person' => $params['responsible_person'],
+                'exceed_the_control_value' => $params['exceed_the_control_value'],
+                'exceed_the_warning_value' => $params['exceed_the_warning_value'],
+                'control_measures' => $params['control_measures'],
+                'create_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 2024/03/04 10:11
+     */
+    public static function edit(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            SupervisionExcessRiskSecurityMonitoring::where('id', $params['id'])->update([
+	            'project_id' => $params['project_id'],
+	            'partial_project' => $params['partial_project'],
+	            'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0,
+	            'project_characteristics' => $params['project_characteristics'],
+	            'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0,
+	            'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0,
+	            'is_discuss' => $params['is_discuss'],
+	            'is_modify' => $params['is_modify'],
+	            'is_agree' => $params['is_agree'],
+	            'is_accept' => $params['is_accept'],
+	            'is_accept_to_plan' => $params['is_accept_to_plan'],
+	            'check_user' => $params['check_user'],
+	            'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0,
+	            'problems_rectification' => $params['problems_rectification'],
+	            'responsible_person' => $params['responsible_person'],
+	            'exceed_the_control_value' => $params['exceed_the_control_value'],
+	            'exceed_the_warning_value' => $params['exceed_the_warning_value'],
+	            'control_measures' => $params['control_measures'],
+	            '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 2024/03/04 10:11
+     */
+    public static function delete(array $params): bool
+    {
+        return SupervisionExcessRiskSecurityMonitoring::destroy($params['id']);
+    }
+
+
+    /**
+     * @notes 获取工程监理--超规模危险性较大工程安全监控详情
+     * @param $params
+     * @return array
+     * @author likeadmin
+     * @date 2024/03/04 10:11
+     */
+    public static function detail($params): array
+    {
+		$data = SupervisionExcessRiskSecurityMonitoring::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
+	    $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
+	    $admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
+	    $data['project_name'] = $project['project_name'];
+	    $data['create_user_name'] = $admin['name'];
+	    $data['partial_project_text'] = $data->partial_project_text;
+	    $data['is_discuss_text'] = $data->is_discuss_text;
+	    $data['is_modify_text'] = $data->is_modify_text;
+	    $data['is_agree_text'] = $data->is_agree_text;
+	    $data['is_accept_text'] = $data->is_accept_text;
+	    $data['is_accept_to_plan_text'] = $data->is_accept_to_plan_text;
+	    $data['exceed_the_control_value_text'] = $data->exceed_the_control_value_text;
+	    $data['exceed_the_warning_value_text'] = $data->exceed_the_warning_value_text;
+        return $data->toArray();
+    }
+}