del - 租户-去掉多余控制器

app/tenantapi/controller/master_worker/BankAccountController.php

@@ -1,119 +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\tenantapi\controller\master_worker;
-
-
-use app\tenantapi\controller\BaseAdminController;
-use app\tenantapi\lists\master_worker\BankAccountLists;
-use app\tenantapi\logic\master_worker\BankAccountLogic;
-use app\tenantapi\validate\master_worker\BankAccountValidate;
-use app\common\logic\MasterWorkerExamineLogic;
-
-
-/**
- * BankAccount控制器
- * Class BankAccountController
- * @package app\tenantapi\controller\master_worker
- */
-class BankAccountController extends BaseAdminController
-{
-
-
-    /**
-     * @notes 获取列表
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/10/08 09:41
-     */
-    public function lists()
-    {
-        return $this->dataLists(new BankAccountLists());
-    }
-
-
-    /**
-     * @notes 添加
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/10/08 09:41
-     */
-    public function add()
-    {
-        $params = (new BankAccountValidate())->post()->goCheck('add');
-        $result = BankAccountLogic::add($params);
-        if (true === $result) {
-            MasterWorkerExamineLogic::updateEngineerInformation($params['worker_id']);
-            return $this->success('添加成功', [], 1, 1);
-        }
-        return $this->fail(BankAccountLogic::getError());
-    }
-
-
-    /**
-     * @notes 编辑
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/10/08 09:41
-     */
-    public function edit()
-    {
-        $params = (new BankAccountValidate())->post()->goCheck('edit');
-        $result = BankAccountLogic::edit($params);
-        if (true === $result) {
-            MasterWorkerExamineLogic::updateEngineerInformation($params['worker_id']);
-            return $this->success('编辑成功', [], 1, 1);
-        }
-        return $this->fail(BankAccountLogic::getError());
-    }
-
-
-    /**
-     * @notes 删除
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/10/08 09:41
-     */
-    public function delete()
-    {
-        $params = (new BankAccountValidate())->post()->goCheck('delete');
-        try {
-            $worker_ids = BankAccountLogic::getWorkerIds($params);
-            BankAccountLogic::delete($params);
-            foreach ($worker_ids as $worker_id) {
-                MasterWorkerExamineLogic::updateEngineerInformation($worker_id);
-            }
-            return $this->success('删除成功', [], 1, 1);
-        } catch (\Exception $e) {
-            return $this->fail('删除失败-'.$e->getMessage());
-        }
-    }
-
-
-    /**
-     * @notes 获取详情
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/10/08 09:41
-     */
-    public function detail()
-    {
-        $params = (new BankAccountValidate())->goCheck('detail');
-        $result = BankAccountLogic::detail($params);
-        return $this->data($result);
-    }
-
-
-}

app/tenantapi/controller/master_worker/EngineerBillController.php

@@ -1,129 +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\tenantapi\controller\master_worker;
-
-
-use app\tenantapi\controller\BaseAdminController;
-use app\tenantapi\lists\master_worker\EngineerBillLists;
-use app\tenantapi\logic\export\ExportLogic;
-use app\tenantapi\logic\financial\MasterSettlementDetailsLogic;
-use app\tenantapi\logic\master_worker\EngineerBillLogic;
-use app\tenantapi\logic\master_worker\EngineerSettlementLogic;
-use app\common\service\ExcelExportService;
-use excel\ExcelWriter;
-use phpseclib3\Common\Functions\Strings;
-use think\facade\Db;
-use think\facade\Log;
-
-/**
- * EngineerSettlement控制器
- * Class EngineerSettlementController
- * @package app\tenantapi\controller
- */
-class EngineerBillController extends BaseAdminController
-{
-    /**
-     * @notes 获取列表
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/11/15 17:21
-     */
-    public function lists()
-    {
-        // 导入数据
-        $res = EngineerSettlementLogic::insertSettlementDetails();
-        if($res === false){
-            return $this->fail('导入失败');
-        }
-        return $this->dataLists(new EngineerBillLists());
-    }
-
-    public function download()
-    {
-        /*$firstDay = date('Y-m-01 00:00:00', strtotime('first day of last month'));
-        $lastDay = date('Y-m-t 23:59:59', strtotime('last day of last month'));
-        $filename = date('Y-m-d',strtotime($firstDay))."-至-".date('Y-m-d',strtotime($lastDay))."最后结算余额";
-        $result = ExportLogic::add([
-            'download_type' => 1,
-            'params' => ['firstDay'=>$firstDay,'lastDay'=>$lastDay],
-            'name' => $filename,
-            'admin_id' => $this->adminId,
-        ]);
-        if (false === $result) {
-            return $this->fail(ExportLogic::getError());
-        }*/
-
-        $params = $this->request->get();
-        $deadline_time = strtotime($params['deadline_time'])+86400;
-        $settlement_type = $params['settlement_type'];
-
-        $allData = $this->dataLists(new EngineerBillLists())->getData()['data']['lists'];
-        if(empty($allData)) return $this->fail('无数据');
-
-        $type = [
-            1=>'周(7天)',
-            2=>'半月',
-            3=>'整月'
-        ];
-        $filename = "截止到".$params['deadline_time'].$type[$settlement_type].'型结算单';
-        $result = ExportLogic::add([
-            'download_type' => 1,
-            'params' => ['settlement_type'=>$settlement_type,'deadline_time'=>$deadline_time],
-            'name' => $filename,
-            'admin_id' => $this->adminId,
-        ]);
-        if (false === $result) {
-            return $this->fail(ExportLogic::getError());
-        }
-        Log::info('导出参数：'.json_encode([$params,$result]));
-        // 暂时 - 立即生成导出文件
-        (new ExcelExportService)->download($result);
-        return $this->success('添加成功-'.$result, [], 1, 1);
-    }
-    public function submitForm()
-    {
-        $params = $this->request->post();
-        $params['adminId'] = $this->adminId;
-        $result = EngineerBillLogic::submitForm($params);
-        if ($result === false){
-            return $this->fail(EngineerBillLogic::getError());
-        }
-        return $this->success('打款成功', [], 1, 1);
-    }
-
-
-    /*
-     * 列表导出 - 不涉及任何后续批量编号逻辑
-     */
-    public function listsDownload()
-    {
-        $params = $this->request->get();
-        $filename = "财务结算工程师";
-        $result = ExportLogic::add([
-            'download_type' => 5,
-            'params' => $params,
-            'name' => $filename,
-            'admin_id' => $this->adminId,
-        ]);
-        if (false === $result) {
-            return $this->fail(ExportLogic::getError());
-        }
-        // 暂时 - 立即生成导出文件
-        (new ExcelExportService)->download($result);
-        return $this->success('添加成功-'.$result, [], 1, 1);
-    }
-
-}

app/tenantapi/controller/master_worker/EngineerSettlementController.php

@@ -1,124 +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\tenantapi\controller\master_worker;
-
-
-use app\tenantapi\controller\BaseAdminController;
-use app\tenantapi\lists\master_worker\EngineerSettlementLists;
-use app\tenantapi\logic\master_worker\EngineerSettlementLogic;
-use app\tenantapi\validate\master_worker\EngineerSettlementValidate;
-use excel\ExcelWriter;
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-
-
-/**
- * EngineerSettlement控制器
- * Class EngineerSettlementController
- * @package app\tenantapi\controller
- */
-class EngineerSettlementController extends BaseAdminController
-{
-
-    /**
-     * @notes 获取列表
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/11/15 17:21
-     */
-    public function lists()
-    {
-        return $this->dataLists(new EngineerSettlementLists());
-    }
-
-
-    /**
-     * @notes 添加
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/11/15 17:21
-     */
-    public function add()
-    {
-        //$params = (new EngineerSettlementValidate())->post();//->goCheck('add');
-        try {
-            $params = $this->request->post();
-            $params = EngineerSettlementLogic::engineerSettlementValidate($params);
-            $result = EngineerSettlementLogic::add($params,$this->adminId);
-            if (true === $result) {
-                return $this->success('添加成功', [], 1, 1);
-            }
-            return $this->fail(EngineerSettlementLogic::getError());
-        } catch (\Exception $e) {
-            return $this->fail($e->getMessage()?:EngineerSettlementLogic::getError());
-        }
-    }
-
-
-    /**
-     * @notes 编辑
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/11/15 17:21
-     */
-    public function edit()
-    {
-        $params = (new EngineerSettlementValidate())->post()->goCheck('edit');
-        $result = EngineerSettlementLogic::edit($params);
-        if (true === $result) {
-            return $this->success('编辑成功', [], 1, 1);
-        }
-        return $this->fail(EngineerSettlementLogic::getError());
-    }
-
-
-    /**
-     * @notes 删除
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/11/15 17:21
-     */
-    public function delete()
-    {
-        $params = (new EngineerSettlementValidate())->post()->goCheck('delete');
-        EngineerSettlementLogic::delete($params);
-        return $this->success('删除成功', [], 1, 1);
-    }
-
-
-    /**
-     * @notes 获取详情
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/11/15 17:21
-     */
-    public function detail()
-    {
-        $params = (new EngineerSettlementValidate())->goCheck('detail');
-        $result = EngineerSettlementLogic::detail($params);
-        return $this->data($result);
-    }
-
-    public function download()
-    {
-        $lists = EngineerSettlementLogic::downloadLists();
-        (new ExcelWriter())->generateExcelFile([
-            '工程师ID', '工程师编号', '工程师姓名', '工程师原始余额', '工程师总结算金额', '工程师扣款金额', '工程师最终结算金额', '结算时间', '结算明细备注'
-        ], $lists,'template', ['master_worker_id','worker_number','engineer_name','original_balance','total_settlement_amount','deduction_amount',
-            'final_settlement_amount','settlement_time','settlement_details_remarks']);
-    }
-
-}

app/tenantapi/controller/master_worker/MasterWorkerAgreeController.php

@@ -1,120 +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\tenantapi\controller\master_worker;
-
-
-use app\tenantapi\controller\BaseAdminController;
-use app\tenantapi\lists\master_worker\MasterWorkerAgreeLists;
-use app\tenantapi\logic\master_worker\MasterWorkerAgreeLogic;
-use app\tenantapi\validate\master_worker\MasterWorkerAgreeValidate;
-use app\common\logic\MasterWorkerExamineLogic;
-
-
-/**
- * MasterWorkerAgree控制器
- * Class MasterWorkerAgreeController
- * @package app\tenantapi\controller\master_worker
- */
-class MasterWorkerAgreeController extends BaseAdminController
-{
-
-
-    /**
-     * @notes 获取列表
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/07/17 15:20
-     */
-    public function lists()
-    {
-        return $this->dataLists(new MasterWorkerAgreeLists());
-    }
-
-
-    /**
-     * @notes 添加
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/07/17 15:20
-     */
-    public function add()
-    {
-        $params = (new MasterWorkerAgreeValidate())->post()->goCheck('add');
-        $result = MasterWorkerAgreeLogic::add($params);
-        if (true === $result) {
-            MasterWorkerExamineLogic::updateEngineerInformation($params['worker_id']);
-            return $this->success('添加成功', [], 1, 1);
-        }
-        return $this->fail(MasterWorkerAgreeLogic::getError());
-    }
-
-
-    /**
-     * @notes 编辑
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/07/17 15:20
-     */
-    public function edit()
-    {
-        $params = (new MasterWorkerAgreeValidate())->post()->goCheck('edit');
-        $result = MasterWorkerAgreeLogic::edit($params);
-        if (true === $result) {
-            $info = MasterWorkerAgreeLogic::detail(['id'=>$params['id']]);
-            MasterWorkerExamineLogic::updateEngineerInformation($info['worker_id']);
-            return $this->success('编辑成功', [], 1, 1);
-        }
-        return $this->fail(MasterWorkerAgreeLogic::getError());
-    }
-
-
-    /**
-     * @notes 删除
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/07/17 15:20
-     */
-    public function delete()
-    {
-        $params = (new MasterWorkerAgreeValidate())->post()->goCheck('delete');
-        try {
-            $worker_ids = MasterWorkerAgreeLogic::getWorkerIds($params);
-            MasterWorkerAgreeLogic::delete($params);
-            foreach ($worker_ids as $worker_id) {
-                MasterWorkerExamineLogic::updateEngineerInformation($worker_id);
-            }
-            return $this->success('删除成功', [], 1, 1);
-        } catch (\Exception $e) {
-            return $this->fail('删除失败-'.$e->getMessage());
-        }
-    }
-
-
-    /**
-     * @notes 获取详情
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/07/17 15:20
-     */
-    public function detail()
-    {
-        $params = (new MasterWorkerAgreeValidate())->goCheck('detail');
-        $result = MasterWorkerAgreeLogic::detail($params);
-        return $this->data($result);
-    }
-
-
-}

app/tenantapi/controller/master_worker/MasterWorkerExamineController.php

@@ -1,109 +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\tenantapi\controller\master_worker;
-
-
-use app\tenantapi\controller\BaseAdminController;
-use app\tenantapi\lists\master_worker\MasterWorkerAgreeLists;
-use app\tenantapi\lists\master_worker\MasterWorkerExamineLists;
-use app\tenantapi\logic\master_worker\MasterWorkerAgreeLogic;
-use app\tenantapi\logic\master_worker\MasterWorkerExamineLogic;
-use app\tenantapi\validate\master_worker\MasterWorkerAgreeValidate;
-
-
-/**
- * MasterWorkerExamine控制器
- * Class MasterWorkerExamineController
- * @package app\tenantapi\controller\master_worker
- */
-class MasterWorkerExamineController extends BaseAdminController
-{
-
-
-    /**
-     * @notes 获取列表
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/07/17 15:20
-     */
-    public function lists()
-    {
-        return $this->dataLists(new MasterWorkerExamineLists());
-    }
-
-
-    /**
-     * @notes 添加
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/07/17 15:20
-     */
-    public function add()
-    {
-        return $this->fail('');
-    }
-
-
-    /**
-     * @notes 编辑
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/07/17 15:20
-     */
-    public function edit()
-    {
-        $params = $this->request->post();
-        $result = MasterWorkerExamineLogic::edit($params);
-        if (true === $result) {
-            return $this->success('编辑成功', [], 1, 1);
-        }
-        return $this->fail(MasterWorkerExamineLogic::getError());
-    }
-
-
-    /**
-     * @notes 删除
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/07/17 15:20
-     */
-    public function delete()
-    {
-        $params = (new MasterWorkerAgreeValidate())->post()->goCheck('delete');
-        MasterWorkerAgreeLogic::delete($params);
-        return $this->success('删除成功', [], 1, 1);
-    }
-
-
-    /**
-     * @notes 获取详情
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/07/17 15:20
-     */
-    public function detail()
-    {
-        $params = (new MasterWorkerAgreeValidate())->goCheck('detail');
-        $result = MasterWorkerAgreeLogic::detail($params);
-        return $this->data($result);
-    }
-
-    public function getStatus()
-    {
-        $result = MasterWorkerAgreeLogic::getStatus();
-        return $this->data(['count'=>$result]);
-    }
-}

app/tenantapi/controller/master_worker/MasterWorkerInfoController.php

@@ -1,116 +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\tenantapi\controller\master_worker;
-
-
-use app\tenantapi\controller\BaseAdminController;
-use app\tenantapi\lists\master_worker\MasterWorkerInfoLists;
-use app\tenantapi\logic\master_worker\MasterWorkerInfoLogic;
-use app\tenantapi\validate\master_worker\MasterWorkerInfoValidate;
-use app\common\logic\MasterWorkerExamineLogic;
-
-
-/**
- * MasterWorkerInfo控制器
- * Class MasterWorkerInfoController
- * @package app\tenantapi\controller\master_worker
- */
-class MasterWorkerInfoController extends BaseAdminController
-{
-
-
-    /**
-     * @notes 获取列表
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/10/07 18:58
-     */
-    public function lists()
-    {
-        return $this->dataLists(new MasterWorkerInfoLists());
-    }
-
-
-    /**
-     * @notes 添加
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/10/07 18:58
-     */
-    public function add()
-    {
-        $params = (new MasterWorkerInfoValidate())->post()->goCheck('add');
-        $result = MasterWorkerInfoLogic::add($params);
-        if (true === $result) {
-            MasterWorkerExamineLogic::updateEngineerInformation($params['worker_id']);
-            return $this->success('添加成功', [], 1, 1);
-        }
-        return $this->fail(MasterWorkerInfoLogic::getError());
-    }
-
-
-    /**
-     * @notes 编辑
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/10/07 18:58
-     */
-    public function edit()
-    {
-        $params = (new MasterWorkerInfoValidate())->post()->goCheck('edit');
-        $result = MasterWorkerInfoLogic::edit($params);
-        if (true === $result) {
-            $info = MasterWorkerInfoLogic::detail(['id'=>$params['id']]);
-            MasterWorkerExamineLogic::updateEngineerInformation($info['worker_id']);
-            return $this->success('编辑成功', [], 1, 1);
-        }
-        return $this->fail(MasterWorkerInfoLogic::getError());
-    }
-
-
-    /**
-     * @notes 删除
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/10/07 18:58
-     */
-    public function delete()
-    {
-        $params = (new MasterWorkerInfoValidate())->post()->goCheck('delete');
-        $worker_ids = MasterWorkerInfoLogic::getWorkerIds($params);
-        MasterWorkerInfoLogic::delete($params);
-        foreach ($worker_ids as $worker_id) {
-            MasterWorkerExamineLogic::updateEngineerInformation($worker_id);
-        }
-        return $this->success('删除成功', [], 1, 1);
-    }
-
-
-    /**
-     * @notes 获取详情
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/10/07 18:58
-     */
-    public function detail()
-    {
-        $params = (new MasterWorkerInfoValidate())->goCheck('detail');
-        $result = MasterWorkerInfoLogic::detail($params);
-        return $this->data($result);
-    }
-
-
-}

app/tenantapi/controller/master_worker/MasterWorkerRuleController.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\tenantapi\controller\master_worker;
-
-
-use app\tenantapi\controller\BaseAdminController;
-use app\tenantapi\lists\master_worker\MasterWorkerRuleLists;
-use app\tenantapi\logic\master_worker\MasterWorkerRuleLogic;
-use app\tenantapi\validate\master_worker\MasterWorkerRuleValidate;
-
-
-/**
- * MasterWorkerRule控制器
- * Class MasterWorkerRuleController
- * @package app\tenantapi\controller
- */
-class MasterWorkerRuleController extends BaseAdminController
-{
-
-
-    /**
-     * @notes 获取列表
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/09/28 15:31
-     */
-    public function lists()
-    {
-        return $this->dataLists(new MasterWorkerRuleLists());
-    }
-
-
-    /**
-     * @notes 添加
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/09/28 15:31
-     */
-    public function add()
-    {
-        $params = (new MasterWorkerRuleValidate())->post()->goCheck('add');
-        $result = MasterWorkerRuleLogic::add($params);
-        if (true === $result) {
-            return $this->success('添加成功', [], 1, 1);
-        }
-        return $this->fail(MasterWorkerRuleLogic::getError());
-    }
-
-
-    /**
-     * @notes 编辑
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/09/28 15:31
-     */
-    public function edit()
-    {
-        $params = (new MasterWorkerRuleValidate())->post()->goCheck('edit');
-        $result = MasterWorkerRuleLogic::edit($params);
-        if (true === $result) {
-            return $this->success('编辑成功', [], 1, 1);
-        }
-        return $this->fail(MasterWorkerRuleLogic::getError());
-    }
-
-
-    /**
-     * @notes 删除
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/09/28 15:31
-     */
-    public function delete()
-    {
-        $params = (new MasterWorkerRuleValidate())->post()->goCheck('delete');
-        MasterWorkerRuleLogic::delete($params);
-        return $this->success('删除成功', [], 1, 1);
-    }
-
-
-    /**
-     * @notes 获取详情
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/09/28 15:31
-     */
-    public function detail()
-    {
-        $params = (new MasterWorkerRuleValidate())->goCheck('detail');
-        $result = MasterWorkerRuleLogic::detail($params);
-        return $this->data($result);
-    }
-
-
-}

app/tenantapi/controller/master_worker/MasterWorkerServiceOrderController.php

@@ -1,66 +0,0 @@
-<?php
-namespace app\tenantapi\controller\master_worker;
-
-use app\tenantapi\controller\BaseAdminController;
-use app\tenantapi\lists\master_commission\MasterWorkerCommissionNoticeLists;
-use app\tenantapi\lists\master_worker\MasterWorkerServiceOrderLists;
-use app\tenantapi\logic\export\ExportLogic;
-use app\common\service\ExcelExportService;
-
-/**
- * MasterWorkerServiceOrder控制器
- * Class MasterWorkerServiceOrderController
- * @package app\tenantapi\controller
- */
-class MasterWorkerServiceOrderController extends BaseAdminController
-{
-    /**
-     * @notes 获取列表
-     */
-    public function lists()
-    {
-        return $this->dataLists(new MasterWorkerServiceOrderLists());
-    }
-    public function download()
-    {
-        $params = $this->request->get();
-        $tmp_filename = '';
-        if($params['start_time'] && $params['end_time']) $tmp_filename = date('Y-m-d',strtotime($params['start_time']))."-至-".date('Y-m-d',strtotime($params['end_time']));
-        $filename = $tmp_filename."工单统计";
-        $result = ExportLogic::add([
-            'download_type' => 2,
-            'params' => $params,
-            'name' => $filename,
-            'admin_id' => $this->adminId,
-        ]);
-        if (false === $result) {
-            return $this->fail(ExportLogic::getError());
-        }
-        // 暂时 - 立即生成导出文件
-        (new ExcelExportService)->download($result);
-        return $this->success('添加成功-'.$result, [], 1, 1);
-    }
-
-    public function freeNotice()
-    {
-        return $this->dataLists(new MasterWorkerCommissionNoticeLists());
-    }
-
-    public function freeDownload()
-    {
-        $params = $this->request->get();
-        $filename = "免费班工程师统计";
-        $result = ExportLogic::add([
-            'download_type' => 4,
-            'params' => $params,
-            'name' => $filename,
-            'admin_id' => $this->adminId,
-        ]);
-        if (false === $result) {
-            return $this->fail(ExportLogic::getError());
-        }
-        // 暂时 - 立即生成导出文件
-        (new ExcelExportService)->download($result);
-        return $this->success('添加成功-'.$result, [], 1, 1);
-    }
-}

app/tenantapi/controller/master_worker/MasterWorkerTeamController.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\tenantapi\controller\master_worker;
-
-
-use app\tenantapi\controller\BaseAdminController;
-use app\tenantapi\lists\master_worker\MasterWorkerTeamLists;
-use app\tenantapi\logic\master_worker\MasterWorkerTeamLogic;
-use app\tenantapi\validate\master_worker\MasterWorkerTeamValidate;
-
-
-/**
- * MasterWorkerTeam控制器
- * Class MasterWorkerTeamController
- * @package app\tenantapi\controller
- */
-class MasterWorkerTeamController extends BaseAdminController
-{
-
-
-    /**
-     * @notes 获取列表
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/11/20 17:42
-     */
-    public function lists()
-    {
-        return $this->dataLists(new MasterWorkerTeamLists());
-    }
-
-
-    /**
-     * @notes 添加
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/11/20 17:42
-     */
-    public function add()
-    {
-        $params = (new MasterWorkerTeamValidate())->post()->goCheck('add', ['tenant_id' => $this->adminInfo['tenant_id']]);
-        $result = MasterWorkerTeamLogic::add($params);
-        if (true === $result) {
-            return $this->success('添加成功', [], 1, 1);
-        }
-        return $this->fail(MasterWorkerTeamLogic::getError());
-    }
-
-
-    /**
-     * @notes 编辑
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/11/20 17:42
-     */
-    public function edit()
-    {
-        $params = (new MasterWorkerTeamValidate())->post()->goCheck('edit', ['tenant_id' => $this->adminInfo['tenant_id']]);
-        $result = MasterWorkerTeamLogic::edit($params);
-        if (true === $result) {
-            return $this->success('编辑成功', [], 1, 1);
-        }
-        return $this->fail(MasterWorkerTeamLogic::getError());
-    }
-
-
-    /**
-     * @notes 删除
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/11/20 17:42
-     */
-    public function delete()
-    {
-        $params = (new MasterWorkerTeamValidate())->post()->goCheck('delete');
-        MasterWorkerTeamLogic::delete($params);
-        return $this->success('删除成功', [], 1, 1);
-    }
-
-
-    /**
-     * @notes 获取详情
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/11/20 17:42
-     */
-    public function detail()
-    {
-        $params = (new MasterWorkerTeamValidate())->goCheck('detail');
-        $result = MasterWorkerTeamLogic::detail($params);
-        return $this->data($result);
-    }
-
-
-}

app/tenantapi/controller/master_worker/RetentionMoneyLogController.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace app\tenantapi\controller\master_worker;
-
-use app\tenantapi\controller\BaseAdminController;
-use app\tenantapi\validate\master_worker\MasterWorkerRetentionMoneyLogValidate;
-use app\common\logic\RetentionMoneyLogic;
-use app\workerapi\lists\MasterWorkerRetentionMoneyLogLists;
-
-class RetentionMoneyLogController extends BaseAdminController
-{
-    public array $notNeedLogin = ['totalAmount'];
-    public function lists()
-    {
-        return $this->dataLists(new MasterWorkerRetentionMoneyLogLists());
-    }
-
-    public function totalAmount()
-    {
-        $params = (new MasterWorkerRetentionMoneyLogValidate())->get()->goCheck('totalAmount');
-        $result = RetentionMoneyLogic::totalAmount($params);
-        if (false === $result) {
-            return $this->fail(RetentionMoneyLogic::getError());
-        }
-        return $this->success('操作成功',$result, 1, 0);
-    }
-
-    public function add()
-    {
-        $params = (new MasterWorkerRetentionMoneyLogValidate())->post()->goCheck('add');
-        $result = RetentionMoneyLogic::addDeduct($params);
-        if (true === $result) {
-            return $this->success('添加成功', [], 1, 1);
-        }
-        return $this->fail(RetentionMoneyLogic::getError());
-    }
-}

app/tenantapi/lists/master_worker/MasterWorkerLists.php

@@ -51,22 +51,6 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
             //'in' => ['mw.time_period']
         ];
     }
-    /**
-     * 获取数据权限
-     * $this->adminInfo['data_rules']
-     * province city admin_id sale_group_id sale_id  property_head_id
-     */
-    public function queryDataWhere(){
-        $where = [];
-        $data_rules = $this->adminInfo['data_rules'];
-        if (isset($data_rules['province']) && !empty($data_rules['province'])) {
-            $where[] = ['mw.province','in' ,$data_rules['province']];
-        }
-        if (isset($data_rules['city']) && !empty($data_rules['city'])) {
-            $where[] = ['mw.city','in' ,$data_rules['city']];
-        }
-        return $where;
-    }
     public function queryWhere(){
         $where = [];
         if(isset($this->params['time_period']) && !empty($this->params['time_period'])){
@@ -127,16 +111,8 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
             $where[] =[ 'mw.work_total','<= ',$this->params['max_work_number']];
         }
         if(isset($this->params['order_id']) && $this->params['order_id']){
-//            $lon_lat = (ServiceWork::where('id',$this->params['order_id'])->column("lon,lat,goods_category_id"))[0];
-//            $this->lon = $lon_lat['lon'];
-//            $this->lat = $lon_lat['lat'];
-//            $goods_category_id = $lon_lat['goods_category_id'];
-            // 派单搜索条件 - 工程师保护期  工程师可用金额限制(除去保护期工程师)  订单产品分类  订单坐标筛选(暂不按距离筛选只按距离排序)
-            //$ids = DistributeLeafletsService::getIntersection($goods_category_id??0);
-            //$where[] = [ 'mw.id','IN',$ids];
             $where[] = [ 'mw.work_status','=',0];
         }
-        Log::debug('MasterWorker-where:'.json_encode($where));
         return $where;
     }
     /**
@@ -169,7 +145,6 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
             ->where('mw.tenant_id', $this->adminInfo['tenant_id'])
             ->where($this->searchWhere)
             ->where($queryWhere)
-            ->where($this->queryDataWhere())
             ->field($fields)
             ->limit($this->limitOffset, $this->limitLength)
             ->having($having)
@@ -216,7 +191,6 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
             ->where('mw.tenant_id', $this->adminInfo['tenant_id'])
             ->where($this->searchWhere)
             ->where($queryWhere)
-            ->where($this->queryDataWhere())
             ->field($fields)
             ->having($having)
             ->select()->toArray());