diff --git a/app/common/service/StockOrdersService.php b/app/common/service/StockOrdersService.php index e87d37b..9308fde 100644 --- a/app/common/service/StockOrdersService.php +++ b/app/common/service/StockOrdersService.php @@ -13,8 +13,8 @@ use support\Request; use app\common\model\User; use support\Db; use support\Model; -use app\admin\model\ApprovalInstances; -use app\admin\model\ApprovalRecords; +use app\common\model\ApprovalInstances; +use app\common\model\ApprovalRecords; class StockOrdersService { diff --git a/app/common/utils/approval/service/ApprovalFlowService.php b/app/common/utils/approval/service/ApprovalFlowService.php index 58fc4d3..ad6ba9c 100644 --- a/app/common/utils/approval/service/ApprovalFlowService.php +++ b/app/common/utils/approval/service/ApprovalFlowService.php @@ -233,31 +233,6 @@ class ApprovalFlowService }); } - /** 我的待办 */ - public function getPendingApprovals(int $userId): array - { - return Db::table('approval_records as ar') - ->join('approval_instances as ai', 'ar.instance_id', '=', 'ai.id') - ->where('ar.approver_id', $userId) - ->where('ar.status', 'pending') - ->where('ai.status', 'processing') - ->select('ai.*') - ->distinct() - ->get() - ->toArray(); - } - - /** 审批历史 */ - public function getApprovalHistory(int $instanceId): array - { - return Db::table('approval_records') - ->where('instance_id', $instanceId) - ->orderBy('step_index') - ->orderByRaw('COALESCE(approved_at, created_at) asc') - ->get() - ->toArray(); - } - /** 流程图数据(把 skipped/timeout 视作已完结的中性状态) */ public function getFlowDiagramData(int $instanceId): array { diff --git a/app/crm/service/StockOrdersService.php b/app/crm/service/StockOrdersService.php index 48627a0..9026af3 100644 --- a/app/crm/service/StockOrdersService.php +++ b/app/crm/service/StockOrdersService.php @@ -13,8 +13,8 @@ use support\Request; use app\common\model\User; use support\Db; use support\Model; -use app\admin\model\ApprovalInstances; -use app\admin\model\ApprovalRecords; +use app\common\model\ApprovalInstances; +use app\common\model\ApprovalRecords; use support\exception\BusinessException; class StockOrdersService